[fix] Check before to apply changes

I have fix a final_path empty var too, and I have switch the order to reload php and nginx (php should be restarted before applying new nginx conf (with php-fpm call)).
This commit is contained in:
ljf (zamentur) 2017-02-08 10:49:25 +01:00 committed by GitHub
parent d969a2449d
commit 03aca0f91a

View file

@ -15,17 +15,25 @@ source /usr/share/yunohost/helpers
# Retrieve old app settings # Retrieve old app settings
domain=$(ynh_app_setting_get "$app" domain) domain=$(ynh_app_setting_get "$app" domain)
path_url=$(ynh_app_setting_get "$app" path_url) path_url=$(ynh_app_setting_get "$app" path_url)
src_path="/var/www/${app}"
nginx_conf="/etc/nginx/conf.d/${domain}.d/${app}.conf"
php_conf="/etc/php5/fpm/pool.d/${app}.conf"
# Check domain/path availability # Check domain/path availability
sudo yunohost app checkurl "${domain}${path_url}" -a "$app" \ sudo yunohost app checkurl "${domain}${path_url}" -a "$app" \
|| ynh_die "Path not available: ${domain}${path_url}" || ynh_die "Path not available: ${domain}${path_url}"
if [ -d $final_path ]; then if [ -d $src_path ]; then
ynh_die "There is already a directory: $final_path" ynh_die "There is already a directory: $src_path"
fi
if [ -f $nginx_conf ]; then
ynh_die "There is already a nginx conf file at this path: $nginx_conf"
fi
if [ -f $php_conf ]; then
ynh_die "There is already a php conf file at this path: $php_conf"
fi fi
# Restore sources & data # Restore sources & data
src_path="/var/www/${app}"
sudo cp -a ./sources "$src_path" sudo cp -a ./sources "$src_path"
# Restore permissions to app files # Restore permissions to app files
@ -43,18 +51,15 @@ sudo chown -R root: "$src_path"
### MySQL end ### ### MySQL end ###
# Restore NGINX configuration # Restore NGINX configuration
nginx_conf=/etc/nginx/conf.d/${domain}.d/${app}.conf
if [ -f $nginx_conf ]; then
ynh_die "There is already a nginx conf file at this path: $nginx_conf"
fi
sudo cp -a ./nginx.conf "$nginx_conf" sudo cp -a ./nginx.conf "$nginx_conf"
# Reload Nginx
sudo service nginx reload
### PHP (remove if not used) ### ### PHP (remove if not used) ###
# If a dedicated php-fpm process is used: # If a dedicated php-fpm process is used:
# # Copy PHP-FPM pool configuration and reload the service # # Copy PHP-FPM pool configuration and reload the service
sudo cp -a ./php-fpm.conf "/etc/php5/fpm/pool.d/${app}.conf" sudo cp -a ./php-fpm.conf "$php_conf"
sudo service php5-fpm reload sudo service php5-fpm reload
### PHP end ### ### PHP end ###
# Reload Nginx
sudo service nginx reload