1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/grav_ynh.git synced 2024-09-03 19:16:01 +02:00

Refactoring upgrade/restore/backup

This commit is contained in:
magikcypress 2017-03-09 17:27:59 +01:00
parent 657f8b3d0f
commit f8262913cc
3 changed files with 46 additions and 60 deletions

View file

@ -3,26 +3,22 @@
# 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 app=$YNH_APP_INSTANCE_NAME
# The parameter $2 is theid of the app instance
app=$2
# 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)
with_mysql=$(ynh_app_setting_get "$app" with_mysql)
# 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"

View file

@ -4,11 +4,8 @@
# 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=$2 app=$YNH_APP_INSTANCE_NAME
# Source app helpers # Source app helpers
source /usr/share/yunohost/helpers source /usr/share/yunohost/helpers
@ -17,36 +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 # Check configuration files php-fpm
if [ -f $conf ]; then nginx_conf="/etc/nginx/conf.d/${domain}.d/${app}.conf"
ynh_die "There is already a nginx conf file at this path: $conf" [[ -f $nginx_conf ]] && ynh_die \
fi "The NGINX configuration already exists at '${nginx_conf}'.
# Restore conf files You should safely delete it before restoring this app."
sudo cp -a "${backup_dir}/conf/nginx.conf" $conf 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."
# Reload Nginx # Restore sources & data
sudo service nginx reload final_path="/var/www/${app}"
sudo cp -a ./sources "$final_path"
sudo cp -a "${backup_dir}/var/www/$app" $final_path
# Set permissions # Set permissions
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

View file

@ -26,24 +26,15 @@ fi
final_path=/var/www/$app final_path=/var/www/$app
db_name=$app
# Modify Nginx configuration file and copy it to Nginx conf directory # Modify Nginx configuration file and copy it to Nginx conf directory
sed -i "s@PATHTOCHANGE@$path@g" ../conf/nginx.conf* sed -i "s@__PATHTOCHANGE__@$app@g" ../conf/nginx.conf*
sed -i "s@ALIASTOCHANGE@$final_path/@g" ../conf/nginx.conf* sed -i "s@__FINALPATH__@$final_path/@g" ../conf/nginx.conf*
if [ $is_public = "Yes" ];
then
sudo cp ../conf/nginx.conf-public /etc/nginx/conf.d/$domain.d/$app.conf
else
sudo cp ../conf/nginx.conf /etc/nginx/conf.d/$domain.d/$app.conf
fi
# If app is public, add url to SSOWat conf as skipped_uris # If app is public, add url to SSOWat conf as skipped_uris
if [[ $is_public -eq 1 ]]; then if [ $is_public = "Yes" ];
# See install script then
ynh_app_setting_set "$app" unprotected_uris "/" ynh_app_setting_set "$app" unprotected_uris "/"
sudo cp ../conf/nginx.conf-public /etc/nginx/conf.d/$domain.d/$app.conf sudo cp ../conf/nginx.conf /etc/nginx/conf.d/$domain.d/$app.conf
else else
sudo cp ../conf/nginx.conf /etc/nginx/conf.d/$domain.d/$app.conf sudo cp ../conf/nginx.conf /etc/nginx/conf.d/$domain.d/$app.conf
fi fi