From 665c6a8f2bf2a8860818166b14481dfda374889c Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 13 Nov 2020 14:55:16 +0100 Subject: [PATCH] Cleaning up --- README.md | 2 +- conf/nginx.conf | 3 +-- scripts/install | 2 +- scripts/restore | 3 ++- scripts/upgrade | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index dd1a91e..c53153d 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ API (mini) How To: * Into your user profile: Settings > profil * Setup an API password * Check the API is working: https://exemple.tld/rss/api/greader.php -* Setup your client with: username: ynh user, password: the password you just setup, url https://exemple.tld/rss/api/greader.php +* Setup your client with: username: ynh user, password: the password you just setup, URL https://exemple.tld/rss/api/greader.php ## Documentation diff --git a/conf/nginx.conf b/conf/nginx.conf index 42b044f..f1cc745 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -5,8 +5,8 @@ location __PATH__/ { rewrite ^ https://$server_name$request_uri? permanent; } -### Example PHP configuration (remove it if not used) index index.html index.php; + try_files $uri $uri/ /index.php?$args; location ~ [^/]\.php(/|$) { fastcgi_split_path_info ^(.+?\.php)(/.*)$; @@ -18,5 +18,4 @@ location __PATH__/ { fastcgi_param PATH_INFO $fastcgi_path_info; fastcgi_param SCRIPT_FILENAME $request_filename; } -### End of PHP configuration part } diff --git a/scripts/install b/scripts/install index ea889c6..9f66a19 100755 --- a/scripts/install +++ b/scripts/install @@ -89,7 +89,7 @@ ynh_system_user_create --username=$app ynh_script_progression --message="Configuring PHP-FPM..." # 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) #================================================= diff --git a/scripts/restore b/scripts/restore index 1c5a04c..fa75827 100644 --- a/scripts/restore +++ b/scripts/restore @@ -80,7 +80,8 @@ ynh_script_progression --message="Reconfiguring PHP-FPM..." --weight=5 ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" -ynh_add_fpm_config --phpversion=$phpversion --package="$extra_php_dependencies" +ynh_add_fpm_config --package="$extra_php_dependencies" + #================================================= # SPECIFIC RESTORATION #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 68f91f9..c50675e 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -112,7 +112,7 @@ ynh_system_user_create --username=$app ynh_script_progression --message="Upgrading PHP-FPM configuration..." # 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" #================================================= # SPECIFIC UPGRADE