1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/moodle_ynh.git synced 2024-09-03 19:46:23 +02:00
* 3.11.6
This commit is contained in:
Éric Gaspar 2022-03-27 23:52:12 +02:00 committed by GitHub
parent 7bc842a3e9
commit 8b1da5a691
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 12 additions and 18 deletions

View file

@ -17,7 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
Online learning platform Online learning platform
**Shipped version:** 3.11.5~ynh1 **Shipped version:** 3.11.6~ynh1
**Demo:** https://sandbox.moodledemo.net/ **Demo:** https://sandbox.moodledemo.net/

View file

@ -13,7 +13,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour
Plateforme d'apprentissage en ligne Plateforme d'apprentissage en ligne
**Version incluse :** 3.11.5~ynh1 **Version incluse :** 3.11.6~ynh1
**Démo :** https://sandbox.moodledemo.net/ **Démo :** https://sandbox.moodledemo.net/

View file

@ -1,5 +1,5 @@
SOURCE_URL=https://github.com/moodle/moodle/archive/v3.11.5.zip SOURCE_URL=https://github.com/moodle/moodle/archive/v3.11.6.zip
SOURCE_SUM=993c6ef90710cbfd60764c4ebdde1547fbdab409dceab79f1aef0aef70812a9e SOURCE_SUM=eaade75ef2ddb223abe7ca89c61d2579ef183bdedaee0241307b0a7992bb6b45
SOURCE_SUM_PRG=sha256sum SOURCE_SUM_PRG=sha256sum
SOURCE_FORMAT=zip SOURCE_FORMAT=zip
SOURCE_IN_SUBDIR=true SOURCE_IN_SUBDIR=true

View file

@ -8,7 +8,7 @@ $CFG->dbtype = 'pgsql';
$CFG->dblibrary = 'native'; $CFG->dblibrary = 'native';
$CFG->dbhost = 'localhost'; $CFG->dbhost = 'localhost';
$CFG->dbname = '__DB_NAME__'; $CFG->dbname = '__DB_NAME__';
$CFG->dbuser = '__DB_NAME__'; $CFG->dbuser = '__DB_USER__';
$CFG->dbpass = '__DB_PWD__'; $CFG->dbpass = '__DB_PWD__';
$CFG->prefix = 'mdl_'; $CFG->prefix = 'mdl_';
$CFG->dboptions = array( $CFG->dboptions = array(

View file

@ -8,7 +8,7 @@ $CFG->dbtype = 'pgsql';
$CFG->dblibrary = 'native'; $CFG->dblibrary = 'native';
$CFG->dbhost = 'localhost'; $CFG->dbhost = 'localhost';
$CFG->dbname = '__DB_NAME__'; $CFG->dbname = '__DB_NAME__';
$CFG->dbuser = '__DB_NAME__'; $CFG->dbuser = '__DB_USER__';
$CFG->dbpass = '__DB_PWD__'; $CFG->dbpass = '__DB_PWD__';
$CFG->prefix = 'mdl_'; $CFG->prefix = 'mdl_';
$CFG->dboptions = array( $CFG->dboptions = array(
@ -21,6 +21,8 @@ $CFG->wwwroot = 'https://__DOMAIN____PATH__';
$CFG->dataroot = '__DATA_PATH__'; $CFG->dataroot = '__DATA_PATH__';
$CFG->admin = 'admin'; $CFG->admin = 'admin';
$CFG->lang = '__LANGUAGE__';
$CFG->directorypermissions = 02777; $CFG->directorypermissions = 02777;
require_once(__DIR__ . '/lib/setup.php'); // Do not edit require_once(__DIR__ . '/lib/setup.php'); // Do not edit

View file

@ -13,7 +13,6 @@ location __PATH__/ {
location ~ [^/]\.php(/|$) { location ~ [^/]\.php(/|$) {
fastcgi_split_path_info ^(.+?\.php)(/.*)$; fastcgi_split_path_info ^(.+?\.php)(/.*)$;
fastcgi_pass unix:/var/run/php/php__PHPVERSION__-fpm-__NAME__.sock; fastcgi_pass unix:/var/run/php/php__PHPVERSION__-fpm-__NAME__.sock;
fastcgi_index index.php; fastcgi_index index.php;
include fastcgi_params; include fastcgi_params;
fastcgi_param REMOTE_USER $remote_user; fastcgi_param REMOTE_USER $remote_user;

View file

@ -6,7 +6,7 @@
"en": "Online learning platform", "en": "Online learning platform",
"fr": "Plateforme d'apprentissage en ligne" "fr": "Plateforme d'apprentissage en ligne"
}, },
"version": "3.11.5~ynh1", "version": "3.11.6~ynh1",
"url": "https://moodle.org/", "url": "https://moodle.org/",
"upstream": { "upstream": {
"license": "GPL-3.0-or-later", "license": "GPL-3.0-or-later",

View file

@ -29,6 +29,7 @@ ynh_script_progression --message="Loading installation settings..." --weight=1
final_path=$(ynh_app_setting_get --app=$app --key=final_path) final_path=$(ynh_app_setting_get --app=$app --key=final_path)
data_path=$(ynh_app_setting_get --app=$app --key=data_path) data_path=$(ynh_app_setting_get --app=$app --key=data_path)
db_name=$(ynh_app_setting_get --app=$app --key=db_name) db_name=$(ynh_app_setting_get --app=$app --key=db_name)
db_user=$db_name
db_pwd=$(ynh_app_setting_get --app=$app --key=psqlpwd) db_pwd=$(ynh_app_setting_get --app=$app --key=psqlpwd)
#================================================= #=================================================
@ -102,12 +103,6 @@ domain=${new_domain%/}
path=${new_path%/} path=${new_path%/}
dir="__DIR__" dir="__DIR__"
# if [ "$new_path" == "/" ]; then
# ynh_replace_string --match_string="\$CFG->wwwroot = .*" --replace_string="\$CFG->wwwroot = \'https:\/\/${new_domain%\/}\';" --target_file="$final_path/config.php"
# else
# ynh_replace_string --match_string="\$CFG->wwwroot = .*" --replace_string="\$CFG->wwwroot = \'https:\/\/${new_domain}${new_path%\/}\';" --target_file="$final_path/config.php"
# fi
if [ "$new_path" == "/" ]; then if [ "$new_path" == "/" ]; then
ynh_add_config --template="../conf/config-domain.php" --destination="$final_path/config.php" ynh_add_config --template="../conf/config-domain.php" --destination="$final_path/config.php"
else else

View file

@ -57,7 +57,7 @@ set__fpm_footprint() {
} }
set__free_footprint() { set__free_footprint() {
if [ "$fpm_footprint" = "specific" ] if [ "$fpm_footprint" == "specific" ]
then then
ynh_app_setting_set --app=$app --key=fpm_footprint --value="$free_footprint" ynh_app_setting_set --app=$app --key=fpm_footprint --value="$free_footprint"
fi fi
@ -72,7 +72,7 @@ ynh_app_config_validate() {
if [ "${changed[fpm_usage]}" == "true" ] || [ "${changed[fpm_footprint]}" == "true" ] || [ "${changed[free_footprint]}" == "true" ]; then 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 is set to 'specific', use $free_footprint value.
if [ "$fpm_footprint" = "specific" ] if [ "$fpm_footprint" == "specific" ]
then then
fpm_footprint=$free_footprint fpm_footprint=$free_footprint
fi fi

View file

@ -72,8 +72,6 @@ db_user=$db_name
ynh_app_setting_set --app=$app --key=db_name --value=$db_name ynh_app_setting_set --app=$app --key=db_name --value=$db_name
ynh_psql_setup_db --db_user=$db_user --db_name=$db_name ynh_psql_setup_db --db_user=$db_user --db_name=$db_name
db_pwd=$(ynh_app_setting_get --app=$app --key=psqlpwd)
#================================================= #=================================================
# CREATE DEDICATED USER # CREATE DEDICATED USER
#================================================= #=================================================