YunoHost-Apps/grr_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/grr_ynh.git synced 2024-09-03 19:15:56 +02:00
Code Issues Activity Actions

Merge pull request #10 from YunoHost-Apps/testing

Browse source 
Testing
This commit is contained in:
Alexandre Aubin 2023-10-26 18:51:47 +02:00 • committed by GitHub
commit 0a690d1fcd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 26 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -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...). 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 ## Screenshots

2
README_fr.md
View file

@ -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...). 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 ## Captures d’écran

10
manifest.toml
View file

@ -5,7 +5,7 @@ name = "Grr"
description.en = "Tool for booking meeting rooms or other resources" 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" 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"] 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" code = "https://github.com/JeromeDevome/GRR"
[integration] [integration]
yunohost = ">= 11.1.20" yunohost = ">= 11.2"
architectures = "all" architectures = "all"
multi_instance = true multi_instance = true
ldap = true ldap = true
@ -46,8 +46,8 @@ ram.runtime = "50M"
[resources] [resources]
[resources.sources.main] [resources.sources.main]
url = "https://github.com/JeromeDevome/GRR/archive/refs/tags/v3.5.1.tar.gz" url = "https://github.com/JeromeDevome/GRR/archive/refs/tags/v4.1.1.tar.gz"
sha256 = "7c0f341e961b61a16905f6d7c2f296e7166313f5a309999a380fbacf26e1d9a6" sha256 = "e6197c33db025510237d6fd5b823dac452c7f5d2a2dc72e548ad840b3b7ba122"
autoupdate.strategy = "latest_github_tag" autoupdate.strategy = "latest_github_tag"
[resources.system_user] [resources.system_user]
@ -58,7 +58,7 @@ ram.runtime = "50M"
main.url = "/" main.url = "/"
[resources.apt] [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] [resources.database]
type = "mysql" type = "mysql"

21
scripts/install
View file

@ -22,16 +22,11 @@ chown -R $app:www-data "$install_dir"
#================================================= #=================================================
# NGINX CONFIGURATION # 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 ynh_add_nginx_config
#================================================= ynh_add_fpm_config
# PHP-FPM CONFIGURATION
#=================================================
ynh_script_progression --message="Configuring PHP-FPM..." --weight=1
ynh_add_fpm_config --usage=low --footprint=low
#================================================= #=================================================
# SPECIFIC SETUP # 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_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="config_ldap.inc.php" --destination="$install_dir/personnalisation/config_ldap.inc.php"
ynh_add_config --template="connect.inc.php" --destination="$install_dir/include/connect.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/personnalisation/config_ldap.inc.php"
chmod 400 "$install_dir/include/connect.inc.php" chmod 400 "$install_dir/personnalisation/connect.inc.php"
chown $app:$app "$install_dir/include/config_ldap.inc.php" chown $app:$app "$install_dir/personnalisation/config_ldap.inc.php"
chown $app:$app "$install_dir/include/connect.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 mysql --default-character-set=latin1 -u $db_user -p${db_pwd} $db_name < $install_dir/installation/tables.my.sql

7
scripts/remove
View file

@ -12,16 +12,11 @@ source /usr/share/yunohost/helpers
#================================================= #=================================================
# REMOVE NGINX CONFIGURATION # 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 # Remove the dedicated NGINX config
ynh_remove_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 # Remove the dedicated PHP-FPM config
ynh_remove_fpm_config ynh_remove_fpm_config

26
scripts/upgrade
View file

@ -38,36 +38,30 @@ ynh_script_progression --message="Upgrading NGINX web server configuration..." -
# Create a dedicated NGINX config # Create a dedicated NGINX config
ynh_add_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 # Create a dedicated PHP-FPM config
ynh_add_fpm_config --usage=low --footprint=low ynh_add_fpm_config
#================================================= #=================================================
# UPDATE A CONFIG FILE # UPDATE A CONFIG FILE
#================================================= #=================================================
ynh_script_progression --message="Updating a configuration file..." --weight=1 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="config_ldap.inc.php" --destination="$install_dir/personnalisation/config_ldap.inc.php"
ynh_add_config --template="connect.inc.php" --destination="$install_dir/include/connect.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/personnalisation/config_ldap.inc.php"
chmod 400 "$install_dir/include/connect.inc.php" chmod 400 "$install_dir/personnalisation/connect.inc.php"
chown $app:$app "$install_dir/include/config_ldap.inc.php" chown $app:$app "$install_dir/personnalisation/config_ldap.inc.php"
chown $app:$app "$install_dir/include/connect.inc.php" chown $app:$app "$install_dir/personnalisation/connect.inc.php"
#================================================= #=================================================
# UPDATE DATABASE # UPDATE DATABASE
#================================================= #=================================================
ynh_script_progression --message="Updating database..." --weight=1 ynh_script_progression --message="Updating database..." --weight=1
#REMOVEME? phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) pushd $install_dir/installation
ynh_write_var_in_file --file="$install_dir/installation/maj.php" --key="majscript" --value=true
pushd $install_dir/admin php${phpversion} maj.php ""
php${phpversion} admin_maj.php ""
popd popd
#================================================= #=================================================