Selaa lähdekoodia

corrected path to archive

Pi 4 vuotta sitten
vanhempi
sitoutus
9b95d631ab
1 muutettua tiedostoa jossa 11 lisäystä ja 5 poistoa
  1. 11 5
      opt/TopGunSoftware/PicturesBackup3

+ 11 - 5
opt/TopGunSoftware/PicturesBackup3

@@ -42,7 +42,7 @@ PIHOMEFOLDER=PiHomeBackup			## Name of Folder that will store the archives
 PIHOMEFILENAME=PiHomeBackup-$DATE.tar.gz	## Filename structure for archives
 
 OWNCLOUDPATHTOFILES=storage/nextcloud/		## Folder containing data that will be backed up
-#OWNCLOUDPATHTOFILES=storage/owncloud/data/mike/files/Network		## Folder containing data that will be backed up
+#OWNCLOUDPATHTOFILES=storage/nextcloud/mike/files/Network		## Folder containing data that will be backed up
 OWNCLOUDFOLDER=PiOwncloudBackup			## Name of Folder that will store the archives
 OWNCLOUDFILENAME=PiOwncloudArchive-$DATE.tar.gz ## Filename structure for archives
 
@@ -72,6 +72,7 @@ FLAGPICTURES=0
 FLAGPHONE=0
 FLAGCLEAN=0				## If 0, -C must be called to clean after archiving.  If 1, cleaning will occur automatically
 FLAGTESTING=0 				## TEST MODE ACTIVE IF 1 OR HIGHER ##
+FLAGMYSQL=0
 ## END VARIABLES  ##
 
 ## BEGIN FUNCTIONS  ##
@@ -140,7 +141,6 @@ write () {
 buildtar () {
 
 	addtolog "buildtar: buildtar started for $1."
-	FLAGMYSQL=0
 	case $1 in
 		PiHome)
 			FILENAME=$PIHOMEFOLDER/$PIHOMEFILENAME
@@ -151,7 +151,7 @@ buildtar () {
 			FILENAME=$OWNCLOUDFOLDER/$OWNCLOUDFILENAME
 			PATHTOFILES=$OWNCLOUDPATHTOFILES
 			KEEPFILES=$OWNCLOUDKEEPFILES	#Number of archives to keep on TOMCAT
-			FLAGMYSQL= 1
+			FLAGMYSQL=1
 			##
 			## ADD FUNCTIONALITY TO BACKUP MYSQL DATABASE
 			##
@@ -161,13 +161,19 @@ buildtar () {
 	if [ ! $FLAGTESTING -gt "0" ]; then
 		tar -czf $LOCALARCHIVEPATH/$FILENAME -C / $PATHTOFILES 2>> $PATHTOLOG
 
-    if [ $FLAGMYSQL -gt "0"]; then
+    if [ $FLAGMYSQL -gt "0" ]; then
+####  THIS FAILS BECAUSE TAR CANNOT ADD A FILE TO A GZIPPED TARBALL.
+####  MUST EITHER UNZIP ; ADD ; AND REZIP
+####  -- OR --
+####  ADD FILE _BEFORE_ ZIPPING SOMEHOW
+
+####  ALSO - Make sure OCC goes into mx mode BEFORE beginning archiving!
       addtolog "Beginning MySQL dump."
       sudo -u www-data php /var/www/nextcloud/occ maintenance:mode --on && addtolog "Nextcloud maintenance:mode --on" || addtolog "FAILED to activate Nextcloud maintenance:mode.  Aborting MYSQL dump."
       mysqldump --single-transaction -u nextclouduser -pcherokee76 nextcloud > $LOCALARCHIVEPATH/$OWNCLOUDFOLDER/nextcloud_sql_bak`date +"%Y%m%d"`.bak
       sudo -u www-data php /var/www/nextcloud/occ maintenance:mode --off && addtolog "Nextcloud maintenance:mode --off" || addtolog "FAILED to de-activate Nextcloud maintenance:mode."
 
-      tar -r $LOCALARCHIVEPATH/$FILENAME nextcloud_sql_bak`date +"%Y%m%d"`.bak && addtolog "Added mysqldump to tar archive." || addtolog "FAILED to add mysql dump to tar archive."
+      tar -rf --force-local $LOCALARCHIVEPATH/$FILENAME $LOCALARCHIVEPATH/$OWNCLOUDFOLDER/nextcloud_sql_bak`date +"%Y%m%d"`.bak && addtolog "Added mysqldump to tar archive." || addtolog "FAILED to add mysql dump to tar archive."
 
     fi