From a2da2027e89189abe2034d78a4137f35f75e1d3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 28 Aug 2023 09:44:14 +0200 Subject: [PATCH 01/12] fix maintenance --- scripts/config | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/config b/scripts/config index 0a9e083..c13b81b 100644 --- a/scripts/config +++ b/scripts/config @@ -24,7 +24,7 @@ current_fpm_footprint=$(ynh_app_setting_get --app=$app --key=fpm_footprint) get__maintenance_mode() { # Maintenance mode status - if [ -f $final_path/.maintenance ] + if [ -f $install_dir/.maintenance ] then echo "1" else @@ -62,12 +62,12 @@ get__free_footprint() { set__maintenance_mode() { if [ "$maintenance_mode" -eq "1" ]; then # If maintenance_mode was set to 1, enable maintenance mode - (cd "$final_path" && ynh_exec_as "$app" \ + (cd "$install_dir" && ynh_exec_as "$app" \ echo "Site under maintenance." > .maintenance) ynh_print_info "Maintenance mode disabled" elif [ "$maintenance_mode" -eq "0" ]; then # If maintenance_mode was set to 0, disable maintenance mode - ynh_secure_remove --file=$final_path/.maintenance + ynh_secure_remove --file=$install_dir/.maintenance ynh_print_info "Maintenance mode enabled" fi ynh_app_setting_set --app=$app --key=maintenance_mode --value="$maintenance_mode" From 4933cbfbc38bc0b77fb80bc0a2d2d991d9ef0d35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 28 Aug 2023 10:18:57 +0200 Subject: [PATCH 02/12] Update config --- scripts/config | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/config b/scripts/config index c13b81b..2052133 100644 --- a/scripts/config +++ b/scripts/config @@ -17,6 +17,8 @@ ynh_abort_if_errors phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) current_fpm_footprint=$(ynh_app_setting_get --app=$app --key=fpm_footprint) +fpm_footprint=$(ynh_app_setting_get --app=$app --key=fpm_footprint) +fpm_usage=$(ynh_app_setting_get --app=$app --key=fpm_usage) #================================================= # SPECIFIC GETTERS FOR TOML SHORT KEY From e10477c72177ac7db240afae7c334eec902386dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 28 Aug 2023 10:54:45 +0200 Subject: [PATCH 03/12] Update config --- scripts/config | 2 -- 1 file changed, 2 deletions(-) diff --git a/scripts/config b/scripts/config index 2052133..c13b81b 100644 --- a/scripts/config +++ b/scripts/config @@ -17,8 +17,6 @@ ynh_abort_if_errors phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) current_fpm_footprint=$(ynh_app_setting_get --app=$app --key=fpm_footprint) -fpm_footprint=$(ynh_app_setting_get --app=$app --key=fpm_footprint) -fpm_usage=$(ynh_app_setting_get --app=$app --key=fpm_usage) #================================================= # SPECIFIC GETTERS FOR TOML SHORT KEY From 1fba4a37bbfe1ef067c145b658daa0b8f89c2f70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 28 Aug 2023 11:02:16 +0200 Subject: [PATCH 04/12] Update manifest.toml --- manifest.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/manifest.toml b/manifest.toml index 1aed414..d99109c 100644 --- a/manifest.toml +++ b/manifest.toml @@ -67,6 +67,7 @@ ram.runtime = "50M" admin.url = "/wp-login.php" admin.additional_urls = ["/wp-admin.php"] admin.allowed = "admins" + admin.show_tile = false [resources.apt] packages = "mariadb-server php8.2-mysql php8.2-curl php8.2-mbstring php8.2-xml php8.2-zip php8.2-gd php8.2-soap php8.2-ssh2 php8.2-tokenizer php8.2-ldap" From 439ecb86deda2d7fd1037270e8b171912708434a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 28 Aug 2023 15:34:49 +0200 Subject: [PATCH 05/12] Update manifest.toml --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index d99109c..5dc4f6b 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "WordPress" description.en = "Create a beautiful blog or website easily" description.fr = "Logiciel de création de blog ou de site Web" -version = "6.3.0~ynh1" +version = "6.3.0~ynh2" maintainers = ["kay0u"] From 577970f3b849be7981603efaa768fc23fb673b06 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Mon, 28 Aug 2023 13:34:59 +0000 Subject: [PATCH 06/12] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 46fd9f4..1074c03 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ WordPress is open source software you can use to create a beautiful website, blo With this package, you can even activate the [multisite](https://wordpress.org/support/article/glossary/#multisite) option. -**Shipped version:** 6.3.0~ynh1 +**Shipped version:** 6.3.0~ynh2 ## Screenshots diff --git a/README_fr.md b/README_fr.md index 77bd5fd..f3b03ba 100644 --- a/README_fr.md +++ b/README_fr.md @@ -20,7 +20,7 @@ WordPress est un logiciel libre que vous pouvez utiliser pour créer un site ou Avec ce package, vous pouvez même activer l'option [multisite](https://codex.wordpress.org/Glossary#Multisite). -**Version incluse :** 6.3.0~ynh1 +**Version incluse :** 6.3.0~ynh2 ## Captures d’écran From 7f5ba53956e339a25e12ec12fac9bf3a10f7d5e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 7 Sep 2023 13:33:39 +0200 Subject: [PATCH 07/12] Update manifest.toml --- manifest.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.toml b/manifest.toml index 5dc4f6b..c4867f3 100644 --- a/manifest.toml +++ b/manifest.toml @@ -40,7 +40,7 @@ ram.runtime = "50M" [install.language] ask.en = "Choose the application language" ask.fr = "Choisissez la langue de l'application" - type = "string" + type = "select" choices = ["en_US", "fr_FR"] default = "en_US" @@ -70,7 +70,7 @@ ram.runtime = "50M" admin.show_tile = false [resources.apt] - packages = "mariadb-server php8.2-mysql php8.2-curl php8.2-mbstring php8.2-xml php8.2-zip php8.2-gd php8.2-soap php8.2-ssh2 php8.2-tokenizer php8.2-ldap" + packages = "mariadb-server, php8.2-mysql, php8.2-curl, php8.2-mbstring, php8.2-xml, php8.2-zip, php8.2-gd, php8.2-soap, php8.2-ssh2, php8.2-tokenizer, php8.2-ldap" [resources.database] type = "mysql" From ca4dbc0f3dda7156743e3d664807ec66e438b479 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 11 Sep 2023 12:47:50 +0200 Subject: [PATCH 08/12] Update manifest.toml --- manifest.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index c4867f3..2b333b6 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "WordPress" description.en = "Create a beautiful blog or website easily" description.fr = "Logiciel de création de blog ou de site Web" -version = "6.3.0~ynh2" +version = "6.3.1~ynh1" maintainers = ["kay0u"] @@ -55,8 +55,8 @@ ram.runtime = "50M" [resources] [resources.sources.main] - url = "https://downloads.wordpress.org/release/wordpress-6.3.zip" - sha256 = "b4f0b53c9652b2d24d8762bec96a0604538b44b15f05187367112c0c8ea3abcf" + url = "https://downloads.wordpress.org/release/wordpress-6.3.1.zip" + sha256 = "8a3c60c390b1e29143ba49292a5e38d8f7bff2ff6b67a3e4988d157f555a0601" [resources.system_user] From df278e06167d5f2fad74a0384d77d7035d996228 Mon Sep 17 00:00:00 2001 From: eric_G <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 31 Oct 2023 15:43:43 +0100 Subject: [PATCH 09/12] Update scripts/config Co-authored-by: tituspijean --- scripts/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/config b/scripts/config index c13b81b..fc7bb93 100644 --- a/scripts/config +++ b/scripts/config @@ -68,7 +68,7 @@ set__maintenance_mode() { elif [ "$maintenance_mode" -eq "0" ]; then # If maintenance_mode was set to 0, disable maintenance mode ynh_secure_remove --file=$install_dir/.maintenance - ynh_print_info "Maintenance mode enabled" + ynh_print_info "Maintenance mode disabled" fi ynh_app_setting_set --app=$app --key=maintenance_mode --value="$maintenance_mode" } From 8f3f7f29c66b7074711beff1908bf3df4ffa1a68 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 31 Oct 2023 14:43:50 +0000 Subject: [PATCH 10/12] Auto-update README --- README.md | 4 ++-- README_fr.md | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 1074c03..3f70b96 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ WordPress is open source software you can use to create a beautiful website, blo With this package, you can even activate the [multisite](https://wordpress.org/support/article/glossary/#multisite) option. -**Shipped version:** 6.3.0~ynh2 +**Shipped version:** 6.3.1~ynh1 ## Screenshots @@ -37,7 +37,7 @@ With this package, you can even activate the [multisite](https://wordpress.org/s * Official app website: * Official admin documentation: * Upstream app code repository: -* YunoHost documentation for this app: +* YunoHost Store: * Report a bug: ## Developer info diff --git a/README_fr.md b/README_fr.md index f3b03ba..04bdb2c 100644 --- a/README_fr.md +++ b/README_fr.md @@ -20,7 +20,7 @@ WordPress est un logiciel libre que vous pouvez utiliser pour créer un site ou Avec ce package, vous pouvez même activer l'option [multisite](https://codex.wordpress.org/Glossary#Multisite). -**Version incluse :** 6.3.0~ynh2 +**Version incluse :** 6.3.1~ynh1 ## Captures d’écran @@ -37,7 +37,7 @@ Avec ce package, vous pouvez même activer l'option [multisite](https://codex.wo * Site officiel de l’app : * Documentation officielle de l’admin : * Dépôt de code officiel de l’app : -* Documentation YunoHost pour cette app : +* YunoHost Store: * Signaler un bug : ## Informations pour les développeurs From 332f61e6354367a1c44763c533688657747ab0ed Mon Sep 17 00:00:00 2001 From: eric_G <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 31 Oct 2023 15:47:41 +0100 Subject: [PATCH 11/12] Update scripts/config Co-authored-by: tituspijean --- scripts/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/config b/scripts/config index fc7bb93..a41e996 100644 --- a/scripts/config +++ b/scripts/config @@ -64,7 +64,7 @@ set__maintenance_mode() { # If maintenance_mode was set to 1, enable maintenance mode (cd "$install_dir" && ynh_exec_as "$app" \ echo "Site under maintenance." > .maintenance) - ynh_print_info "Maintenance mode disabled" + ynh_print_info "Maintenance mode enabled" elif [ "$maintenance_mode" -eq "0" ]; then # If maintenance_mode was set to 0, disable maintenance mode ynh_secure_remove --file=$install_dir/.maintenance From d7f1206bf6b114ba14dbbe9a43ad046d354b209b Mon Sep 17 00:00:00 2001 From: eric_G <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 31 Oct 2023 15:47:53 +0100 Subject: [PATCH 12/12] Update scripts/config Co-authored-by: tituspijean --- scripts/config | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/scripts/config b/scripts/config index a41e996..19ec7ee 100644 --- a/scripts/config +++ b/scripts/config @@ -62,8 +62,7 @@ get__free_footprint() { set__maintenance_mode() { if [ "$maintenance_mode" -eq "1" ]; then # If maintenance_mode was set to 1, enable maintenance mode - (cd "$install_dir" && ynh_exec_as "$app" \ - echo "Site under maintenance." > .maintenance) + ynh_exec_as "$app" echo "Site under maintenance." > $install_dir/.maintenance ynh_print_info "Maintenance mode enabled" elif [ "$maintenance_mode" -eq "0" ]; then # If maintenance_mode was set to 0, disable maintenance mode