diff --git a/README.md b/README.md index 81fc7d9..4ff1243 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ @@ -18,7 +18,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Yellow is for people who make small websites -**Shipped version:** 2023.09.23~ynh1 +**Shipped version:** 2024.01.06~ynh1 **Demo:** https://datenstrom.se/yellow/demo/ @@ -46,4 +46,4 @@ or sudo yunohost app upgrade yellow -u https://github.com/YunoHost-Apps/yellow_ynh/tree/testing --debug ``` -**More info regarding app packaging:** +**More info regarding app packaging:** \ No newline at end of file diff --git a/README_fr.md b/README_fr.md index 798f162..9298832 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,5 +1,5 @@ @@ -18,7 +18,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po Yellow is for people who make small websites -**Version incluse :** 2023.09.23~ynh1 +**Version incluse :** 2024.01.06~ynh1 **Démo :** https://datenstrom.se/yellow/demo/ diff --git a/manifest.toml b/manifest.toml index 36c9895..eb26a3a 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,9 +5,9 @@ name = "Yellow" description.en = "Content management system (CMS) for simple website" description.fr = "Système de gestion de contenu (CMS) pour un site simple" -version = "2023.09.23~ynh1" +version = "2024.01.06~ynh1" -maintainers = ["eric_G"] +maintainers = [] [upstream] license = "GPL-2.0-only" @@ -20,8 +20,11 @@ code = "https://github.com/datenstrom/yellow/" yunohost = ">= 11.2" architectures = "all" multi_instance = true + ldap = false + sso = false + disk = "50M" ram.build = "50M" ram.runtime = "50M" @@ -40,8 +43,8 @@ ram.runtime = "50M" [resources] [resources.sources.main] - url = "https://github.com/datenstrom/yellow/archive/28c6733c0f0fb3881544fa1be006a036f4cb4c74.tar.gz" - sha256 = "2103b87a52079b6217cb6efa91f0465f2cd446fba1465f0d968d8a4d7b85c824" + url = "https://github.com/datenstrom/yellow/archive/4c68bcc9bf52d602562ecb87761f9ad3d994ecbd.tar.gz" + sha256 = "822f74e0b5aaffd7a609876c7140a69ab4c4b98c668df18ec8f6ca2c2367cdbb" autoupdate.upstream = "https://github.com/datenstrom/yellow" autoupdate.strategy = "latest_github_commit" diff --git a/scripts/install b/scripts/install index 7ef082d..5be4c19 100644 --- a/scripts/install +++ b/scripts/install @@ -21,9 +21,9 @@ chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir" #================================================= -# NGINX CONFIGURATION +# SYSTEM CONFIGURATION #================================================= -ynh_script_progression --message="Configuring NGINX web server..." --weight=2 +ynh_script_progression --message="Adding system configurations related to $app..." --weight=1 # Create a dedicated NGINX config ynh_add_nginx_config diff --git a/scripts/remove b/scripts/remove index 61db822..5b17c2d 100644 --- a/scripts/remove +++ b/scripts/remove @@ -10,9 +10,9 @@ source _common.sh source /usr/share/yunohost/helpers #================================================= -# REMOVE NGINX CONFIGURATION +# REMOVE SYSTEM CONFIGURATIONS #================================================= -ynh_script_progression --message="Removing NGINX web server configuration..." --weight=1 +ynh_script_progression --message="Removing system configurations related to $app..." --weight=1 # Remove the dedicated NGINX config ynh_remove_nginx_config diff --git a/scripts/restore b/scripts/restore index 398e614..a1e8f97 100644 --- a/scripts/restore +++ b/scripts/restore @@ -19,10 +19,12 @@ ynh_restore_file --origin_path="$install_dir" chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir" +#================================================= +# RESTORE SYSTEM CONFIGURATIONS #================================================= # RESTORE THE PHP-FPM CONFIGURATION #================================================= -ynh_script_progression --message="Reconfiguring PHP-FPM..." --weight=6 +ynh_script_progression --message="Restoring system configurations related to $app..." --weight=1 ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" diff --git a/scripts/upgrade b/scripts/upgrade index 781b2cd..7217840 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -31,9 +31,9 @@ chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir" #================================================= -# NGINX CONFIGURATION +# REAPPLY SYSTEM CONFIGURATIONS #================================================= -ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=1 +ynh_script_progression --message="Upgrading system configurations related to $app..." --weight=1 # Create a dedicated NGINX config ynh_add_nginx_config