Merge pull request #30 from YunoHost-Apps/patch

Small Fixes

scripts/change_url

@@ -58,12 +58,12 @@ final_path=/var/www/$app
 # Change the path in the NGINX config file
 if [ $change_path -eq 1 ]
 then
-  # Make a backup of the original nginx config file if modified
+  # Make a backup of the original NGINX config file if modified
   ynh_backup_if_checksum_is_different --file="$nginx_conf_path"
-  # Set global variables for nginx helper
+  # Set global variables for NGINX helper
   domain="$old_domain"
   path_url="$new_path"
-  # Create a dedicated nginx config
+  # Create a dedicated NGINX config
   ynh_add_nginx_config
 fi
 
@@ -76,7 +76,7 @@ else [ $change_path -eq 1 ]
    ynh_replace_string --match_string="const WWW_URI = '$old_path/';" --replace_string="const WWW_URI = '$new_path/';" --target_file="$final_path/config.local.php"
 fi
 
-# Change the domain for nginx
+# Change the domain for NGINX
 if [ $change_domain -eq 1 ]; then
   # Delete file checksum for the old conf file location
   ynh_delete_file_checksum --file="$nginx_conf_path"

scripts/install

@@ -33,7 +33,7 @@ ynh_script_progression --message="Validating installation parameters..." --weigh
 final_path=/var/www/$app
 test ! -e "$final_path" || ynh_die "This path already contains a folder"
 
-# Normalize the url path syntax
+# Normalize the URL path syntax
 path_url=$(ynh_normalize_url_path $path_url)
 
 # Check web path availability
@@ -71,7 +71,7 @@ ynh_setup_source --dest_dir="$final_path"
 #=================================================
 ynh_script_progression --message="Configuring NGINX web server..." --weight=2
 
-# Create a dedicated nginx config
+# Create a dedicated NGINX config
 ynh_add_nginx_config
 
 #=================================================
@@ -80,7 +80,7 @@ ynh_add_nginx_config
 ynh_script_progression --message="Configuring PHP-FPM..." --weight=5
 
 # Create a dedicated PHP-FPM config
-ynh_add_fpm_config --phpversion=$YNH_PHP_VERSION --package="$extra_php_dependencies"
+ynh_add_fpm_config --package="$extra_php_dependencies"
 phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
 
 #=================================================

scripts/remove

@@ -32,7 +32,7 @@ ynh_secure_remove --file="$final_path"
 #=================================================
 ynh_script_progression --message="Removing NGINX web server configuration..." --weight=1
 
-# Remove the dedicated nginx config
+# Remove the dedicated NGINX config
 ynh_remove_nginx_config
 
 #=================================================
@@ -40,7 +40,7 @@ ynh_remove_nginx_config
 #=================================================
 ynh_script_progression --message="Removing PHP-FPM configuration..." --weight=2
 
-# Remove the dedicated php-fpm config
+# Remove the dedicated PHP-FPM config
 ynh_remove_fpm_config --package="$extra_php_dependencies"
 
 #=================================================

scripts/restore

@@ -76,7 +76,7 @@ ynh_script_progression --message="Reconfiguring PHP-FPM..." --weight=6
 
 ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf"
 
-ynh_add_fpm_config --phpversion=$YNH_PHP_VERSION --package="$extra_php_dependencies"
+ynh_add_fpm_config --package="$extra_php_dependencies"
 
 #=================================================
 # GENERIC FINALIZATION

scripts/upgrade

@@ -123,7 +123,7 @@ ynh_add_nginx_config
 ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=2
 
 # Create a dedicated PHP-FPM config
-ynh_add_fpm_config --phpversion=$YNH_PHP_VERSION --package="$extra_php_dependencies"
+ynh_add_fpm_config --package="$extra_php_dependencies"
 
 #=======================================================
 # backup bdd, squelettes directory and config.local.php