mirror of
https://github.com/YunoHost-Apps/spip_ynh.git
synced 2024-09-03 20:25:59 +02:00
Corrige la bêtise sur la vérif des fichiers de conf
This commit is contained in:
parent
32d81aeafb
commit
f56c8f2676
1 changed files with 9 additions and 9 deletions
|
@ -27,26 +27,26 @@ if [ -d $final_path ]; then
|
|||
fi
|
||||
|
||||
# Check configuration files nginx
|
||||
nginx_conf="/etc/nginx/conf.d/${domain}.d/${app}.conf"
|
||||
nginx_conf="/etc/nginx/conf.d/${domain}.d/nginx.conf"
|
||||
if [ -f $nginx_conf ]; then
|
||||
ynh_die "The NGINX configuration already exists at '${nginx_conf}'. You should safely delete it before restoring this app."
|
||||
|
||||
# Check configuration files php-fpm
|
||||
phpfpm_conf="/etc/php5/fpm/pool.d/${app}.conf"
|
||||
phpfpm_conf="/etc/php5/fpm/pool.d/php-fpm.conf"
|
||||
if [ -f $phpfpm_conf ]; then
|
||||
ynh_die "The PHP FPM configuration already exists at '${phpfpm_conf}'. You should safely delete it before restoring this app."
|
||||
fi
|
||||
|
||||
phpfpm_ini="/etc/php5/fpm/conf.d/20-${app}.ini"
|
||||
phpfpm_ini="/etc/php5/fpm/conf.d/php-fpm.ini"
|
||||
if [ -f $phpfpm_ini ]; then
|
||||
ynh_die "The PHP FPM INI configuration already exists at '${phpfpm_ini}'. You should safely delete it before restoring this app."
|
||||
fi
|
||||
|
||||
# Restore sources & data
|
||||
sudo cp -a ./sources "$final_path"
|
||||
# Restore sources & data
|
||||
sudo cp -a ./sources "${final_path}"
|
||||
|
||||
# Set permissions
|
||||
sudo chown -R www-data: "$final_path"
|
||||
sudo chown -R www-data: "${final_path}"
|
||||
|
||||
# Restore db
|
||||
# if [[ $with_mysql -eq 1 ]]; then
|
||||
|
@ -60,10 +60,10 @@ sudo sed -i "s@__DB_PWD__@$db_pwd@g" $final_path/config/connect.php
|
|||
# fi
|
||||
|
||||
# Restore nginx configuration files
|
||||
sudo cp -a ./nginx.conf "$nginx_conf"
|
||||
sudo cp -a ./nginx.conf "${nginx_conf}"
|
||||
# Restore php-fpm configuration files
|
||||
sudo cp -a ./php-fpm.conf "$phpfpm_conf"
|
||||
sudo cp -a ./php-fpm.ini "$phpfpm_ini"
|
||||
sudo cp -a ./php-fpm.conf "${phpfpm_conf}"
|
||||
sudo cp -a ./php-fpm.ini "${phpfpm_ini}"
|
||||
|
||||
# Reload services
|
||||
sudo service nginx reload
|
||||
|
|
Loading…
Reference in a new issue