Fix HPB service

vm-tests.yml: Fix invalid variable usage

Signed-off-by: thecalcaholic <6317548+theCalcaholic@users.noreply.github.com>

Author: theCalcaholic

.github/workflows/vm-tests.yml

@@ -247,7 +247,7 @@ jobs:
       TEST_SERVER_ID: ${{ needs.setup-installation-test-instance.outputs.test_server_id }}
       VERSION: ${{ needs.setup-installation-test-instance.outputs.version }}
 
-      UID: ${{ github.run_id }}-${TEST_TYPE}
+      UID: ${{ github.run_id }}-${{ env.TEST_TYPE }}
     steps:
       - name: download ssh private key from artifact store
         uses: actions/download-artifact@v3
@@ -301,7 +301,7 @@ jobs:
       TEST_RESULT: ${{ needs.setup-update-test-instance.result }}
       TEST_SERVER_ID: ${{ needs.setup-update-test-instance.outputs.test_server_id }}
       VERSION: ${{ needs.setup-update-test-instance.outputs.version }}
-      UID: ${{ github.run_id }}-${TEST_TYPE}
+      UID: ${{ github.run_id }}-${{ env.TEST_TYPE }}
     steps:
       - name: download ssh private key from artifact store
         uses: actions/download-artifact@v3

bin/nextcloud-domain.sh

@@ -35,7 +35,3 @@ while :; do
   break
 done
 
-[[ -z "$nc_domain" ]] || {
-  echo "Starting notify_push daemon"
-  start_notify_push
-}

build/docker/debian-ncp/run-parts.sh

@@ -61,10 +61,8 @@ for file in $( ls -1v /etc/services-enabled.d | grep -v ^000.* ); do
   /etc/services-enabled.d/"$file" start "$1"
 done
 
-# wait for trap from 'docker stop'
-echo "Init done"
 
-if [[ -z "$NOBACKUP" ]] || [[ "$NOBACKUP" != "true" ]]
+if [[ -z "$NOBACKUP" ]] || [[ "$NOBACKUP" != "true" ]] && ! a2query -s ncp-activation -q
 then
   BKPDIR=/data/docker-startup-backups
   WITH_DATA=no
@@ -75,6 +73,8 @@ then
   ncp-backup "$BKPDIR" "$WITH_DATA" "$COMPRESSED" "$LIMIT" || echo 'WARN: Backup creation failed'
 fi
 
+# wait for trap from 'docker stop'
+echo "Init done"
 while true; do sleep 0.5; done
 
 

build/docker/nextcloud/020nextcloud

@@ -55,6 +55,9 @@ EOF
 echo "Provisioning"
 bash /usr/local/bin/ncp-provisioning.sh
 
+echo "Starting notify_push daemon"
+start_notify_push
+
 if needs_decrypt; then
   echo "Waiting for user to decrypt instance"
   while :; do

etc/library.sh

@@ -163,7 +163,7 @@ function set-nc-domain()
   fi
 }
 
-function start_notify_push
+function start_notify_push()
 {
     pgrep notify_push &>/dev/null && return
     if [[ -f /.docker-image ]]; then