From 19b5e1169d3dddc13e48fd3f43327851fafa2a32 Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Sun, 7 Aug 2022 19:53:20 +0200 Subject: [PATCH 1/4] =?UTF-8?q?[autopatch]=20Add=20Common=20Platform=C2=A0?= =?UTF-8?q?Enumeration=20id=20to=20`manifest.json`?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- manifest.json | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/manifest.json b/manifest.json index 62bd514..1103000 100644 --- a/manifest.json +++ b/manifest.json @@ -14,7 +14,8 @@ "demo": "https://demo.example.com", "admindoc": "https://automad.org/getting-started", "userdoc": "https://automad.org/user-guide", - "code": "https://github.com/marcantondahmen/automad" + "code": "https://github.com/marcantondahmen/automad", + "cpe": "cpe:2.3:a:automad:automad" }, "license": "MIT", "maintainer": { @@ -30,7 +31,7 @@ "php8.0-fpm" ], "arguments": { - "install" : [ + "install": [ { "name": "domain", "type": "domain" @@ -48,4 +49,4 @@ } ] } -} +} \ No newline at end of file From 04147d58ffc35cd3ad842ba17e0e43025fa6416e Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 14 Sep 2022 16:46:11 +0000 Subject: [PATCH 2/4] Auto-update README --- README.md | 1 + README_fr.md | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 2108a7c..bef33cf 100644 --- a/README.md +++ b/README.md @@ -19,6 +19,7 @@ A flat-file content management system and template engine **Shipped version:** 1.10.9~ynh2 + **Demo:** https://demo.example.com ## Screenshots diff --git a/README_fr.md b/README_fr.md index 6c98cda..f658bea 100644 --- a/README_fr.md +++ b/README_fr.md @@ -17,7 +17,8 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour A flat-file content management system and template engine -**Version incluse :** 1.10.9~ynh2 +**Version incluse :** 1.10.9~ynh2 + **Démo :** https://demo.example.com From e52202cc7fc70e75177b01e00eaef9d697fea07d Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Wed, 14 Sep 2022 18:51:13 +0200 Subject: [PATCH 3/4] reorder scripts --- manifest.json | 3 +-- scripts/install | 16 ++++++++-------- scripts/restore | 14 +++++++------- scripts/upgrade | 16 ++++++++-------- 4 files changed, 24 insertions(+), 25 deletions(-) diff --git a/manifest.json b/manifest.json index 1103000..361a301 100644 --- a/manifest.json +++ b/manifest.json @@ -11,7 +11,6 @@ "upstream": { "license": "MIT", "website": "https://automad.org/", - "demo": "https://demo.example.com", "admindoc": "https://automad.org/getting-started", "userdoc": "https://automad.org/user-guide", "code": "https://github.com/marcantondahmen/automad", @@ -23,7 +22,7 @@ "email": "" }, "requirements": { - "yunohost": ">= 4.3.0" + "yunohost": ">= 11.0.9" }, "multi_instance": true, "services": [ diff --git a/scripts/install b/scripts/install index 4a49be8..113665b 100755 --- a/scripts/install +++ b/scripts/install @@ -78,14 +78,6 @@ chmod 750 "$final_path" chmod -R o-rwx "$final_path" chown -R $app:www-data "$final_path" -#================================================= -# NGINX CONFIGURATION -#================================================= -ynh_script_progression --message="Configuring NGINX web server..." --weight=1 - -# Create a dedicated NGINX config -ynh_add_nginx_config - #================================================= # PHP-FPM CONFIGURATION #================================================= @@ -94,6 +86,14 @@ ynh_script_progression --message="Configuring PHP-FPM..." --weight=1 # Create a dedicated PHP-FPM config ynh_add_fpm_config +#================================================= +# NGINX CONFIGURATION +#================================================= +ynh_script_progression --message="Configuring NGINX web server..." --weight=1 + +# Create a dedicated NGINX config +ynh_add_nginx_config + #================================================= # SETUP FIRST USER #================================================= diff --git a/scripts/restore b/scripts/restore index 3cb2f7d..2bbc036 100755 --- a/scripts/restore +++ b/scripts/restore @@ -43,13 +43,6 @@ test ! -d $final_path \ #================================================= # 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" - #================================================= # RECREATE THE DEDICATED USER #================================================= @@ -84,6 +77,13 @@ ynh_script_progression --message="Restoring the PHP-FPM configuration..." --weig ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" +#================================================= +# 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" + #================================================= # GENERIC FINALIZATION #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 1647649..86df4e7 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -64,14 +64,6 @@ chmod 750 "$final_path" chmod -R o-rwx "$final_path" chown -R $app:www-data "$final_path" -#================================================= -# NGINX CONFIGURATION -#================================================= -ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=1 - -# Create a dedicated NGINX config -ynh_add_nginx_config - #================================================= # UPGRADE DEPENDENCIES #================================================= @@ -87,6 +79,14 @@ ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=1 # Create a dedicated PHP-FPM config ynh_add_fpm_config +#================================================= +# NGINX CONFIGURATION +#================================================= +ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=1 + +# Create a dedicated NGINX config +ynh_add_nginx_config + #================================================= # RELOAD NGINX #================================================= From e7040d1ffcba66f605a978c53b014dddbb8b52e9 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 14 Sep 2022 16:51:17 +0000 Subject: [PATCH 4/4] Auto-update README --- README.md | 2 -- README_fr.md | 2 -- 2 files changed, 4 deletions(-) diff --git a/README.md b/README.md index bef33cf..bf155b9 100644 --- a/README.md +++ b/README.md @@ -20,8 +20,6 @@ A flat-file content management system and template engine **Shipped version:** 1.10.9~ynh2 -**Demo:** https://demo.example.com - ## Screenshots ![Screenshot of Automad](./doc/screenshots/readme.png) diff --git a/README_fr.md b/README_fr.md index f658bea..23f3396 100644 --- a/README_fr.md +++ b/README_fr.md @@ -20,8 +20,6 @@ A flat-file content management system and template engine **Version incluse :** 1.10.9~ynh2 -**Démo :** https://demo.example.com - ## Captures d'écran ![Capture d'écran de Automad](./doc/screenshots/readme.png)