diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6815e49..8b13789 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1 @@ -include: - - project: 'pages/mkdocs' - ref: 'master' - file: '/.gitlab-ci.yml' + diff --git a/Makefile b/Makefile index 980ec66..9bcc516 100644 --- a/Makefile +++ b/Makefile @@ -184,4 +184,9 @@ adminer: pgtuner: docker-compose -f isard-apps/docker/network.yml \ - -f isard-sso/docker-compose-parts/pgtuner.yml config > pgtuner.yml \ No newline at end of file + -f isard-sso/docker-compose-parts/pgtuner.yml config > pgtuner.yml + +upgrade-moodle: + docker exec -ti isard-apps-moodle php7 admin/cli/maintenance.php --enable + docker exec -ti isard-apps-moodle php7 admin/cli/upgrade.php --non-interactive --allow-unstable + docker exec -ti isard-apps-moodle php7 admin/cli/maintenance.php --disable \ No newline at end of file diff --git a/digitaldemocratic.conf.sample b/digitaldemocratic.conf.sample index 5d30824..fd2f322 100644 --- a/digitaldemocratic.conf.sample +++ b/digitaldemocratic.conf.sample @@ -1,5 +1,6 @@ # DIGITAL DEMOCRATIC GLOBAL ENV TITLE="Digital Democratic" +TITLE_SHORT="dd" DOMAIN=mydomain.com LETSENCRYPT_DNS= LETSENCRYPT_EMAIL= @@ -10,8 +11,10 @@ DATA_FOLDER=/opt/digitaldemocratic/data SRC_FOLDER=/opt/digitaldemocratic/src BACKUP_FOLDER=/opt/digitaldemocratic/backup -LANG=es_ES.UTF-8 -LANGUAGE=es_ES:ca +# https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes +LANGUAGE_CODE=ca +#LANGUAGE_LONG=ca_ES.UTF-8 + SMTP_HOST=smtp.mymailserver.com SMTP_PORT=587 @@ -92,3 +95,10 @@ MARIADB_PASSWORD=SuperSecret ## FREEIPA (disabled) ##============================================================================= IPA_ADMIN_PWD=freeipafreeipa + + +# SOURCES & SYSTEM VARS + +## MOODLE +MOODLE_VERSION=MOODLE_311_STABLE +MOODLE_MAX_FILESIZE_UPLOAD=50M \ No newline at end of file diff --git a/isard-apps b/isard-apps index 19a3d1e..3dcede3 160000 --- a/isard-apps +++ b/isard-apps @@ -1 +1 @@ -Subproject commit 19a3d1ea8b6266bbaa6f7eb01fd609c9c93c023c +Subproject commit 3dcede372c0cf883fdb68776f39b0ad7aec64c92