diff --git a/packaging/deb/control/postinst b/packaging/deb/control/postinst index c71d11bcbde..b38f9edadef 100755 --- a/packaging/deb/control/postinst +++ b/packaging/deb/control/postinst @@ -29,12 +29,14 @@ case "$1" in if [ ! -f $CONF_FILE ]; then cp /usr/share/grafana/conf/sample.ini $CONF_FILE cp /usr/share/grafana/conf/ldap.toml /etc/grafana/ldap.toml - - mkdir -p /etc/grafana/dashboards /etc/grafana/datasources - cp /usr/share/grafana/conf/dashboards/sample.yaml /etc/grafana/dashboards/sample.yaml - cp /usr/share/grafana/conf/datasources/sample.yaml /etc/grafana/datasources/sample.yaml fi + if [ ! -f $DATASOURCES_CFG_DIR ]; then + mkdir -p /etc/grafana/dashboards /etc/grafana/datasources + cp /usr/share/grafana/conf/dashboards/sample.yaml $DASHBOARDS_CFG_DIR/sample.yaml + cp /usr/share/grafana/conf/datasources/sample.yaml $DATASOURCES_CFG_DIR/sample.yaml + fi + # configuration files should not be modifiable by grafana user, as this can be a security issue chown -Rh root:$GRAFANA_GROUP /etc/grafana/* chmod 755 /etc/grafana diff --git a/packaging/rpm/control/postinst b/packaging/rpm/control/postinst index 07ddbc178de..68e556b7f2d 100755 --- a/packaging/rpm/control/postinst +++ b/packaging/rpm/control/postinst @@ -43,12 +43,14 @@ if [ $1 -eq 1 ] ; then if [ ! -f $CONF_FILE ]; then cp /usr/share/grafana/conf/sample.ini $CONF_FILE cp /usr/share/grafana/conf/ldap.toml /etc/grafana/ldap.toml - - mkdir -p /etc/grafana/dashboards /etc/grafana/datasources - cp /usr/share/grafana/conf/dashboards/sample.yaml /etc/grafana/dashboards/sample.yaml - cp /usr/share/grafana/conf/datasources/sample.yaml /etc/grafana/datasources/sample.yaml fi + if [ ! -f $DATASOURCES_CFG_DIR ]; then + mkdir -p /etc/grafana/dashboards /etc/grafana/datasources + cp /usr/share/grafana/conf/dashboards/sample.yaml $DASHBOARDS_CFG_DIR/sample.yaml + cp /usr/share/grafana/conf/datasources/sample.yaml $DATASOURCES_CFG_DIR/sample.yaml + fi + # Set user permissions on /var/log/grafana, /var/lib/grafana mkdir -p /var/log/grafana /var/lib/grafana chown -R $GRAFANA_USER:$GRAFANA_GROUP /var/log/grafana /var/lib/grafana