YunoHost-Apps/dokuwiki_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/dokuwiki_ynh.git synced 2024-09-03 18:26:20 +02:00
Code Issues Activity Actions

Boolean pour multi_instance + Correction Backup/restore

Browse source
This commit is contained in:
magikcypress 2017-03-09 15:05:36 +01:00
parent 95777a6e15
commit fd7643f8a3
3 changed files with 38 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
manifest.json
View file

@ -18,7 +18,7 @@
"name": "opi", "name": "opi",
"email": "opi@zeropi.net" "email": "opi@zeropi.net"
}, },
"multi_instance": "true", "multi_instance": true,
"services": [ "services": [
"nginx", "nginx",
"php5-fpm" "php5-fpm"

25
scripts/backup
View file

@ -3,26 +3,21 @@
# Exit on command errors and treat unset variables as an error # Exit on command errors and treat unset variables as an error
set -eu set -eu
# The parameter $1 is the backup directory location dedicated to the app # Get multi-instances specific variables
backup_dir=$1
# The parameter $2 is theid of the app instance
app=$YNH_APP_INSTANCE_NAME app=$YNH_APP_INSTANCE_NAME
# Source app helpers # Source app helpers
source /usr/share/yunohost/helpers source /usr/share/yunohost/helpers
domain=$(ynh_app_setting_get $app domain) # Retrieve app settings
final_path=$(ynh_app_setting_get $app final_path) domain=$(ynh_app_setting_get "$app" domain)
# Copy the app files # Copy the app files
sudo mkdir -p ${backup_dir}/var/www final_path="/var/www/${app}"
sudo cp -a $final_path "${backup_dir}/var/www/$app" ynh_backup "$final_path" "sources" 1
# Copy the conf files # Copy the nginx conf files
sudo mkdir -p "${backup_dir}/conf" ynh_backup "/etc/nginx/conf.d/${domain}.d/${app}.conf" "nginx.conf"
sudo cp -a /etc/nginx/conf.d/$domain.d/$app.conf "${backup_dir}/conf/nginx.conf" # Copy the php-fpm conf files
ynh_backup "/etc/php5/fpm/pool.d/${app}.conf" "php-fpm.conf"
# Copy dedicated php-fpm process to backup folder ynh_backup "/etc/php5/fpm/conf.d/20-${app}.ini" "php-fpm.ini"
sudo cp -a /etc/php5/fpm/pool.d/$app.conf "${backup_dir}/conf/php-fpm.conf"
sudo cp -a /etc/php5/fpm/conf.d/20-$app.ini "${backup_dir}/conf/php-fpm.ini"

56
scripts/restore
View file

@ -4,9 +4,6 @@
# Exit on command errors and treat unset variables as an error # Exit on command errors and treat unset variables as an error
set -eu set -eu
# 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 # The parameter $2 is the id of the app instance ex: ynhexample__2
app=$YNH_APP_INSTANCE_NAME app=$YNH_APP_INSTANCE_NAME
@ -17,37 +14,38 @@ source /usr/share/yunohost/helpers
domain=$(ynh_app_setting_get $app domain) domain=$(ynh_app_setting_get $app domain)
path=$(ynh_app_setting_get $app path) path=$(ynh_app_setting_get $app path)
is_public=$(ynh_app_setting_get $app is_public) is_public=$(ynh_app_setting_get $app is_public)
final_path=$(ynh_app_setting_get $app final_path)
if [ -d $final_path ]; then # Check domain/path availability
ynh_die "There is already a directory: $final_path" sudo yunohost app checkurl "${domain}${path}" -a "$app" \
fi || ynh_die "Path not available: ${domain}${path}"
conf=/etc/nginx/conf.d/$domain.d/$app.conf # Restore sources & data
if [ -f $conf ]; then final_path="/var/www/${app}"
ynh_die "There is already a nginx conf file at this path: $conf" sudo cp -a ./sources "$final_path"
fi
# Restore conf files
sudo cp -a "${backup_dir}/conf/nginx.conf" $conf
# Reload Nginx # Check configuration files php-fpm
sudo service nginx reload nginx_conf="/etc/nginx/conf.d/${domain}.d/${app}.conf"
[[ -f $nginx_conf ]] && ynh_die \
sudo cp -a "${backup_dir}/var/www/$app" $final_path "The NGINX configuration already exists at '${nginx_conf}'.
You should safely delete it before restoring this app."
phpfpm_conf="/etc/php5/fpm/pool.d/${app}.conf"
[[ -f $phpfpm_conf ]] && ynh_die \
"The PHP FPM configuration already exists at '${phpfpm_conf}'.
You should safely delete it before restoring this app."
phpfpm_ini="/etc/php5/fpm/conf.d/20-${app}.ini"
[[ -f $phpfpm_ini ]] && ynh_die \
"The PHP FPM INI configuration already exists at '${phpfpm_ini}'.
You should safely delete it before restoring this app."
# Set permissions # Set permissions
# The files belong to www-data, to allow for updates.
sudo chown -R www-data: $final_path sudo chown -R www-data: $final_path
# Copy dedicated php-fpm process from backup folder to the right location # Restore nginx configuration files
sudo cp -a $backup_dir/conf/php-fpm.conf /etc/php5/fpm/pool.d/$app.conf sudo cp -a ./nginx.conf "$nginx_conf"
sudo cp -a $backup_dir/conf/php-fpm.ini /etc/php5/fpm/conf.d/20-$app.ini # Restore php-fpm configuration files
# And restart service sudo cp -a ./php-fpm.conf "$phpfpm_conf"
sudo service php5-fpm reload sudo cp -a ./php-fpm.ini "$phpfpm_ini"
# Set ssowat config # Reload services
if [ "$is_public" = "No" ]; sudo service php5-fpm reload || true
then sudo service nginx reload || true
ynh_app_setting_delete $app skipped_uris
fi
sudo yunohost app ssowatconf