From b27da6b2ea1eec06261f08ccb4a00f41c6419c10 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:23:01 +0100 Subject: [PATCH 1/2] cleaning --- doc/DESCRIPTION_fr.md | 1 + manifest.toml | 7 +++++-- scripts/change_url | 2 +- scripts/install | 2 +- scripts/restore | 24 ++++++------------------ scripts/upgrade | 2 +- 6 files changed, 15 insertions(+), 23 deletions(-) create mode 100644 doc/DESCRIPTION_fr.md diff --git a/doc/DESCRIPTION_fr.md b/doc/DESCRIPTION_fr.md new file mode 100644 index 0000000..eedb502 --- /dev/null +++ b/doc/DESCRIPTION_fr.md @@ -0,0 +1 @@ +phpIPAM est une application open source de gestion d'adresses IP Web. Son objectif est de fournir une application de gestion d'adresses IP légère et simple. Il est basé sur ajax utilisant les bibliothèques jQuery, il utilise des scripts php et javascript ainsi que certaines fonctionnalités HTML5/CSS3, il est donc préférable d'utiliser certains navigateurs modernes pour pouvoir afficher javascript rapidement et correctement. diff --git a/manifest.toml b/manifest.toml index e7414fb..0716d66 100644 --- a/manifest.toml +++ b/manifest.toml @@ -17,11 +17,14 @@ admindoc = "https://phpipam.net/documents/" code = "https://github.com/phpipam/phpipam" [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" @@ -55,7 +58,7 @@ ram.runtime = "50M" api.allowed = "visitors" [resources.apt] - packages = "mariadb-server php7.4-gmp php7.4-mysql php7.4-ldap php7.4-gd php7.4-opcache php7.4-fileinfo php7.4-intl php7.4-json php7.4-cli php7.4-mbstring php7.4-xml" + packages = "mariadb-server, php8.2-gmp, php8.2-mysql, php8.2-ldap, php8.2-gd, php8.2-opcache, php8.2-fileinfo, php8.2-intl, php8.2-cli, php8.2-mbstring, php8.2-xml" [resources.database] type = "mysql" diff --git a/scripts/change_url b/scripts/change_url index ad6808d..73a0f01 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -27,7 +27,7 @@ domain="$new_domain" path="$new_path" domain_path="https://$domain$path" -ynh_add_config --template="../conf/config.dist.php" --destination="$install_dir/config.php" +ynh_add_config --template="config.dist.php" --destination="$install_dir/config.php" #================================================= # END OF SCRIPT diff --git a/scripts/install b/scripts/install index 09d9691..e1a2f55 100644 --- a/scripts/install +++ b/scripts/install @@ -46,7 +46,7 @@ ynh_script_progression --message="Configuring NGINX web server..." --weight=1 ynh_add_nginx_config # Create a dedicated PHP-FPM config -ynh_add_fpm_config --usage=low --footprint=low +ynh_add_fpm_config # Use logrotate to manage application logfile(s) ynh_use_logrotate diff --git a/scripts/restore b/scripts/restore index c7e8f56..c9b2b60 100644 --- a/scripts/restore +++ b/scripts/restore @@ -10,15 +10,6 @@ source ../settings/scripts/_common.sh source /usr/share/yunohost/helpers -#================================================= -# 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" - #================================================= # RESTORE THE APP MAIN DIR #================================================= @@ -29,13 +20,6 @@ ynh_restore_file --origin_path="$install_dir" chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir" -#================================================= -# RESTORE THE PHP-FPM CONFIGURATION -#================================================= -ynh_script_progression --message="Restoring the PHP-FPM configuration..." --weight=1 - -ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" - #================================================= # RESTORE THE MYSQL DATABASE #================================================= @@ -44,9 +28,13 @@ 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 LOGROTATE CONFIGURATION +# RESTORE THE PHP-FPM CONFIGURATION #================================================= -ynh_script_progression --message="Restoring the logrotate configuration..." --weight=1 +ynh_script_progression --message="Restoring the PHP-FPM configuration..." --weight=1 + +ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" + +ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" ynh_restore_file --origin_path="/etc/logrotate.d/$app" diff --git a/scripts/upgrade b/scripts/upgrade index c30ab68..fb39b12 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -39,7 +39,7 @@ ynh_script_progression --message="Upgrading NGINX web server configuration..." - ynh_add_nginx_config # Create a dedicated PHP-FPM config -ynh_add_fpm_config --usage=low --footprint=low +ynh_add_fpm_config # Use logrotate to manage app-specific logfile(s) ynh_use_logrotate --non-append From e28fe6f63b0d5e20dd5c1da061549d40855128f8 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 24 Nov 2023 16:23:06 +0000 Subject: [PATCH 2/2] Auto-update README --- README_fr.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README_fr.md b/README_fr.md index 371f198..0a9fe3a 100644 --- a/README_fr.md +++ b/README_fr.md @@ -16,7 +16,8 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po ## Vue d’ensemble -phpIPAM is an open-source web IP address management application. Its goal is to provide light and simple IP address management application. It is ajax-based using jQuery libraries, it uses php scripts and javascript and some HTML5/CSS3 features, so some modern browser is preferred to be able to display javascript quickly and correctly. +phpIPAM est une application open source de gestion d'adresses IP Web. Son objectif est de fournir une application de gestion d'adresses IP légère et simple. Il est basé sur ajax utilisant les bibliothèques jQuery, il utilise des scripts php et javascript ainsi que certaines fonctionnalités HTML5/CSS3, il est donc préférable d'utiliser certains navigateurs modernes pour pouvoir afficher javascript rapidement et correctement. + **Version incluse :** 1.19.8~ynh2