regenerated provisioning script for 0.4.2

internet-equity · Sep 16, 2021 · 095ef55 · 095ef55
1 parent 4cf5763
commit 095ef55
Showing 1 changed file with 67 additions and 11 deletions.
diff --git a/bin/netrics-docker-run b/bin/netrics-docker-run
@@ -62,7 +62,7 @@ fi
 
 sudo mkdir -p /var/run/netrics-dashboard
 
-if [ ! -f /var/run/netrics-dashboard/version ] || [ "$(</var/run/netrics-dashboard/version)" != 0.4.1 ]; then
+if [ ! -f /var/run/netrics-dashboard/version ] || [ "$(</var/run/netrics-dashboard/version)" != 0.4.2 ]; then
   sudo docker stop netrics-dashboard &>/dev/null
   sudo docker rm netrics-dashboard &>/dev/null
 
@@ -79,7 +79,7 @@ if [ ! -f /var/run/netrics-dashboard/version ] || [ "$(</var/run/netrics-dashboa
     --read-only                                                                            \
     --user $(id -u):$(id -g)                                                               \
     --name netrics-dashboard                                                               \
-    chicagocdac/netrics-dashboard:0.4.1
+    chicagocdac/netrics-dashboard:0.4.2
 
   sudo docker inspect                                         \
     --format="{{.Config.Labels.appversion}}"              \
@@ -100,39 +100,94 @@ docker run
     --read-only                                                                            \
     --user $(id -u):$(id -g)                                                               \
     --name netrics-dashboard-command                                                       \
-    chicagocdac/netrics-dashboard:0.4.1                           \
+    chicagocdac/netrics-dashboard:0.4.2                           \
     python -m app.cmd "$@"
 SCRIPT
 
 sudo chmod +x /usr/local/bin/local-dashboard
 
+cat <<'SCRIPT' | sudo tee /usr/local/bin/local-dashboard-backupdb > /dev/null
+#!/bin/sh
+
+if [ "$1" = --group ]
+then
+  if [ "$#" -ne 3 ]
+  then
+    echo "Usage: $0 [--group GROUP] DIRECTORY" >&2
+    exit 1
+  fi
+  GROUP="$2"
+  shift 2
+else
+  if [ "$#" -ne 1 ]
+  then
+    echo "Usage: $0 [--group GROUP] DIRECTORY" >&2
+    exit 1
+  fi
+fi
+
+/usr/local/bin/local-dashboard backupdb --compress "$1"
+
+if [ -n "$GROUP" ]
+then
+  find "$1/pending/survey" "$1/pending/trial" -type f -not -group $GROUP -print0 | xargs -0 -r chown $USER:$GROUP
+  find "$1/pending/survey" "$1/pending/trial" -type f -not -perm -g=w -print0 | xargs -0 -r chmod g+w
+fi
+SCRIPT
+
+sudo chmod +x /usr/local/bin/local-dashboard-backupdb
+
 cat <<'SCRIPT' | sudo tee /usr/local/bin/ndt7-backup > /dev/null
 #!/bin/sh
 
-if [ "$#" -ne 1 ]
+if [ "$1" = --group ]
 then
-  echo "Usage: $0 path"
-  exit 1
+  if [ "$#" -ne 3 ]
+  then
+    echo "Usage: $0 [--group GROUP] DIRECTORY" >&2
+    exit 1
+  fi
+  GROUP="$2"
+  shift 2
+else
+  if [ "$#" -ne 1 ]
+  then
+    echo "Usage: $0 [--group GROUP] DIRECTORY" >&2
+    exit 1
+  fi
 fi
 
 SOURCE=/usr/local/lib/ndt-server/datadir/ndt7/
 TARGET="$1/pending/ndt7/json/"
 
 if [ ! -d "$TARGET" ]
 then
-  echo "no such directory: $TARGET"
+  echo "no such directory: $TARGET" >&2
   exit 1
 fi
 
-find "$SOURCE" -type f -print0 | xargs -0 -r mv -t "$TARGET"
-find "$SOURCE"/* -type d -empty -delete
+if [ -n "$GROUP" ]
+then
+  # correct ownership & permissions
+  find "$SOURCE" -type f -print0 | xargs -0 -r chown $USER:$GROUP
+  find "$SOURCE" -type f -group $GROUP -print0 | xargs -0 -r chmod g+w
+
+  # move into place
+  find "$SOURCE" -type f -group $GROUP -print0 | xargs -0 -r mv -t "$TARGET"
+else
+  # move into place
+  find "$SOURCE" -type f -print0 | xargs -0 -r mv -t "$TARGET"
+fi
+
+# clean up source
+find "$SOURCE" -mindepth 1 -type d -empty -delete
 SCRIPT
 
 sudo chmod +x /usr/local/bin/ndt7-backup
 
 cat <<'CRONTAB' | sudo tee /etc/cron.d/nm-exp-local-dashboard > /dev/null
-@midnight  netrics  sudo /usr/local/bin/local-dashboard backupdb --compress /var/nm/nm-exp-local-dashboard/upload/
-@midnight  netrics  sudo /usr/local/bin/ndt7-backup /var/nm/nm-exp-local-dashboard/upload/
+@midnight  root  /usr/local/bin/local-dashboard-backupdb --group netrics /var/nm/nm-exp-local-dashboard/upload/
+@midnight  root  /usr/local/bin/ndt7-backup --group netrics /var/nm/nm-exp-local-dashboard/upload/
 CRONTAB
 
 for directory in /var/nm/nm-exp-local-dashboard/upload/pending/survey/csv/ \
@@ -143,5 +198,6 @@ for directory in /var/nm/nm-exp-local-dashboard/upload/pending/survey/csv/ \
                  /var/nm/nm-exp-local-dashboard/upload/archive/ndt7/json/
 do
     sudo mkdir -p $directory
+    sudo chmod g+ws $directory
     sudo chown netrics:netrics $directory
 done