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

Merge branch 'testing' into ci-auto-update-4.1.1

This commit is contained in:
Tagada 2023-09-27 22:15:38 +02:00 committed by GitHub
commit faba1754fb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 21 deletions

View file

@ -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
@ -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 php8.2-intl"
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"

View file

@ -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

View file

@ -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

View file

@ -38,13 +38,8 @@ 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