Fixed problems with special chars in passwords

DB system is configured in the variable area
Restore: check for prerequisites

diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644 (file)
index 0000000..b906160
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,13 @@
+# Changelog
+
+## 1.0.0
+
+### General
+- Versioning of Nextcloud-Backup-Restore.
+- The database system (MySQL/MariaDB or PostgreSQL) is configured in the variable area of the scripts, so it's not necessary to comment/uncomment the specific database commands.
+- Special characters for the database password can be used now.
+- Single quotes for variables.
+
+### Restore
+- The commands for retoring the database are checked at the beginning of the script. Is the specific database system is not installed, the restore is cancelled.
+- The default main backup directory now is the same as in the backup script.
\ No newline at end of file

diff --git a/NextcloudBackup.sh b/NextcloudBackup.sh
index f433a8d9b4653ccebeeb9473e6a65a926e1da173..8c578d0dbe04bd7200489b8c1ff867780da9a3df 100644 (file)
--- a/NextcloudBackup.sh
+++ b/NextcloudBackup.sh
@@ -2,6 +2,9 @@
 
 #
 # Bash script for creating backups of Nextcloud.
+#
+# Version 1.0.0
+#
 # Usage:
 #      - With backup directory specified in the script:  ./NextcloudBackup.sh
 #      - With backup directory specified by parameter: ./NextcloudBackup.sh <BackupDirectory> (e.g. ./NextcloudBackup.sh /media/hdd/nextcloud_backup)
@@ -20,7 +23,7 @@ backupMainDir=$1
 
 if [ -z "$backupMainDir" ]; then
        # TODO: The directory where you store the Nextcloud backups (when not specified by args)
-    backupMainDir="/media/hdd/nextcloud_backup"
+    backupMainDir='/media/hdd/nextcloud_backup'
 fi
 
 echo "Backup directory: $backupMainDir"
@@ -31,43 +34,46 @@ currentDate=$(date +"%Y%m%d_%H%M%S")
 backupdir="${backupMainDir}/${currentDate}/"
 
 # TODO: The directory of your Nextcloud installation (this is a directory under your web root)
-nextcloudFileDir="/var/www/nextcloud"
+nextcloudFileDir='/var/www/nextcloud'
 
 # TODO: The directory of your Nextcloud data directory (outside the Nextcloud file directory)
 # If your data directory is located under Nextcloud's file directory (somewhere in the web root), the data directory should not be a separate part of the backup
-nextcloudDataDir="/var/nextcloud_data"
+nextcloudDataDir='/var/nextcloud_data'
 
 # TODO: The directory of your Nextcloud's local external storage.
 # Uncomment if you use local external storage.
-#nextcloudLocalExternalDataDir="/var/nextcloud_external_data"
+#nextcloudLocalExternalDataDir='/var/nextcloud_external_data'
 
 # TODO: The service name of the web server. Used to start/stop web server (e.g. 'systemctl start <webserverServiceName>')
-webserverServiceName="nginx"
+webserverServiceName='nginx'
+
+# TODO: Your web server user
+webserverUser='www-data'
+
+# TODO: The name of the database system (ome of: mysql, mariadb, postgresql)
+databaseSystem='mariadb'
 
 # TODO: Your Nextcloud database name
-nextcloudDatabase="nextcloud_db"
+nextcloudDatabase='nextcloud_db'
 
 # TODO: Your Nextcloud database user
-dbUser="nextcloud_db_user"
+dbUser='nextcloud_db_user'
 
 # TODO: The password of the Nextcloud database user
-dbPassword="mYpAsSw0rd"
-
-# TODO: Your web server user
-webserverUser="www-data"
+dbPassword='mYpAsSw0rd'
 
 # TODO: The maximum number of backups to keep (when set to 0, all backups are kept)
 maxNrOfBackups=0
 
 # File names for backup files
 # If you prefer other file names, you'll also have to change the NextcloudRestore.sh script.
-fileNameBackupFileDir="nextcloud-filedir.tar.gz"
-fileNameBackupDataDir="nextcloud-datadir.tar.gz"
+fileNameBackupFileDir='nextcloud-filedir.tar.gz'
+fileNameBackupDataDir='nextcloud-datadir.tar.gz'
 
 # TOOD: Uncomment if you use local external storage
-#fileNameBackupExternalDataDir="nextcloud-external-datadir.tar.gz"
+#fileNameBackupExternalDataDir='nextcloud-external-datadir.tar.gz'
 
-fileNameBackupDb="nextcloud-db.sql"
+fileNameBackupDb='nextcloud-db.sql'
 
 # Function for error messages
 errorecho() { cat <<< "$@" 1>&2; }
@@ -158,14 +164,31 @@ echo
 #
 # Backup DB
 #
-echo "Backup Nextcloud database..."
-# MySQL/MariaDB:
-mysqldump --single-transaction -h localhost -u "${dbUser}" -p"${dbPassword}" "${nextcloudDatabase}" > "${backupdir}/${fileNameBackupDb}"
+if [ "${databaseSystem,,}" = "mysql" ] || [ "${databaseSystem,,}" = "mariadb" ]; then
+       echo "Backup Nextcloud database (MySQL/MariaDB)..."
 
-# PostgreSQL (uncomment if you are using PostgreSQL as Nextcloud database)
-#PGPASSWORD="${dbPassword}" pg_dump "${nextcloudDatabase}" -h localhost -U "${dbUser}" -f "${backupdir}/${fileNameBackupDb}"
-echo "Done"
-echo
+       if ! [ -x "$(command -v mysqldump)" ]; then
+               errorecho "ERROR: MySQL/MariaDB not installed (command mysqldump not found)."
+               errorecho "ERROR: No backup of database possible!"
+       else
+               mysqldump --single-transaction -h localhost -u "${dbUser}" -p"${dbPassword}" "${nextcloudDatabase}" > "${backupdir}/${fileNameBackupDb}"
+       fi
+
+       echo "Done"
+       echo
+elif [ "${databaseSystem,,}" = "postgresql" ]; then
+       echo "Backup Nextcloud database (PostgreSQL)..."
+
+       if ! [ -x "$(command -v pg_dump)" ]; then
+               errorecho "ERROR:PostgreSQL not installed (command pg_dump not found)."
+               errorecho "ERROR: No backup of database possible!"
+       else
+               PGPASSWORD="${dbPassword}" pg_dump "${nextcloudDatabase}" -h localhost -U "${dbUser}" -f "${backupdir}/${fileNameBackupDb}"
+       fi
+       
+       echo "Done"
+       echo
+fi
 
 #
 # Start web server

diff --git a/NextcloudRestore.sh b/NextcloudRestore.sh
index f3ff6cccaad6a2402077d0c64f1c8d696a8503e6..f81d65d792878bbd9baf7d9f78bf37bde9a2dc31 100644 (file)
--- a/NextcloudRestore.sh
+++ b/NextcloudRestore.sh
@@ -2,7 +2,10 @@
 
 #
 # Bash script for restoring backups of Nextcloud.
-# Usage: 
+#
+# Version 1.0.0
+#
+# Usage:
 #   - With backup directory specified in the script: ./NextcloudRestore.sh <BackupName> (e.g. ./NextcloudRestore.sh 20170910_132703)
 #   - With backup directory specified by parameter: ./NextcloudRestore.sh <BackupName> <BackupDirectory> (e.g. ./NextcloudRestore.sh 20170910_132703 /media/hdd/nextcloud_backup)
 #
@@ -21,7 +24,7 @@ backupMainDir=$2
 
 if [ -z "$backupMainDir" ]; then
        # TODO: The directory where you store the Nextcloud backups (when not specified by args)
-    backupMainDir="/mnt/hdd1/nextcloudb_backup"
+    backupMainDir='/media/hdd/nextcloud_backup'
 fi
 
 echo "Backup directory: $backupMainDir"
@@ -29,40 +32,43 @@ echo "Backup directory: $backupMainDir"
 currentRestoreDir="${backupMainDir}/${restore}"
 
 # TODO: The directory of your Nextcloud installation (this is a directory under your web root)
-nextcloudFileDir="/var/www/nextcloud"
+nextcloudFileDir='/var/www/nextcloud'
 
 # TODO: The directory of your Nextcloud data directory (outside the Nextcloud file directory)
 # If your data directory is located under Nextcloud's file directory (somewhere in the web root), the data directory should not be restored separately
-nextcloudDataDir="/var/nextcloud_data"
+nextcloudDataDir='/var/nextcloud_data'
 
 # TODO: The directory of your Nextcloud's local external storage.
 # Uncomment if you use local external storage.
-#nextcloudLocalExternalDataDir="/var/nextcloud_external_data"
+#nextcloudLocalExternalDataDir='/var/nextcloud_external_data'
 
 # TODO: The service name of the web server. Used to start/stop web server (e.g. 'systemctl start <webserverServiceName>')
-webserverServiceName="nginx"
+webserverServiceName='nginx'
+
+# TODO: Your web server user
+webserverUser='www-data'
+
+# TODO: The name of the database system (ome of: mysql, mariadb, postgresql)
+databaseSystem='mariadb'
 
 # TODO: Your Nextcloud database name
-nextcloudDatabase="nextcloud_db"
+nextcloudDatabase='nextcloud_db'
 
 # TODO: Your Nextcloud database user
-dbUser="nextcloud_db_user"
+dbUser='nextcloud_db_user'
 
 # TODO: The password of the Nextcloud database user
-dbPassword="mYpAsSw0rd"
-
-# TODO: Your web server user
-webserverUser="www-data"
+dbPassword='mYpAsSw0rd'
 
 # File names for backup files
 # If you prefer other file names, you'll also have to change the NextcloudBackup.sh script.
-fileNameBackupFileDir="nextcloud-filedir.tar.gz"
-fileNameBackupDataDir="nextcloud-datadir.tar.gz"
+fileNameBackupFileDir='nextcloud-filedir.tar.gz'
+fileNameBackupDataDir='nextcloud-datadir.tar.gz'
 
 # TOOD: Uncomment if you use local external storage
-#fileNameBackupExternalDataDir="nextcloud-external-datadir.tar.gz"
+#fileNameBackupExternalDataDir='nextcloud-external-datadir.tar.gz'
 
-fileNameBackupDb="nextcloud-db.sql"
+fileNameBackupDb='nextcloud-db.sql'
 
 # Function for error messages
 errorecho() { cat <<< "$@" 1>&2; }
@@ -91,10 +97,29 @@ fi
 #
 if [ ! -d "${currentRestoreDir}" ]
 then
-        errorecho "ERROR: Backup ${restore} not found!"
+       errorecho "ERROR: Backup ${restore} not found!"
     exit 1
 fi
 
+#
+# Check if the commands for restoring the database are available
+#
+if [ "${databaseSystem,,}" = "mysql" ] || [ "${databaseSystem,,}" = "mariadb" ]; then
+    if ! [ -x "$(command -v mysql)" ]; then
+               errorecho "ERROR: MySQL/MariaDB not installed (command mysql not found)."
+               errorecho "ERROR: No restore of database possible!"
+        errorecho "Cancel restore"
+        exit 1
+    fi
+elif [ "${databaseSystem,,}" = "postgresql" ]; then
+    if ! [ -x "$(command -v psql)" ]; then
+               errorecho "ERROR: PostgreSQL not installed (command psql not found)."
+               errorecho "ERROR: No restore of database possible!"
+        errorecho "Cancel restore"
+        exit 1
+       fi
+fi
+
 #
 # Set maintenance mode
 #
@@ -164,32 +189,38 @@ echo
 # Restore database
 #
 echo "Dropping old Nextcloud DB..."
-# MySQL/MariaDB:
-mysql -h localhost -u "${dbUser}" -p"${dbPassword}" -e "DROP DATABASE ${nextcloudDatabase}"
 
-# PostgreSQL (uncomment if you are using PostgreSQL as Nextcloud database)
-#sudo -u postgres psql -c "DROP DATABASE ${nextcloudDatabase};"
+if [ "${databaseSystem,,}" = "mysql" ] || [ "${databaseSystem,,}" = "mariadb" ]; then
+    mysql -h localhost -u "${dbUser}" -p"${dbPassword}" -e "DROP DATABASE ${nextcloudDatabase}"
+elif [ "${databaseSystem,,}" = "postgresql" ]; then
+       sudo -u postgres psql -c "DROP DATABASE ${nextcloudDatabase};"
+fi
+
 echo "Done"
 echo
 
 echo "Creating new DB for Nextcloud..."
-# MySQL/MariaDB:
-# Use this if the databse from the backup uses UTF8 with multibyte support (e.g. for emoijs in filenames):
-mysql -h localhost -u "${dbUser}" -p"${dbPassword}" -e "CREATE DATABASE ${nextcloudDatabase} CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci"
-# Use this if the database from the backup DOES NOT use UTF8 with multibyte support (e.g. for emoijs in filenames):
-#mysql -h localhost -u "${dbUser}" -p"${dbPassword}" -e "CREATE DATABASE ${nextcloudDatabase}"
-
-# PostgreSQL (uncomment if you are using PostgreSQL as Nextcloud database)
-#sudo -u postgres psql -c "CREATE DATABASE ${nextcloudDatabase} WITH OWNER ${dbUser} TEMPLATE template0 ENCODING \"UTF8\";"
+
+if [ "${databaseSystem,,}" = "mysql" ] || [ "${databaseSystem,,}" = "mariadb" ]; then
+    # Use this if the databse from the backup uses UTF8 with multibyte support (e.g. for emoijs in filenames):
+    mysql -h localhost -u "${dbUser}" -p"${dbPassword}" -e "CREATE DATABASE ${nextcloudDatabase} CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci"
+    # TODO: Use this if the database from the backup DOES NOT use UTF8 with multibyte support (e.g. for emoijs in filenames):
+    #mysql -h localhost -u "${dbUser}" -p"${dbPassword}" -e "CREATE DATABASE ${nextcloudDatabase}"
+elif [ "${databaseSystem,,}" = "postgresql" ]; then
+    sudo -u postgres psql -c "CREATE DATABASE ${nextcloudDatabase} WITH OWNER ${dbUser} TEMPLATE template0 ENCODING \"UTF8\";"
+fi
+
 echo "Done"
 echo
 
 echo "Restoring backup DB..."
-# MySQL/MariaDB:
-mysql -h localhost -u "${dbUser}" -p"${dbPassword}" "${nextcloudDatabase}" < "${currentRestoreDir}/${fileNameBackupDb}"
 
-# PostgreSQL (uncomment if you are using PostgreSQL as Nextcloud database)
-#sudo -u postgres psql "${nextcloudDatabase}" < "${currentRestoreDir}/${fileNameBackupDb}"
+if [ "${databaseSystem,,}" = "mysql" ] || [ "${databaseSystem,,}" = "mariadb" ]; then
+       mysql -h localhost -u "${dbUser}" -p"${dbPassword}" "${nextcloudDatabase}" < "${currentRestoreDir}/${fileNameBackupDb}"
+elif [ "${databaseSystem,,}" = "postgresql" ]; then
+       sudo -u postgres psql "${nextcloudDatabase}" < "${currentRestoreDir}/${fileNameBackupDb}"
+fi
+
 echo "Done"
 echo