diff --git a/scripts/.fonctions b/scripts/.fonctions index 30c75b8..755b5bd 100644 --- a/scripts/.fonctions +++ b/scripts/.fonctions @@ -67,7 +67,7 @@ SETUP_SOURCE () { # Télécharge la source, décompresse et copie dans $final_pa src_url=$(cat ../conf/app.src | grep SOURCE_URL | cut -d= -f2) src_checksum=$(cat ../conf/app.src | grep SOURCE_SUM | cut -d= -f2) # Download sources from the upstream - wget -nv -O source.zip $src_url + sudo wget -nv -O source.zip $src_url # Vérifie la somme de contrôle de la source téléchargée. echo "$src_checksum source.zip" | md5sum -c --status || ynh_die "Corrupt source" # Extract source into the app dir diff --git a/scripts/restore b/scripts/restore index 2893b79..0e1ce7c 100644 --- a/scripts/restore +++ b/scripts/restore @@ -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 @@ -58,10 +58,10 @@ sudo rm -f "./db.sql" #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 php5-fpm reload || true