Merge branch 'zamentur-master'

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
+# Copy Nginx 
+sudo cp -a /etc/nginx/conf.d/$domain.d/$app.conf $backup_dir/nginx.conf

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
+# 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

scripts/upgrade

@@ -1,5 +1,5 @@
 #!/bin/bash
-
+APP=`echo -n doku;echo wiki`
 domain=$(sudo yunohost app setting dokuwiki domain)
 path=$(sudo yunohost app setting dokuwiki path)
 admin=$(sudo yunohost app setting dokuwiki admin)
@@ -16,13 +16,13 @@ fi
 path=${path%/}
 
 # Modify dokuwiki conf
-sed -i "s@YNH_ADMIN_USER@$admin@g" ../conf/dokuwiki.php
+sed -i "s@YNH_ADMIN_USER@$admin@g" ../conf/$APP.php
 
 # Copy files to the right place
 final_path=/var/www/dokuwiki
 sudo mkdir -p $final_path
 sudo cp -a ../sources/* $final_path
-sudo cp ../conf/dokuwiki.php $final_path/conf
+sudo cp ../conf/$APP.php $final_path/conf
 sudo cp ../conf/acl.auth.php $final_path/conf
 
 # Files owned by root, www-data can just read