From 3a3fffd7ed89082850f9d52f10f9cef233a30ae9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sat, 9 Dec 2023 21:22:30 +0100 Subject: [PATCH 1/3] cleaning --- manifest.toml | 7 +++++-- scripts/install | 2 +- scripts/restore | 19 +++++++------------ scripts/upgrade | 7 +------ 4 files changed, 14 insertions(+), 21 deletions(-) diff --git a/manifest.toml b/manifest.toml index c813e00..a5caf1c 100644 --- a/manifest.toml +++ b/manifest.toml @@ -16,11 +16,14 @@ admindoc = "https://forum.indexhibit.org/tutorials/getting-started/installation/ code = "https://github.com/Indexhibit/indexhibit" [integration] -yunohost = ">= 11.1.19" +yunohost = ">= 11.2" architectures = "all" multi_instance = true + ldap = false + sso = false + disk = "50M" ram.build = "50M" ram.runtime = "50M" @@ -52,7 +55,7 @@ ram.runtime = "50M" main.url = "/" [resources.apt] - packages = "mariadb-server php8.0-fpm php8.0-mysql" + packages = "mariadb-server, php8.2-fpm, php8.2-mysql" [resources.database] type = "mysql" diff --git a/scripts/install b/scripts/install index 7064700..fefeb55 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 1906a2a..57ddbd6 100755 --- a/scripts/restore +++ b/scripts/restore @@ -20,6 +20,13 @@ ynh_restore_file --origin_path="$install_dir" chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir" +#================================================= +# 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 #================================================= @@ -27,20 +34,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 web server 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 6362da5..c1eb5b1 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -36,12 +36,7 @@ chown -R $app:www-data "$install_dir" ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=1 # Create a dedicated PHP-FPM config -ynh_add_fpm_config --usage=low --footprint=low - -#================================================= -# NGINX CONFIGURATION -#================================================= -ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=1 +ynh_add_fpm_config # Create a dedicated NGINX config ynh_add_nginx_config From 17392fa4990e8cd013c5d1dc708b13dc0f2396f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sat, 9 Dec 2023 22:48:53 +0100 Subject: [PATCH 2/3] Update manifest.toml --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index a5caf1c..a24b4da 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Indexhibit" description.en = "Archetypal portfolio CMS for everybody" description.fr = "CMS de portfolio archétypal pour tout le monde" -version = "2.1.2023.05.17~ynh2" +version = "2.1.2023.05.17~ynh3" maintainers = [ "eric_G" ] From 7086b8bdfb93a9f68a780f4a2779869b1ac9b77c Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sat, 9 Dec 2023 21:48:58 +0000 Subject: [PATCH 3/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 14d201e..9175a01 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ Indexhibit is a pioneering, influential, web-based content management system (CM It is intended for independent-minded creators, academics, researchers, students, collectors, et al., who wish to learn how and manage the visual display of their works, on their own terms, according to their own abilities. -**Shipped version:** 2.1.2023.05.17~ynh2 +**Shipped version:** 2.1.2023.05.17~ynh3 ## Screenshots diff --git a/README_fr.md b/README_fr.md index 04477f8..1cbd1e4 100644 --- a/README_fr.md +++ b/README_fr.md @@ -19,7 +19,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po Indexhibit est un système de gestion de contenu (CMS) pionnier et influent basé sur le Web, fondé en 2006 par Jeffery Vaska et Daniel Eatock, qui est principalement utilisé pour créer des portfolios en ligne (image, texte et vidéo). Il s'adresse aux créateurs indépendants d'esprit, universitaires, chercheurs, étudiants, collectionneurs, etc., qui souhaitent apprendre et gérer la présentation visuelle de leurs œuvres, à leur manière, selon leurs propres capacités. -**Version incluse :** 2.1.2023.05.17~ynh2 +**Version incluse :** 2.1.2023.05.17~ynh3 ## Captures d’écran