From 8aa2839c9b39962b48c3d21b0f623416e5e2a76e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 17 Nov 2023 12:11:58 +0100 Subject: [PATCH] cleaning --- conf/nginx.conf | 1 + manifest.toml | 3 +++ scripts/install | 7 +------ scripts/remove | 5 ----- scripts/restore | 2 +- 5 files changed, 6 insertions(+), 12 deletions(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index ddf172c..02ca6a4 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -9,6 +9,7 @@ location __PATH__/ { index index.php; try_files $uri $uri/ index.php; + location ~ [^/]\.php(/|$) { fastcgi_split_path_info ^(.+?\.php)(/.*)$; fastcgi_pass unix:/var/run/php/php__PHPVERSION__-fpm-__NAME__.sock; diff --git a/manifest.toml b/manifest.toml index f162050..f8cbfc2 100644 --- a/manifest.toml +++ b/manifest.toml @@ -20,8 +20,11 @@ code = "https://github.com/PHPBoost/PHPBoost" yunohost = ">= 11.2" architectures = "all" multi_instance = true + ldap = false + sso = false + disk = "50M" ram.build = "253M" ram.runtime = "50M" diff --git a/scripts/install b/scripts/install index e026f10..6180593 100644 --- a/scripts/install +++ b/scripts/install @@ -28,13 +28,8 @@ ynh_script_progression --message="Configuring NGINX web server..." --weight=4 # Create a dedicated NGINX config ynh_add_nginx_config -#================================================= -# PHP-FPM CONFIGURATION -#================================================= -ynh_script_progression --message="Configuring PHP-FPM..." --weight=3 - # Create a dedicated PHP-FPM config -ynh_add_fpm_config --usage=low --footprint=low +ynh_add_fpm_config #================================================= # END OF SCRIPT diff --git a/scripts/remove b/scripts/remove index 79cb058..61db822 100644 --- a/scripts/remove +++ b/scripts/remove @@ -17,11 +17,6 @@ ynh_script_progression --message="Removing NGINX web server configuration..." -- # Remove the dedicated NGINX config ynh_remove_nginx_config -#================================================= -# REMOVE PHP-FPM CONFIGURATION -#================================================= -ynh_script_progression --message="Removing PHP-FPM configuration..." --weight=1 - # Remove the dedicated PHP-FPM config ynh_remove_fpm_config diff --git a/scripts/restore b/scripts/restore index 9702650..6300c04 100644 --- a/scripts/restore +++ b/scripts/restore @@ -36,7 +36,7 @@ ynh_script_progression --message="Restoring the PHP-FPM configuration..." --weig ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" -ynh_add_fpm_config --usage=low --footprint=low +ynh_add_fpm_config ynh_mysql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < ./db.sql