1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/moodle_ynh.git synced 2024-09-03 19:46:23 +02:00

Merge pull request #15 from YunoHost-Apps/testing

Fix Buster
This commit is contained in:
Kayou 2020-03-27 14:18:44 +01:00 committed by GitHub
commit 836ddb2208
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 26 additions and 9 deletions

View file

@ -6,7 +6,7 @@
"en": "Moodle package for YunoHost application.", "en": "Moodle package for YunoHost application.",
"fr": "Moodle de package dapplication pour YunoHost." "fr": "Moodle de package dapplication pour YunoHost."
}, },
"version": "3.8.2", "version": "3.8.2~ynh2",
"url": "https://moodle.org/", "url": "https://moodle.org/",
"license": "GPL-3.0-or-later", "license": "GPL-3.0-or-later",
"maintainer": { "maintainer": {

View file

@ -59,8 +59,13 @@ ynh_app_setting_set --app=$app --key=is_public --value=$is_public
#================================================= #=================================================
ynh_script_progression --message="Installing dependencies..." --weight=60 ynh_script_progression --message="Installing dependencies..." --weight=60
ynh_install_app_dependencies $pkg_dependencies if [ "$(lsb_release --codename --short)" = "stretch" ]; then
ynh_install_php --phpversion="$YNH_PHP_VERSION" --package="$extra_pkg_dependencies" ynh_install_app_dependencies $pkg_dependencies
ynh_install_php --phpversion="$YNH_PHP_VERSION" --package="$extra_pkg_dependencies"
else
pkg_dependencies="$pkg_dependencies $extra_pkg_dependencies"
ynh_install_app_dependencies $pkg_dependencies
fi
#================================================= #=================================================
# CREATE POSTGRESQL DATABASE # CREATE POSTGRESQL DATABASE

View file

@ -64,7 +64,10 @@ ynh_script_progression --message="Removing php-fpm configuration..." --weight=20
# Remove the dedicated php-fpm config # Remove the dedicated php-fpm config
ynh_remove_fpm_config ynh_remove_fpm_config
ynh_remove_php "$YNH_PHP_VERSION"
if [ "$(lsb_release --codename --short)" = "stretch" ]; then
ynh_remove_php
fi
#================================================= #=================================================
# SPECIFIC REMOVE # SPECIFIC REMOVE

View file

@ -89,9 +89,13 @@ ynh_restore_file --origin_path="/etc/php/$YNH_PHP_VERSION/fpm/pool.d/$app.conf"
#================================================= #=================================================
ynh_script_progression --message="Reinstalling dependencies..." --weight=60 ynh_script_progression --message="Reinstalling dependencies..." --weight=60
# Define and install dependencies if [ "$(lsb_release --codename --short)" = "stretch" ]; then
ynh_install_app_dependencies $pkg_dependencies ynh_install_app_dependencies $pkg_dependencies
ynh_install_php --phpversion="$YNH_PHP_VERSION" --package="$extra_pkg_dependencies" ynh_install_php --phpversion="$YNH_PHP_VERSION" --package="$extra_pkg_dependencies"
else
pkg_dependencies="$pkg_dependencies $extra_pkg_dependencies"
ynh_install_app_dependencies $pkg_dependencies
fi
#================================================= #=================================================
# RESTORE THE POSTGRESQL DATABASE # RESTORE THE POSTGRESQL DATABASE

View file

@ -83,8 +83,13 @@ ynh_add_nginx_config YNH_PHP_VERSION
#================================================= #=================================================
ynh_script_progression --message="Upgrading dependencies..." --weight=30 ynh_script_progression --message="Upgrading dependencies..." --weight=30
ynh_install_app_dependencies $pkg_dependencies if [ "$(lsb_release --codename --short)" = "stretch" ]; then
ynh_install_php --phpversion="$YNH_PHP_VERSION" --package="$extra_pkg_dependencies" ynh_install_app_dependencies $pkg_dependencies
ynh_install_php --phpversion="$YNH_PHP_VERSION" --package="$extra_pkg_dependencies"
else
pkg_dependencies="$pkg_dependencies $extra_pkg_dependencies"
ynh_install_app_dependencies $pkg_dependencies
fi
#================================================= #=================================================
# CREATE DEDICATED USER # CREATE DEDICATED USER