From a4e5df7c5b761506fcc968e31b1008f0be9761d8 Mon Sep 17 00:00:00 2001
From: nachoparker <nacho@ownyourbits.com>
Date: Wed, 4 Oct 2017 20:55:27 +0200
Subject: nc-backup: fix excludes

---
 changelog.md                               |  6 ++--
 etc/nextcloudpi-config.d/nc-backup-auto.sh | 47 ++++++++++++++++--------------
 etc/nextcloudpi-config.d/nc-backup.sh      | 15 ++++++----
 3 files changed, 38 insertions(+), 30 deletions(-)

diff --git a/changelog.md b/changelog.md
index 282740f1..821539d7 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,11 +1,13 @@
 
-[v0.31.10](https://github.com/nextcloud/nextcloudpi/commit/771e967) (2017-10-04) nc-forward-ports: exit status on failure
+[v0.31.11](https://github.com/nextcloud/nextcloudpi/commit/f4586a0) (2017-10-04) nc-backup: fix excludes
+
+[v0.31.10](https://github.com/nextcloud/nextcloudpi/commit/c0c6b1b) (2017-10-04) nc-forward-ports: exit status on failure
 
 [v0.31.9 ](https://github.com/nextcloud/nextcloudpi/commit/89f1cc4) (2017-10-03) nc-wifi: improve instructions
 
 [v0.31.8 ](https://github.com/nextcloud/nextcloudpi/commit/03f39b2) (2017-09-30) ncp-web: small fixes
 
-[v0.31.6](https://github.com/nextcloud/nextcloudpi/commit/7a95cc1) (2017-10-03) letsencrypt: fix external bug (Closes #230)
+[v0.31.6 ](https://github.com/nextcloud/nextcloudpi/commit/7a95cc1) (2017-10-03) letsencrypt: fix external bug (Closes #230)
 
 [v0.31.5 ](https://github.com/nextcloud/nextcloudpi/commit/1195316) (2017-09-30) nc-format-USB: fix format disks >2TB and more (Closes #223)
 
diff --git a/etc/nextcloudpi-config.d/nc-backup-auto.sh b/etc/nextcloudpi-config.d/nc-backup-auto.sh
index dc4a0467..e2c3b91b 100644
--- a/etc/nextcloudpi-config.d/nc-backup-auto.sh
+++ b/etc/nextcloudpi-config.d/nc-backup-auto.sh
@@ -79,28 +79,31 @@ mysqldump -u root --single-transaction nextcloud > \$DBBACKUP
 [[ "$INCLUDEDATA_" == "yes" ]] && echo -e "backup datadir... "
 echo -e "backup files..."
 mkdir -p $DESTDIR_
-tar -cf "\$DESTFILE" "\$DBBACKUP" nextcloud/ \
-  --exclude "nextcloud/data/*/files/*" \
-  --exclude "nextcloud/data/.opcache" \
-  --exclude "nextcloud/data/{access,error,nextcloud}.log" \
-  --exclude "nextcloud/data/access.log" \
-    || {
-          echo -e "error generating backup"
-          sudo -u www-data php "$BASEDIR"/nextcloud/occ maintenance:mode --off
-          return 1
-        }
-  rm "\$DBBACKUP"
-
-  [[ "$INCLUDEDATA_" == "yes" ]] && {
-    echo -e "backup data files..."
-    tar -rf "\$DESTFILE" -C "\$DATADIR"/.. "\$( basename "\$DATADIR" )" \
-    || {
-          echo -e "error generating backup"
-          sudo -u www-data php "$BASEDIR"/nextcloud/occ maintenance:mode --off
-          return 1
-        }
-  } 
-  echo -e "backup \$DESTFILE generated"
+tar --exclude "nextcloud/data/*/files/*" \
+    --exclude "nextcloud/data/.opcache" \
+    --exclude "nextcloud/data/{access,error,nextcloud}.log" \
+    --exclude "nextcloud/data/access.log" \
+    -cf "\$DESTFILE" "\$DBBACKUP" nextcloud/ \
+  || {
+        echo -e "error generating backup"
+        sudo -u www-data php "$BASEDIR"/nextcloud/occ maintenance:mode --off
+        return 1
+     }
+rm "\$DBBACKUP"
+
+[[ "$INCLUDEDATA_" == "yes" ]] && {
+  echo -e "backup data files..."
+  tar --exclude "data/.opcache" \
+      --exclude "data/{access,error,nextcloud}.log" \
+      --exclude "data/access.log" \
+      -rf "\$DESTFILE" -C "\$DATADIR"/.. "\$( basename "\$DATADIR" )" \
+  || {
+        echo -e "error generating backup"
+        sudo -u www-data php "$BASEDIR"/nextcloud/occ maintenance:mode --off
+        return 1
+      }
+} 
+echo -e "backup \$DESTFILE generated"
 
 cd $BASEDIR/nextcloud
 sudo -u www-data php occ maintenance:mode --off
diff --git a/etc/nextcloudpi-config.d/nc-backup.sh b/etc/nextcloudpi-config.d/nc-backup.sh
index 2de1591d..af940ec8 100644
--- a/etc/nextcloudpi-config.d/nc-backup.sh
+++ b/etc/nextcloudpi-config.d/nc-backup.sh
@@ -51,11 +51,11 @@ configure()
   # files
   echo -e "backup base files..."
   mkdir -p "$DESTDIR_"
-  tar -cf "$DESTFILE" "$DBBACKUP" nextcloud/ \
-    --exclude "nextcloud/data/*/files/*" \
-    --exclude "nextcloud/data/.opcache" \
-    --exclude "nextcloud/data/{access,error,nextcloud}.log" \
-    --exclude "nextcloud/data/access.log" \
+  tar --exclude "nextcloud/data/*/files/*" \
+      --exclude "nextcloud/data/.opcache" \
+      --exclude "nextcloud/data/{access,error,nextcloud}.log" \
+      --exclude "nextcloud/data/access.log" \
+      -cf "$DESTFILE" "$DBBACKUP" nextcloud/ \
     || {
           echo -e "error generating backup"
           sudo -u www-data php "$BASEDIR"/nextcloud/occ maintenance:mode --off
@@ -65,7 +65,10 @@ configure()
 
   [[ "$INCLUDEDATA_" == "yes" ]] && {
     echo -e "backup data files..."
-    tar -rf "$DESTFILE" -C "$DATADIR"/.. "$( basename "$DATADIR" )" \
+    tar --exclude "data/.opcache" \
+        --exclude "data/{access,error,nextcloud}.log" \
+        --exclude "data/access.log" \
+        -rf "$DESTFILE" -C "$DATADIR"/.. "$( basename "$DATADIR" )" \
     || {
           echo -e "error generating backup"
           sudo -u www-data php "$BASEDIR"/nextcloud/occ maintenance:mode --off
-- 
cgit v1.2.3