From 4e03b7bb3b99620e381d8763716769973eadfd9a Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 15 Aug 2022 18:26:30 +0200 Subject: [PATCH 1/6] set relative path --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index 2091e29..73fb45c 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -79,7 +79,7 @@ then ynh_script_progression --message="Upgrading source files..." --weight=1 # Download, check integrity, uncompress and patch the source from app.src - ynh_setup_source --dest_dir="$final_path" --keep="config.xml.php $final_path/data $final_path/files $final_path/templates/*" + ynh_setup_source --dest_dir="$final_path" --keep="config.xml.php data files templates/*" fi chmod 750 "$final_path" From 08b41143ee98b90928b570967d9d65be997e507d Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Mon, 15 Aug 2022 16:26:37 +0000 Subject: [PATCH 2/6] Auto-update README --- README.md | 22 +++++++++++----------- README_fr.md | 30 +++++++++++++++++------------- 2 files changed, 28 insertions(+), 24 deletions(-) diff --git a/README.md b/README.md index b8140e5..b325691 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ It shall NOT be edited by hand. # Sitemagic CMS for YunoHost -[![Integration level](https://dash.yunohost.org/integration/sitemagiccms.svg)](https://dash.yunohost.org/appci/app/sitemagiccms) ![](https://ci-apps.yunohost.org/ci/badges/sitemagiccms.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/sitemagiccms.maintain.svg) +[![Integration level](https://dash.yunohost.org/integration/sitemagiccms.svg)](https://dash.yunohost.org/appci/app/sitemagiccms) ![Working status](https://ci-apps.yunohost.org/ci/badges/sitemagiccms.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/sitemagiccms.maintain.svg) [![Install Sitemagic CMS with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=sitemagiccms) *[Lire ce readme en français.](./README_fr.md)* @@ -20,29 +20,29 @@ Sitemagic is a Content Management System. It's very unique in its approach to de **Shipped version:** 4.4.2~ynh3 - ## Screenshots -![](./doc/screenshots/.DS_Store) -![](./doc/screenshots/Designer.jpeg) +![Screenshot of Sitemagic CMS](./doc/screenshots/.DS_Store) +![Screenshot of Sitemagic CMS](./doc/screenshots/Designer.jpeg) ## Documentation and resources -* Official app website: https://sitemagic.org/ -* Official admin documentation: https://sitemagic.org/sites/cms-guide/ -* Upstream app code repository: https://github.com/Jemt/SitemagicCMS -* YunoHost documentation for this app: https://yunohost.org/app_sitemagiccms -* Report a bug: https://github.com/YunoHost-Apps/sitemagiccms_ynh/issues +* Official app website: +* Official admin documentation: +* Upstream app code repository: +* YunoHost documentation for this app: +* Report a bug: ## Developer info Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/sitemagiccms_ynh/tree/testing). To try the testing branch, please proceed like that. -``` + +``` bash sudo yunohost app install https://github.com/YunoHost-Apps/sitemagiccms_ynh/tree/testing --debug or sudo yunohost app upgrade sitemagiccms -u https://github.com/YunoHost-Apps/sitemagiccms_ynh/tree/testing --debug ``` -**More info regarding app packaging:** https://yunohost.org/packaging_apps \ No newline at end of file +**More info regarding app packaging:** diff --git a/README_fr.md b/README_fr.md index eadf7f0..3a23cac 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,10 +1,14 @@ + + # Sitemagic CMS pour YunoHost -[![Niveau d'intégration](https://dash.yunohost.org/integration/sitemagiccms.svg)](https://dash.yunohost.org/appci/app/sitemagiccms) ![](https://ci-apps.yunohost.org/ci/badges/sitemagiccms.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/sitemagiccms.maintain.svg) +[![Niveau d'intégration](https://dash.yunohost.org/integration/sitemagiccms.svg)](https://dash.yunohost.org/appci/app/sitemagiccms) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/sitemagiccms.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/sitemagiccms.maintain.svg) [![Installer Sitemagic CMS avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=sitemagiccms) *[Read this readme in english.](./README.md)* -*[Lire ce readme en français.](./README_fr.md)* > *Ce package vous permet d'installer Sitemagic CMS rapidement et simplement sur un serveur YunoHost. Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l'installer et en profiter.* @@ -13,32 +17,32 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour Sitemagic is a Content Management System. It's very unique in its approach to design. Sitemagic CMS is a comprehensive Content Management System that allows anyone to easily manage pages, files, menu, forms, and external modules such as maps, social media plugins, videos, and more. But there's also a ton of hidden features that helps you save time such as automatic mobile and search engine optimizations (SEO). -**Version incluse :** 4.4.2~ynh3 - +**Version incluse :** 4.4.2~ynh3 ## Captures d'écran -![](./doc/screenshots/.DS_Store) -![](./doc/screenshots/Designer.jpeg) +![Capture d'écran de Sitemagic CMS](./doc/screenshots/.DS_Store) +![Capture d'écran de Sitemagic CMS](./doc/screenshots/Designer.jpeg) ## Documentations et ressources -* Site officiel de l'app : https://sitemagic.org/ -* Documentation officielle de l'admin : https://sitemagic.org/sites/cms-guide/ -* Dépôt de code officiel de l'app : https://github.com/Jemt/SitemagicCMS -* Documentation YunoHost pour cette app : https://yunohost.org/app_sitemagiccms -* Signaler un bug : https://github.com/YunoHost-Apps/sitemagiccms_ynh/issues +* Site officiel de l'app : +* Documentation officielle de l'admin : +* Dépôt de code officiel de l'app : +* Documentation YunoHost pour cette app : +* Signaler un bug : ## Informations pour les développeurs Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/sitemagiccms_ynh/tree/testing). Pour essayer la branche testing, procédez comme suit. -``` + +``` bash sudo yunohost app install https://github.com/YunoHost-Apps/sitemagiccms_ynh/tree/testing --debug ou sudo yunohost app upgrade sitemagiccms -u https://github.com/YunoHost-Apps/sitemagiccms_ynh/tree/testing --debug ``` -**Plus d'infos sur le packaging d'applications :** https://yunohost.org/packaging_apps \ No newline at end of file +**Plus d'infos sur le packaging d'applications :** From 87dddd072b42c7aa5dca43c2e00c62bd5f8f7e49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 26 Aug 2022 21:37:05 +0200 Subject: [PATCH 3/6] Fix --- manifest.json | 4 ++-- scripts/_common.sh | 2 +- scripts/install | 16 ++++++++-------- scripts/restore | 14 +++++++------- scripts/upgrade | 16 ++++++++-------- 5 files changed, 26 insertions(+), 26 deletions(-) diff --git a/manifest.json b/manifest.json index d7ea623..e36ec55 100644 --- a/manifest.json +++ b/manifest.json @@ -20,12 +20,12 @@ "email": "" }, "requirements": { - "yunohost": ">= 4.3.0" + "yunohost": ">= 11.0.9" }, "multi_instance": true, "services": [ "nginx", - "php7.3-fpm" + "php8.0-fpm" ], "arguments": { "install" : [ diff --git a/scripts/_common.sh b/scripts/_common.sh index d7614e9..b7c971c 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -4,7 +4,7 @@ # COMMON VARIABLES #================================================= -YNH_PHP_VERSION="7.3" +YNH_PHP_VERSION="8.0" #================================================= # PERSONAL HELPERS diff --git a/scripts/install b/scripts/install index 71d3b18..a2dbe3c 100755 --- a/scripts/install +++ b/scripts/install @@ -81,14 +81,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 #================================================= @@ -97,6 +89,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 + #================================================= # ADD A CONFIGURATION #================================================= diff --git a/scripts/restore b/scripts/restore index 119c23e..2cba52d 100755 --- a/scripts/restore +++ b/scripts/restore @@ -40,13 +40,6 @@ test ! -d $final_path || ynh_die --message="There is already a directory: $final #================================================= # STANDARD RESTORATION STEPS -#================================================= -# RESTORE THE NGINX CONFIGURATION -#================================================= -ynh_script_progression --message="Restoring the NGINX configuration..." --weight=1 - -ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" - #================================================= # RECREATE THE DEDICATED USER #================================================= @@ -76,6 +69,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 configuration..." --weight=1 + +ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" + #================================================= # RESTORE THE MYSQL DATABASE #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 73fb45c..71c6cc8 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -89,14 +89,6 @@ chown -R $app:www-data "$final_path" chmod 660 "$final_path/config.xml.php" chown $app:$app "$final_path/config.xml.php" -#================================================= -# NGINX CONFIGURATION -#================================================= -ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=1 - -# Create a dedicated NGINX config -ynh_add_nginx_config - #================================================= # PHP-FPM CONFIGURATION #================================================= @@ -105,6 +97,14 @@ ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=2 # 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 8dde5da165a150aaf8323a96c724fd89aa6f4731 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 26 Aug 2022 22:25:46 +0200 Subject: [PATCH 4/6] Fix --- manifest.json | 2 +- scripts/_common.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.json b/manifest.json index e36ec55..93c01b4 100644 --- a/manifest.json +++ b/manifest.json @@ -25,7 +25,7 @@ "multi_instance": true, "services": [ "nginx", - "php8.0-fpm" + "php7.4-fpm" ], "arguments": { "install" : [ diff --git a/scripts/_common.sh b/scripts/_common.sh index b7c971c..4f582df 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -4,7 +4,7 @@ # COMMON VARIABLES #================================================= -YNH_PHP_VERSION="8.0" +YNH_PHP_VERSION="7.4" #================================================= # PERSONAL HELPERS From 80f79574c86166c6c8947b82f56d251dac7be10a Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 27 Aug 2022 09:27:28 +0200 Subject: [PATCH 5/6] Update manifest.json --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 93c01b4..e6200c1 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Content Management System", "fr": "Système de gestion de contenu" }, - "version": "4.4.2~ynh3", + "version": "4.4.2~ynh4", "url": "https://sitemagic.org/", "upstream": { "license": "FSFULLR", From 3b13ea81ec5458a2b8dc259c8d9f5141c5b72276 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sat, 27 Aug 2022 07:27:33 +0000 Subject: [PATCH 6/6] 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 b325691..4de482e 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Sitemagic is a Content Management System. It's very unique in its approach to design. Sitemagic CMS is a comprehensive Content Management System that allows anyone to easily manage pages, files, menu, forms, and external modules such as maps, social media plugins, videos, and more. But there's also a ton of hidden features that helps you save time such as automatic mobile and search engine optimizations (SEO). -**Shipped version:** 4.4.2~ynh3 +**Shipped version:** 4.4.2~ynh4 ## Screenshots diff --git a/README_fr.md b/README_fr.md index 3a23cac..1d149d8 100644 --- a/README_fr.md +++ b/README_fr.md @@ -17,7 +17,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour Sitemagic is a Content Management System. It's very unique in its approach to design. Sitemagic CMS is a comprehensive Content Management System that allows anyone to easily manage pages, files, menu, forms, and external modules such as maps, social media plugins, videos, and more. But there's also a ton of hidden features that helps you save time such as automatic mobile and search engine optimizations (SEO). -**Version incluse :** 4.4.2~ynh3 +**Version incluse :** 4.4.2~ynh4 ## Captures d'écran