From f11b84b80f8647c881b39ac24a37d1897dd0b9f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 24 Nov 2023 17:25:04 +0100 Subject: [PATCH 1/3] cleaning --- manifest.toml | 11 +++++++---- scripts/install | 2 +- scripts/restore | 19 +++++++------------ scripts/upgrade | 2 +- 4 files changed, 16 insertions(+), 18 deletions(-) diff --git a/manifest.toml b/manifest.toml index 894fc50..31c8090 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Sitemagic CMS" description.en = "Content Management System" description.fr = "Système de gestion de contenu" -version = "4.4.2~ynh4" +version = "4.4.2~ynh5" maintainers = ["eric_G"] @@ -16,11 +16,14 @@ admindoc = "https://sitemagic.org/sites/cms-guide/" code = "https://github.com/Jemt/SitemagicCMS" [integration] -yunohost = ">= 11.1.21" +yunohost = ">= 11.2" architectures = "all" multi_instance = true + ldap = false + sso = false + disk = "50M" ram.build = "50M" ram.runtime = "50M" @@ -43,7 +46,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 = ["da", "de", "el", "fr", "en", "sr"] default = "fr" @@ -64,7 +67,7 @@ ram.runtime = "50M" main.url = "/" [resources.apt] - packages = "mariadb-server php7.4-fpm php7.4-mysql" + packages = "mariadb-server, php8.2-mysql" [resources.database] type = "mysql" diff --git a/scripts/install b/scripts/install index bfdad97..367ac7e 100755 --- a/scripts/install +++ b/scripts/install @@ -26,7 +26,7 @@ chown -R $app:www-data "$install_dir" ynh_script_progression --message="Configuring PHP-FPM..." --weight=1 # Create a dedicated PHP-FPM config -ynh_add_fpm_config --usage=low --footprint=low +ynh_add_fpm_config # Create a dedicated NGINX config ynh_add_nginx_config diff --git a/scripts/restore b/scripts/restore index 2005ecc..21a2115 100755 --- a/scripts/restore +++ b/scripts/restore @@ -23,6 +23,13 @@ chown -R $app:www-data "$install_dir" chmod 660 "$install_dir/config.xml.php" chown $app:$app "$install_dir/config.xml.php" +#================================================= +# RESTORE THE MYSQL DATABASE +#================================================= +ynh_script_progression --message="Restoring the MySQL database..." --weight=1 + +ynh_mysql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < ./db.sql + #================================================= # RESTORE THE PHP-FPM CONFIGURATION #================================================= @@ -30,20 +37,8 @@ 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 -#================================================= -ynh_script_progression --message="Restoring the MySQL database..." --weight=1 - -ynh_mysql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < ./db.sql - #================================================= # GENERIC FINALIZATION #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index c615e7e..dcdb095 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -48,7 +48,7 @@ chown $app:$app "$install_dir/config.xml.php" ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=2 # Create a dedicated PHP-FPM config -ynh_add_fpm_config --usage=low --footprint=low +ynh_add_fpm_config # Create a dedicated NGINX config ynh_add_nginx_config From 207dfc32e16d4dd39134d01b434df12cbaa4fad0 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 24 Nov 2023 16:25:09 +0000 Subject: [PATCH 2/3] 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 578aceb..2d03a0a 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,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~ynh4 +**Shipped version:** 4.4.2~ynh5 ## Screenshots diff --git a/README_fr.md b/README_fr.md index 256b63c..f4ed7ff 100644 --- a/README_fr.md +++ b/README_fr.md @@ -18,7 +18,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po 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~ynh4 +**Version incluse :** 4.4.2~ynh5 ## Captures d’écran From cf5923665b47f6ddbeb79a191fba64ea2e720c5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 28 Nov 2023 10:33:16 +0100 Subject: [PATCH 3/3] fix --- manifest.toml | 2 +- scripts/install | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.toml b/manifest.toml index 31c8090..59411f8 100644 --- a/manifest.toml +++ b/manifest.toml @@ -67,7 +67,7 @@ ram.runtime = "50M" main.url = "/" [resources.apt] - packages = "mariadb-server, php8.2-mysql" + packages = "mariadb-server, php7.4-mysql" [resources.database] type = "mysql" diff --git a/scripts/install b/scripts/install index 367ac7e..a59a321 100755 --- a/scripts/install +++ b/scripts/install @@ -36,7 +36,7 @@ ynh_add_nginx_config #================================================= ynh_script_progression --message="Adding a configuration file..." --weight=1 -ynh_add_config --template="../conf/config.xml.php" --destination="$install_dir/config.xml.php" +ynh_add_config --template="config.xml.php" --destination="$install_dir/config.xml.php" chmod 660 "$install_dir/config.xml.php" chown $app:$app "$install_dir/config.xml.php"