diff --git a/conf/app.src b/conf/app.src index c045988..e9a0493 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/moodle/moodle/archive/v3.11.5.zip -SOURCE_SUM=993c6ef90710cbfd60764c4ebdde1547fbdab409dceab79f1aef0aef70812a9e +SOURCE_URL=https://github.com/moodle/moodle/archive/v3.11.6.zip +SOURCE_SUM=eaade75ef2ddb223abe7ca89c61d2579ef183bdedaee0241307b0a7992bb6b45 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=true diff --git a/conf/config-domain.php b/conf/config-domain.php index 63e132d..7ea0f92 100644 --- a/conf/config-domain.php +++ b/conf/config-domain.php @@ -8,7 +8,7 @@ $CFG->dbtype = 'pgsql'; $CFG->dblibrary = 'native'; $CFG->dbhost = 'localhost'; $CFG->dbname = '__DB_NAME__'; -$CFG->dbuser = '__DB_NAME__'; +$CFG->dbuser = '__DB_USER__'; $CFG->dbpass = '__DB_PWD__'; $CFG->prefix = 'mdl_'; $CFG->dboptions = array( diff --git a/conf/config-path.php b/conf/config-path.php index 1980bf3..768e7d0 100644 --- a/conf/config-path.php +++ b/conf/config-path.php @@ -8,7 +8,7 @@ $CFG->dbtype = 'pgsql'; $CFG->dblibrary = 'native'; $CFG->dbhost = 'localhost'; $CFG->dbname = '__DB_NAME__'; -$CFG->dbuser = '__DB_NAME__'; +$CFG->dbuser = '__DB_USER__'; $CFG->dbpass = '__DB_PWD__'; $CFG->prefix = 'mdl_'; $CFG->dboptions = array( diff --git a/manifest.json b/manifest.json index d827b72..886521c 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Online learning platform", "fr": "Plateforme d'apprentissage en ligne" }, - "version": "3.11.5~ynh1", + "version": "3.11.6~ynh1", "url": "https://moodle.org/", "upstream": { "license": "GPL-3.0-or-later", diff --git a/scripts/config b/scripts/config index 3440bd2..8a9110c 100644 --- a/scripts/config +++ b/scripts/config @@ -57,7 +57,7 @@ set__fpm_footprint() { } set__free_footprint() { - if [ "$fpm_footprint" = "specific" ] + if [ "$fpm_footprint" == "specific" ] then ynh_app_setting_set --app=$app --key=fpm_footprint --value="$free_footprint" fi @@ -72,7 +72,7 @@ ynh_app_config_validate() { if [ "${changed[fpm_usage]}" == "true" ] || [ "${changed[fpm_footprint]}" == "true" ] || [ "${changed[free_footprint]}" == "true" ]; then # If fpm_footprint is set to 'specific', use $free_footprint value. - if [ "$fpm_footprint" = "specific" ] + if [ "$fpm_footprint" == "specific" ] then fpm_footprint=$free_footprint fi diff --git a/scripts/upgrade b/scripts/upgrade index c15d324..06d3009 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -22,6 +22,7 @@ admin=$(ynh_app_setting_get --app=$app --key=admin) final_path=$(ynh_app_setting_get --app=$app --key=final_path) data_path=$(ynh_app_setting_get --app=$app --key=data_path) db_name=$(ynh_app_setting_get --app=$app --key=db_name) +db_user=$db_name site_name=$(ynh_app_setting_get --app=$app --key=site_name) phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)