From 9e4b4c983d9f5657b176d1b1a9431e5723c65535 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 14 Jan 2024 13:09:14 +0100 Subject: [PATCH] fix --- conf/{php-fpm.conf => extra_php-fpm.conf} | 0 conf/nginx.conf | 2 -- manifest.toml | 11 ++++------- scripts/backup | 4 ---- scripts/remove | 14 +------------- scripts/restore | 12 ++---------- scripts/upgrade | 5 ----- 7 files changed, 7 insertions(+), 41 deletions(-) rename conf/{php-fpm.conf => extra_php-fpm.conf} (100%) diff --git a/conf/php-fpm.conf b/conf/extra_php-fpm.conf similarity index 100% rename from conf/php-fpm.conf rename to conf/extra_php-fpm.conf diff --git a/conf/nginx.conf b/conf/nginx.conf index 7104a76..09eb7a9 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -4,7 +4,6 @@ location __PATH__/ { # Path to source alias __INSTALL_DIR__/www/; -### Example PHP configuration (remove it if not used) index index.html index.php; # Common parameter to increase upload size limit in conjunction with dedicated php-fpm file @@ -21,7 +20,6 @@ location __PATH__/ { fastcgi_param PATH_INFO $fastcgi_path_info; fastcgi_param SCRIPT_FILENAME $request_filename; } -### End of PHP configuration part # Include SSOWAT user panel. include conf.d/yunohost_panel.conf.inc; diff --git a/manifest.toml b/manifest.toml index f864781..cc81848 100644 --- a/manifest.toml +++ b/manifest.toml @@ -25,9 +25,9 @@ yunohost = ">= 11.2" architectures = "all" multi_instance = true -ldap = "not_relevant" +ldap = false -sso = "not_relevant" +sso = false disk = "100M" ram.build = "500M" @@ -67,11 +67,8 @@ ram.runtime = "100M" [resources] [resources.sources.main] - url = "https://github.com/YunoHost-Apps/digiscreen_ynh/releases/download/0.6.4/digiscreen-0.6.4.zip" - sha256 = "92273e360e06639283ee9db746d1d53006af7ea405f1ecbe85a262b39eae6756" - - autoupdate.strategy = "latest_github_tag" - autoupdate.asset = "digiscreen.*.zip" + url = "https://codeberg.org/ladigitale/digiscreen/releases/download/0.9.13/digiscreen-v0.9.13.zip" + sha256 = "" [resources.system_user] diff --git a/scripts/backup b/scripts/backup index 18f83fe..c5c603d 100644 --- a/scripts/backup +++ b/scripts/backup @@ -27,10 +27,6 @@ ynh_backup --src_path="$install_dir" ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf" -#================================================= -# BACKUP THE PHP-FPM CONFIGURATION -#================================================= - ynh_backup --src_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" #================================================= diff --git a/scripts/remove b/scripts/remove index e8daf85..b1a799f 100644 --- a/scripts/remove +++ b/scripts/remove @@ -1,4 +1,4 @@ - #!/bin/bash +#!/bin/bash #================================================= # GENERIC START @@ -17,21 +17,9 @@ 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 -#================================================= -# SPECIFIC REMOVE -#================================================= -# REMOVE VARIOUS FILES -#================================================= -ynh_script_progression --message="Removing various files..." --weight=1 - # Remove the log files ynh_secure_remove --file="/var/log/$app" diff --git a/scripts/restore b/scripts/restore index c5cc706..cf2ad9d 100644 --- a/scripts/restore +++ b/scripts/restore @@ -10,15 +10,6 @@ source ../settings/scripts/_common.sh source /usr/share/yunohost/helpers -#================================================= -# STANDARD RESTORATION STEPS -#================================================= -# RESTORE THE NGINX CONFIGURATION -#================================================= -ynh_script_progression --message="Restoring the NGINX web server configuration..." --weight=1 - -ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" - #================================================= # RESTORE THE APP MAIN DIR #================================================= @@ -26,7 +17,6 @@ ynh_script_progression --message="Restoring the app main directory..." --weight= ynh_restore_file --origin_path="$install_dir" -chmod 750 "$install_dir" chmod -R o-rwx "$install_dir" chown -R "$app:www-data" "$install_dir" @@ -37,6 +27,8 @@ ynh_script_progression --message="Restoring the PHP-FPM configuration..." --weig ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" +ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" + #================================================= # GENERIC FINALIZATION #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index ef09b20..80875b6 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -85,11 +85,6 @@ ynh_script_progression --message="Upgrading NGINX web server configuration..." - # Create a dedicated NGINX config ynh_add_nginx_config -#================================================= -# PHP-FPM CONFIGURATION -#================================================= -ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=1 - ynh_add_fpm_config #=================================================