push pieces around

Author: davidnewhall

after-install.sh

@@ -2,16 +2,24 @@
 
 # This is the postinst deb package script. It runs after the package contents are installed.
 
+set -e
+
 if [ -d ~abc/.ssh ]; then
   chown -R abc: ~abc/.ssh
 fi
 
-if [ -d /var/log/workers ]; then
+if [ -d "/var/log/workers" ]; then
   chown -R abc: /var/log/workers
 fi
 
+if [ -d "/etc/supervisor/conf.d" ]; then
+  rm -rf /etc/supervisor/conf.d
+fi
+
 if [ -x "/bin/systemctl" ]; then
   /bin/systemctl daemon-reload
-fi
 
-rm -rf /etc/supervisor/conf.d
+  if [ -d "/share/websites/www" ]; then
+    /bin/systemctl restart supervisor
+  fi
+fi

before-install.sh

@@ -2,6 +2,8 @@
 
 # This is the preinst deb package script. It runs before the package is installed.
 
+set -e
+
 # Make a user and group for this app, but only if it does not already exist.
 groupadd --force --non-unique --gid 1001 abc
 id abc >/dev/null 2>&1 || \

before-remove.sh

@@ -6,12 +6,12 @@ if [ "$1" = "upgrade" ] || [ "$1" = "1" ] ; then
   exit 0
 fi
 
-if [ -x "/bin/systemctl" ]; then
-  /bin/systemctl stop supervisor 2>/dev/null
-fi
-
 # Put this back.
 if [ -d /etc/supervisor ]; then
-  rm -f /etc/supervisor/conf.d 2>/dev/null
-  mkdir /etc/supervisor/conf.d 2>/dev/null
+  rm -f /etc/supervisor/conf.d
+  mkdir /etc/supervisor/conf.d
+fi
+
+if [ -x "/bin/systemctl" ]; then
+  /bin/systemctl stop supervisor
 fi

build.sh

@@ -52,7 +52,10 @@ read -r -d '' PACKAGE_ARGS <<- PACKAGE_ARGS
     --vendor='${VENDOR}'
 PACKAGE_ARGS
 
-mkdir -p root/var/log/workers
+mkdir -p root/var/log/workers root/config
+ln -sf /var/log/workers root/config/log
+ln -sf /share/websites/www root/config/www
+
 rm -f ${PACKAGE_NAME}_${VERSION}-${ITERATION}_amd64.deb
 echo fpm -s dir -t deb ${PACKAGE_ARGS} ${DEPENDS} -a amd64 -v ${VERSION} -C root/
 eval fpm -s dir -t deb ${PACKAGE_ARGS} ${DEPENDS} -a amd64 -v ${VERSION} -C root/

root/etc/sudoers.d/workers

@@ -1 +1 @@
-abc ALL=(ALL) NOPASSWD: /usr/bin/systemctl restart supervisor
+abc ALL=(root) NOPASSWD: /usr/bin/systemctl restart supervisor

root/etc/systemd/system/supervisor.service.d/notifiarr.conf

@@ -1,8 +1,5 @@
 # Before starting supervisor, we create a symlinks to the Notifiarr-specific files for this server.
 # Those files live in a folder with this server's name, so create a dynamic symlink to reach them at a known path.
 [Service]
-ExecStartPre=/usr/bin/mkdir -p /config
-ExecStartPre=/usr/bin/ln -sf /var/log/workers /config/log
-ExecStartPre=/usr/bin/ln -sf /share/websites/www /config/www
 ExecStartPre=/bin/bash -c 'ln -sf "/share/workers/$(hostname -s)/supervisor/" "/etc/supervisor/conf.d"'
 ExecStartPre=/bin/bash -c 'ln -sf "/share/websites/confs/server.$(hostname -s)" "/config/server.json"'