From be9dbb873bf31140642230ee40ca6e8970eb29fa Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 19 Mar 2023 09:50:39 +0100 Subject: [PATCH] fix --- conf/app.src | 6 ------ conf/{php-fpm.conf => extra_php-fpm.conf} | 0 conf/nginx.conf | 5 ----- manifest.toml | 18 ++++++++++++------ scripts/install | 5 +++-- scripts/remove | 4 +++- scripts/upgrade | 9 +-------- 7 files changed, 19 insertions(+), 28 deletions(-) delete mode 100644 conf/app.src rename conf/{php-fpm.conf => extra_php-fpm.conf} (100%) diff --git a/conf/app.src b/conf/app.src deleted file mode 100644 index 1420727..0000000 --- a/conf/app.src +++ /dev/null @@ -1,6 +0,0 @@ -SOURCE_URL=https://forge.chapril.org/ZwiiCMS-Team/ZwiiCMS/archive/12.2.04.tar.gz -SOURCE_SUM=c56be62e6e6f7eabe57f4eea4e5d17d8538488ce28962135879074635f3151c3 -SOURCE_SUM_PRG=sha256sum -SOURCE_FORMAT=tar.gz -SOURCE_IN_SUBDIR=true -SOURCE_FILENAME= 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 0879d9f..84167e8 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -4,11 +4,6 @@ location __PATH__/ { # Path to source alias __INSTALL_DIR__/; - # Force usage of https - if ($scheme = http) { - rewrite ^ https://$server_name$request_uri? permanent; - } - index index.php; # Common parameter to increase upload size limit in conjunction with dedicated php-fpm file diff --git a/manifest.toml b/manifest.toml index 441b5fd..2e20250 100644 --- a/manifest.toml +++ b/manifest.toml @@ -2,8 +2,8 @@ packaging_format = 2 id = "zwiicms" name = "ZwiiCMS" -description.en = "Zwii - the simple, lightweight, database-free (Flat-File), scalable and responsive CMS!" -description.fr = "Zwii - le CMS simple, léger, sans base de données (Flat-File), modulable et responsive !" +description.en = "Simple, lightweight, database-free, scalable and responsive CMS" +description.fr = "CMS simple, léger, sans base de données, modulable et responsive" version = "12.2.04~ynh2" @@ -18,10 +18,10 @@ code = "https://forge.chapril.org/ZwiiCMS-Team/ZwiiCMS" fund = "https://ko-fi.com/T6T4FPG1A" [integration] -yunohost = ">= 11.1.6" +yunohost = ">= 11.1.15" architectures = "all" multi_instance = false -ldap = "not_relevant" +ldap = "not_relevant" sso = "not_relevant" disk = "50M" ram.build = "50M" @@ -55,10 +55,16 @@ ram.runtime = "50M" type = "password" [resources] + + [resources.sources] + + [resources.sources.main] + url = "https://forge.chapril.org/ZwiiCMS-Team/ZwiiCMS/archive/12.2.04.tar.gz" + sha256 = "c56be62e6e6f7eabe57f4eea4e5d17d8538488ce28962135879074635f3151c3" + [resources.system_user] [resources.install_dir] - dir = "/var/www/__APP__" owner = "__APP__:rwx" group = "www-data:rx" @@ -66,4 +72,4 @@ ram.runtime = "50M" main.url = "/" [resources.apt] - packages = "php$YNH_DEFAULT_PHP_VERSION-mbstring,php$YNH_DEFAULT_PHP_VERSION-zip,php$YNH_DEFAULT_PHP_VERSION-GD,php$YNH_DEFAULT_PHP_VERSION-exif,php$YNH_DEFAULT_PHP_VERSION-XMLWriter" + packages = "php8.0-mbstring,php8.0-zip,php8.0-GD,php8.0-exif,php8.0-XMLWriter" diff --git a/scripts/install b/scripts/install index a342541..11ac1f0 100644 --- a/scripts/install +++ b/scripts/install @@ -14,7 +14,7 @@ source /usr/share/yunohost/helpers #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= -ynh_script_progression --message="Setting up source files..." --time --weight= +ynh_script_progression --message="Setting up source files..." --weight= ynh_setup_source --dest_dir="$install_dir" @@ -28,7 +28,7 @@ find "$install_dir" -type d -exec chmod +s {} \; #================================================= ynh_script_progression --message="Adding system configurations related to $app ..." --weight=1 -ynh_add_fpm_config +ynh_add_fpm_config --usage=low --footprint=low ynh_add_nginx_config @@ -56,4 +56,5 @@ ynh_local_curl "${installUrl}" "csrf=${csrf}" "installId=${installId}" "installP #================================================= # END OF SCRIPT #================================================= + ynh_script_progression --message="Installation of $app completed" --last diff --git a/scripts/remove b/scripts/remove index e4146ce..ffecbc2 100644 --- a/scripts/remove +++ b/scripts/remove @@ -9,10 +9,12 @@ source _common.sh source /usr/share/yunohost/helpers - #================================================= # REMOVE SYSTEM CONFIGURATIONS #================================================= +# REMOVE SYSTEMD SERVICE +#================================================= +ynh_script_progression --message="Removing system configurations related to $app..." --weight=1 ynh_remove_nginx_config diff --git a/scripts/upgrade b/scripts/upgrade index fd12c4f..db653a6 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -11,13 +11,6 @@ source /usr/share/yunohost/helpers upgrade_type=$(ynh_check_app_version_changed) -#================================================= -# STANDARD UPGRADE STEPS -#================================================= -# ENSURE DOWNWARD COMPATIBILITY -#================================================= -#ynh_script_progression --message="Ensuring downward compatibility..." --weight=1 - #================================================= # "REBUILD" THE APP (DEPLOY NEW SOURCES, RERUN NPM BUILD, ETC...) #================================================= @@ -42,7 +35,7 @@ find "$install_dir" -type d -exec chmod +s {} \; #================================================= ynh_script_progression --message="Upgrading system configurations related to $app..." --weight=1 -ynh_add_fpm_config +ynh_add_fpm_config --usage=low --footprint=low ynh_add_nginx_config