diff --git a/README.md b/README.md index b51fca6..1bef151 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in GRR is a resource reservation management system (rooms, equipment, vehicle, staff) but it can also be used as a shared mini-diary. Developed in php and responsive, which allows it to be accessible, from anywhere and on any type of equipment (PC, Mac, tablet, phone, TV...). -**Shipped version:** 3.5.1~ynh1 +**Shipped version:** 4.1.1~ynh1 ## Screenshots diff --git a/README_fr.md b/README_fr.md index 166a028..92c8e66 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 GRR est un système de gestion de réservation de ressources (salles, équipements, véhicule, personnels) mais il peut également être utilisé comme mini-agenda partagé. Développé en php et en responsive, ce qui lui permet d'être accessible, de n'importe où et sur tout type d'équipement (PC, Mac, tablette, téléphone, TV...). -**Version incluse :** 3.5.1~ynh1 +**Version incluse :** 4.1.1~ynh1 ## Captures d’écran diff --git a/manifest.toml b/manifest.toml index 0e8060c..ab3b277 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Grr" description.en = "Tool for booking meeting rooms or other resources" description.fr = "Outil de réservation de salles de réunion ou d'autres ressources" -version = "3.5.1~ynh1" +version = "4.1.1~ynh1" maintainers = ["Sébastien Menentrier"] @@ -18,7 +18,7 @@ userdoc = "https://site.devome.com/fr/grr/telechargement/category/2-informations code = "https://github.com/JeromeDevome/GRR" [integration] -yunohost = ">= 11.1.20" +yunohost = ">= 11.2" architectures = "all" multi_instance = true ldap = true @@ -46,8 +46,8 @@ ram.runtime = "50M" [resources] [resources.sources.main] - url = "https://github.com/JeromeDevome/GRR/archive/refs/tags/v3.5.1.tar.gz" - sha256 = "7c0f341e961b61a16905f6d7c2f296e7166313f5a309999a380fbacf26e1d9a6" + url = "https://github.com/JeromeDevome/GRR/archive/refs/tags/v4.1.1.tar.gz" + sha256 = "e6197c33db025510237d6fd5b823dac452c7f5d2a2dc72e548ad840b3b7ba122" autoupdate.strategy = "latest_github_tag" [resources.system_user] @@ -58,7 +58,7 @@ ram.runtime = "50M" main.url = "/" [resources.apt] - packages = "mariadb-server php8.2-ldap php8.2-gd php8.2-mbstring php8.2-mysqli php8.2-mysqlnd php8.2-xml" + packages = "mariadb-server, php8.2-ldap, php8.2-gd, php8.2-mbstring, php8.2-mysqli, php8.2-mysqlnd, php8.2-xml, php8.2-intl" [resources.database] type = "mysql" diff --git a/scripts/install b/scripts/install index 50efca4..71d6974 100755 --- a/scripts/install +++ b/scripts/install @@ -22,16 +22,11 @@ chown -R $app:www-data "$install_dir" #================================================= # NGINX CONFIGURATION #================================================= -ynh_script_progression --message="Configuring NGINX web server..." --weight=1 +ynh_script_progression --message="Adding system configurations related to $app..." --weight=1 ynh_add_nginx_config -#================================================= -# PHP-FPM CONFIGURATION -#================================================= -ynh_script_progression --message="Configuring PHP-FPM..." --weight=1 - -ynh_add_fpm_config --usage=low --footprint=low +ynh_add_fpm_config #================================================= # SPECIFIC SETUP @@ -40,13 +35,13 @@ ynh_add_fpm_config --usage=low --footprint=low #================================================= ynh_script_progression --message="Adding a configuration file..." --weight=1 -ynh_add_config --template="config_ldap.inc.php" --destination="$install_dir/include/config_ldap.inc.php" -ynh_add_config --template="connect.inc.php" --destination="$install_dir/include/connect.inc.php" +ynh_add_config --template="config_ldap.inc.php" --destination="$install_dir/personnalisation/config_ldap.inc.php" +ynh_add_config --template="connect.inc.php" --destination="$install_dir/personnalisation/connect.inc.php" -chmod 400 "$install_dir/include/config_ldap.inc.php" -chmod 400 "$install_dir/include/connect.inc.php" -chown $app:$app "$install_dir/include/config_ldap.inc.php" -chown $app:$app "$install_dir/include/connect.inc.php" +chmod 400 "$install_dir/personnalisation/config_ldap.inc.php" +chmod 400 "$install_dir/personnalisation/connect.inc.php" +chown $app:$app "$install_dir/personnalisation/config_ldap.inc.php" +chown $app:$app "$install_dir/personnalisation/connect.inc.php" mysql --default-character-set=latin1 -u $db_user -p${db_pwd} $db_name < $install_dir/installation/tables.my.sql diff --git a/scripts/remove b/scripts/remove index 79cb058..dd7376b 100755 --- a/scripts/remove +++ b/scripts/remove @@ -12,16 +12,11 @@ source /usr/share/yunohost/helpers #================================================= # REMOVE NGINX CONFIGURATION #================================================= -ynh_script_progression --message="Removing NGINX web server configuration..." --weight=1 +ynh_script_progression --message="Removing system configurations related to $app..." --weight=1 # Remove the dedicated NGINX config ynh_remove_nginx_config -#================================================= -# REMOVE PHP-FPM CONFIGURATION -#================================================= -ynh_script_progression --message="Removing PHP-FPM configuration..." --weight=1 - # Remove the dedicated PHP-FPM config ynh_remove_fpm_config diff --git a/scripts/upgrade b/scripts/upgrade index 6725c8b..5bc18cf 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -38,36 +38,30 @@ ynh_script_progression --message="Upgrading NGINX web server configuration..." - # Create a dedicated NGINX config ynh_add_nginx_config -#================================================= -# PHP-FPM CONFIGURATION -#================================================= -ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=1 - # Create a dedicated PHP-FPM config -ynh_add_fpm_config --usage=low --footprint=low +ynh_add_fpm_config #================================================= # UPDATE A CONFIG FILE #================================================= ynh_script_progression --message="Updating a configuration file..." --weight=1 -ynh_add_config --template="config_ldap.inc.php" --destination="$install_dir/include/config_ldap.inc.php" -ynh_add_config --template="connect.inc.php" --destination="$install_dir/include/connect.inc.php" +ynh_add_config --template="config_ldap.inc.php" --destination="$install_dir/personnalisation/config_ldap.inc.php" +ynh_add_config --template="connect.inc.php" --destination="$install_dir/personnalisation/connect.inc.php" -chmod 400 "$install_dir/include/config_ldap.inc.php" -chmod 400 "$install_dir/include/connect.inc.php" -chown $app:$app "$install_dir/include/config_ldap.inc.php" -chown $app:$app "$install_dir/include/connect.inc.php" +chmod 400 "$install_dir/personnalisation/config_ldap.inc.php" +chmod 400 "$install_dir/personnalisation/connect.inc.php" +chown $app:$app "$install_dir/personnalisation/config_ldap.inc.php" +chown $app:$app "$install_dir/personnalisation/connect.inc.php" #================================================= # UPDATE DATABASE #================================================= ynh_script_progression --message="Updating database..." --weight=1 -#REMOVEME? phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) - -pushd $install_dir/admin - php${phpversion} admin_maj.php "" +pushd $install_dir/installation + ynh_write_var_in_file --file="$install_dir/installation/maj.php" --key="majscript" --value=true + php${phpversion} maj.php "" popd #=================================================