Ver Fonte

extract notifiers folder creation to new if statement

bergquist há 6 anos atrás
pai
commit
7ce18ec4f7
2 ficheiros alterados com 8 adições e 6 exclusões
  1. 4 3
      packaging/deb/control/postinst
  2. 4 3
      packaging/rpm/control/postinst

+ 4 - 3
packaging/deb/control/postinst

@@ -32,11 +32,12 @@ case "$1" in
   fi
 
   if [ ! -f $PROVISIONING_CFG_DIR ]; then
-    mkdir -p $PROVISIONING_CFG_DIR/dashboards $PROVISIONING_CFG_DIR/datasources $PROVISIONING_CFG_DIR/notifiers
+    mkdir -p $PROVISIONING_CFG_DIR/dashboards $PROVISIONING_CFG_DIR/datasources
     cp /usr/share/grafana/conf/provisioning/dashboards/sample.yaml $PROVISIONING_CFG_DIR/dashboards/sample.yaml
     cp /usr/share/grafana/conf/provisioning/datasources/sample.yaml $PROVISIONING_CFG_DIR/datasources/sample.yaml
-    cp /usr/share/grafana/conf/provisioning/notifiers/sample.yaml $PROVISIONING_CFG_DIR/notifiers/sample.yaml
-  elif [ ! -f $PROVISIONING_CFG_DIR/notifiers ]; then
+  fi
+
+  if [ ! -f $PROVISIONING_CFG_DIR/notifiers ]; then
     mkdir -p $PROVISIONING_CFG_DIR/notifiers
     cp /usr/share/grafana/conf/provisioning/notifiers/sample.yaml $PROVISIONING_CFG_DIR/notifiers/sample.yaml
   fi

+ 4 - 3
packaging/rpm/control/postinst

@@ -46,11 +46,12 @@ if [ $1 -eq 1 ] ; then
   fi
 
   if [ ! -f $PROVISIONING_CFG_DIR ]; then
-    mkdir -p $PROVISIONING_CFG_DIR/dashboards $PROVISIONING_CFG_DIR/datasources $PROVISIONING_CFG_DIR/notifiers
+    mkdir -p $PROVISIONING_CFG_DIR/dashboards $PROVISIONING_CFG_DIR/datasources
     cp /usr/share/grafana/conf/provisioning/dashboards/sample.yaml $PROVISIONING_CFG_DIR/dashboards/sample.yaml
     cp /usr/share/grafana/conf/provisioning/datasources/sample.yaml $PROVISIONING_CFG_DIR/datasources/sample.yaml
-    cp /usr/share/grafana/conf/provisioning/notifiers/sample.yaml $PROVISIONING_CFG_DIR/notifiers/sample.yaml
-  elif [ ! -f $PROVISIONING_CFG_DIR/notifiers ]; then
+  fi
+
+  if [ ! -f $PROVISIONING_CFG_DIR/notifiers ]; then
     mkdir -p $PROVISIONING_CFG_DIR/notifiers
     cp /usr/share/grafana/conf/provisioning/notifiers/sample.yaml $PROVISIONING_CFG_DIR/notifiers/sample.yaml
   fi