From 8e1d25c82d06684c7aa9a1de95d1dc4343457c1d Mon Sep 17 00:00:00 2001 From: opi Date: Mon, 25 Jan 2016 13:17:55 +0100 Subject: [PATCH] [enh] Upgrade backup/restore script (compatible with old backup) --- scripts/backup | 21 ++++++++++-------- scripts/restore | 57 ++++++++++++++++++++++++++++++++++++++++++------- 2 files changed, 61 insertions(+), 17 deletions(-) diff --git a/scripts/backup b/scripts/backup index e705322..c2d4eb0 100755 --- a/scripts/backup +++ b/scripts/backup @@ -1,14 +1,17 @@ #!/bin/bash -# The parameter $1 is the backup directory location -# which will be compressed afterward -backup_dir=$1/apps/dokuwiki -mkdir -p $backup_dir +# The parameter $1 is the backup directory location dedicated to the app +backup_dir=$1 + +# The parameter $2 is theid of the app instance +app=$2 + + +domain=$(sudo yunohost app setting $app domain) +path=$(sudo yunohost app setting $app path) # Backup sources & data -sudo cp -a /var/www/dokuwiki/. $backup_dir/sources +sudo cp -a /var/www/$app/. $backup_dir/sources -# Copy Nginx and YunoHost parameters to make the script "standalone" -sudo cp -a /etc/yunohost/apps/dokuwiki/. $backup_dir/yunohost -domain=$(sudo yunohost app setting dokuwiki domain) -sudo cp -a /etc/nginx/conf.d/$domain.d/dokuwiki.conf $backup_dir/nginx.conf \ No newline at end of file +# Copy Nginx +sudo cp -a /etc/nginx/conf.d/$domain.d/$app.conf $backup_dir/nginx.conf diff --git a/scripts/restore b/scripts/restore index ef62cde..64718db 100755 --- a/scripts/restore +++ b/scripts/restore @@ -1,14 +1,55 @@ #!/bin/bash +# This restore script is adapted to Yunohost >=2.4 -# The parameter $1 is the uncompressed restore directory location -backup_dir=$1/apps/dokuwiki +# The parameter $1 is the backup directory location dedicated to the app +backup_dir=$1 + +# The parameter $2 is the id of the app instance ex: ynhexample__2 +app=$2 + +# Get old parameter of the app +domain=$(sudo yunohost app setting $app domain) +path=$(sudo yunohost app setting $app path) +user=$(sudo yunohost app setting $app allowed_users) +is_public=$(sudo yunohost app setting $app is_public) + +# Check domain/path availability +sudo yunohost app checkurl $domain$path -a $app +if [[ ! $? -eq 0 ]]; then + echo "There is already an app on this URL : $domain$path" | sudo tee /dev/stderr + exit 1 +fi + +final_path=/var/www/$app +if [ -d $final_path ]; then + echo "There is already a directory: $final_path " | sudo tee /dev/stderr + exit 1 +fi + +conf=/etc/nginx/conf.d/$domain.d/$app.conf +if [ -f $conf ]; then + echo "There is already a nginx conf file at this path: $conf " | sudo tee /dev/stderr + exit 1 +fi # Restore sources & data -sudo cp -a $backup_dir/sources/. /var/www/dokuwiki +sudo cp -a "${backup_dir}/sources" $final_path -# Copy Nginx and YunoHost parameters to make the script "standalone" -sudo cp -a $backup_dir/yunohost/. /etc/yunohost/apps/dokuwiki -domain=$(sudo yunohost app setting dokuwiki domain) -sudo cp -a $backup_dir/nginx.conf /etc/nginx/conf.d/$domain.d/dokuwiki.conf +# Set permissions +sudo chown -R www-data:root $final_path/{conf,data,data/attic,data/cache,data/index,data/locks,data/media*,data/meta,data/pages,data/tmp,lib/plugins} +sudo chmod -R 700 $final_path/{conf,data,data/attic,data/cache,data/index,data/locks,data/media*,data/meta,data/pages,data/tmp,lib/plugins} -sudo service nginx reload \ No newline at end of file +# Restore conf files +sudo cp -a "${backup_dir}/nginx.conf" $conf + +# Reload Nginx +sudo service nginx reload + +# Set ssowat config +if [ "$is_public" = "Yes" ]; +then + sudo yunohost app setting dokuwiki unprotected_uris -v "/" +fi + +sudo service nginx reload +sudo yunohost app ssowatconf