run-parts.sh: Simplify backup creation

nextcloud-domain.sh: Only start notify_push if the nc_domain has been set

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

3 files changed, 10 insertions, 24 deletions

diff --git a/bin/nextcloud-domain.sh b/bin/nextcloud-domain.sh
index 95eb0963..dfc757bb 100644
--- a/bin/nextcloud-domain.sh
+++ b/bin/nextcloud-domain.sh
@@ -34,3 +34,8 @@ while :; do
   set-nc-domain "${nc_domain}" >> /var/log/ncp.log
   break
 done
+
+[[ -z "$nc_domain" ]] || {
+  echo "Starting notify_push daemon"
+  start_notify_push
+}
diff --git a/build/docker/debian-ncp/run-parts.sh b/build/docker/debian-ncp/run-parts.sh
index f87cf271..5f97ef13 100755
--- a/build/docker/debian-ncp/run-parts.sh
+++ b/build/docker/debian-ncp/run-parts.sh
@@ -4,29 +4,13 @@ cleanup()
 {
   if [[ -z "$NOBACKUP" ]] || [[ "$NOBACKUP" != "true" ]]
   then
-    BKPDIR=/data/docker-shutdown-backups/
+    BKPDIR=/data/docker-shutdown-backups
     WITH_DATA=no
     COMPRESSED=yes
-    LIMIT=0
+    LIMIT=5
     mkdir -p "$BKPDIR"
-    echo "Cleanup old shutdown backups..."
-    skip_bkp_cleanup=0
-    BKPS="$(ls -1t "$BKPDIR"/nextcloud-bkp_*.tar.gz 2>/dev/null || skip_bkp_cleanup=1)"
-    if [[ "$skip_bkp_cleanup" == 0 ]]
-    then
-      while read -r bkp
-      do
-        rm -f "$BKPDIR/$bkp"
-      done <"$(echo "$BKPS" | tail -n +5)"
-    fi
     echo "Back up current instance..."
-    set +eE
-    if ncp-backup "$BKPDIR" "$WITH_DATA" "$COMPRESSED" "$LIMIT"
-    then
-      echo "Backup stored at '$BKPDIR/$(ls -1t "$BKPDIR"/nextcloud-bkp_*.tar.gz 2>/dev/null | head -n1)'"
-    else
-      echo 'WARN: Backup creation failed'
-    fi
+    ncp-backup "$BKPDIR" "$WITH_DATA" "$COMPRESSED" "$LIMIT" || echo 'WARN: Backup creation failed'
   fi
 
   for file in $( ls -1rv /etc/services-enabled.d ); do
@@ -40,7 +24,7 @@ grep '/data-ro' /etc/mysql/mariadb.conf.d/90-ncp.cnf > /dev/null 2>&1 && {
      "to fix this now, but if you encounter any issues, please check" \
      "https://github.com/nextcloud/nextcloudpi/issues/1577#issuecomment-1260830341" \
      "It is likely that you will have to restore a backup"
-  chown -R mysql: /data/database || true
+  chown -R mysql:mysql /data/database || true
 }
 sed -i 's|/data-ro|/data|' "/etc/mysql/mariadb.conf.d/90-ncp.cnf" || true
 
@@ -91,4 +75,4 @@ done
 echo "Init done"
 while true; do sleep 0.5; done
 
-}
+
diff --git a/build/docker/nextcloud/020nextcloud b/build/docker/nextcloud/020nextcloud
index edfe4b1d..62452c74 100755
--- a/build/docker/nextcloud/020nextcloud
+++ b/build/docker/nextcloud/020nextcloud
@@ -55,9 +55,6 @@ 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