From 224620e33e56e00a5d3867b3b84810c72eebe69e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josep=20Maria=20Vi=C3=B1olas=20Auquer?= Date: Sun, 6 Jun 2021 21:07:06 +0000 Subject: [PATCH 1/8] Update README.md --- README.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 91afd89..b813708 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,7 @@ -# Isard Office +# Isard Applications + +**NOTE**: This repo now is included inhttps://gitlab.com/digitaldemocratic/digitaldemocratic that is the repo that includes this repo. Maybe this SSO repo won't work alone by now... + This repository offers a basic package of applications to be used mainly in education. It has some theme and plugin personalization and aims to be as simple to be set up as possible. Taking into account that the set up allows for SSO with SAML2 (https://gitlab.com/isard/isard-sso) you should have some technical Linux knowledge. From 19a3d1ea8b6266bbaa6f7eb01fd609c9c93c023c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josep=20Maria=20Vi=C3=B1olas=20Auquer?= Date: Sun, 6 Jun 2021 21:07:20 +0000 Subject: [PATCH 2/8] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index b813708..c287ef5 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Isard Applications -**NOTE**: This repo now is included inhttps://gitlab.com/digitaldemocratic/digitaldemocratic that is the repo that includes this repo. Maybe this SSO repo won't work alone by now... +**NOTE**: This repo now is included in https://gitlab.com/digitaldemocratic/digitaldemocratic that is the repo that includes this repo. Maybe this SSO repo won't work alone by now... This repository offers a basic package of applications to be used mainly in education. It has some theme and plugin personalization and aims to be as simple to be set up as possible. Taking into account that the set up allows for SSO with SAML2 (https://gitlab.com/isard/isard-sso) you should have some technical Linux knowledge. From 3dcede372c0cf883fdb68776f39b0ad7aec64c92 Mon Sep 17 00:00:00 2001 From: root Date: Wed, 9 Jun 2021 20:09:24 +0200 Subject: [PATCH 3/8] Moodle: Fixed version in conf / Parametrized lang in conf / Moved upgrade to Makefile --- docker/moodle/02-configure-moodle.sh | 16 ++++++------- docker/moodle/Dockerfile | 36 ++++------------------------ docker/moodle/moodle.yml | 14 +++++++---- 3 files changed, 21 insertions(+), 45 deletions(-) diff --git a/docker/moodle/02-configure-moodle.sh b/docker/moodle/02-configure-moodle.sh index 1223ad8..6676e71 100755 --- a/docker/moodle/02-configure-moodle.sh +++ b/docker/moodle/02-configure-moodle.sh @@ -18,7 +18,7 @@ sleep 3; # Check if the config.php file exists if [ ! -f /var/www/html/config.php ]; then - curl --location $MOODLE_URL | tar xz --strip-components=1 -C /var/www/html/ + curl --location https://github.com/moodle/moodle/archive/$MOODLE_VERSION.tar.gz | tar xz --strip-components=1 -C /var/www/html/ cp /isinstalled.php /var/www/html/admin/cli/ chown nobody:root /var/www/html -R @@ -34,8 +34,8 @@ if [ ! -f /var/www/html/config.php ]; then --dbpass=$DB_PASS \ --dbport=$DB_PORT \ --prefix=$DB_PREFIX \ - --fullname=Dockerized_Moodle \ - --shortname=moodle \ + --fullname="$MOODLE_SITENAME" \ + --shortname="$MOODLE_SHORTSITENAME" \ --adminuser=$MOODLE_USERNAME \ --adminpass=$MOODLE_PASSWORD \ --adminemail=$MOODLE_EMAIL \ @@ -80,11 +80,11 @@ if php -d max_input_vars=1000 /var/www/html/admin/cli/isinstalled.php ; then php -d max_input_vars=1000 /var/www/html/admin/cli/cfg.php --name=noreplyaddress --set=$MOODLE_MAIL_NOREPLY_ADDRESS php -d max_input_vars=1000 /var/www/html/admin/cli/cfg.php --name=emailsubjectprefix --set=$MOODLE_MAIL_PREFIX -else - echo "Upgrading moodle..." - php -d max_input_vars=1000 /var/www/html/admin/cli/maintenance.php --enable - php -d max_input_vars=1000 /var/www/html/admin/cli/upgrade.php --non-interactive --allow-unstable - php -d max_input_vars=1000 /var/www/html/admin/cli/maintenance.php --disable +# else + # echo "Upgrading moodle..." + # php -d max_input_vars=1000 /var/www/html/admin/cli/maintenance.php --enable + # php -d max_input_vars=1000 /var/www/html/admin/cli/upgrade.php --non-interactive --allow-unstable + # php -d max_input_vars=1000 /var/www/html/admin/cli/maintenance.php --disable fi chown -R nobody:root /var/www/html diff --git a/docker/moodle/Dockerfile b/docker/moodle/Dockerfile index 589675d..ac30f0e 100644 --- a/docker/moodle/Dockerfile +++ b/docker/moodle/Dockerfile @@ -1,8 +1,12 @@ +ARG LANG=$LANG +ARG LANGUAGE=$LANGUAGE + ARG ARCH= FROM ${ARCH}erseco/alpine-php7-webserver LABEL maintainer="Adapted from: Ernesto Serrano " + USER root COPY src/rootfs/ / COPY 02-configure-moodle.sh /docker-entrypoint-init.d/ @@ -16,35 +20,3 @@ RUN echo "group=nobody" >> /etc/php7/php-fpm.d/www.conf RUN apk add --no-cache dcron libcap && \ chown nobody:nobody /usr/sbin/crond && \ setcap cap_setgid=ep /usr/sbin/crond - -# Change MOODLE_38_STABLE for new versions -ENV MOODLE_URL=https://github.com/moodle/moodle/archive/MOODLE_310_STABLE.tar.gz \ - LANG=en_US.UTF-8 \ - LANGUAGE=en_US:en \ - SITE_URL=http://localhost \ - DB_TYPE=pgsql \ - DB_HOST=postgres \ - DB_PORT=5432 \ - DB_NAME=moodle \ - DB_USER=moodle \ - DB_PASS=moodle \ - DB_PREFIX=mdl_ \ - SSLPROXY=false \ - MOODLE_EMAIL=user@example.com \ - MOODLE_LANGUAGE=en \ - MOODLE_SITENAME=New-Site \ - MOODLE_USERNAME=moodleuser \ - MOODLE_PASSWORD=PLEASE_CHANGEME \ - SMTP_HOST=smtp.gmail.com \ - SMTP_PORT=587 \ - SMTP_USER=your_email@gmail.com \ - SMTP_PASSWORD=your_password \ - SMTP_PROTOCOL=tls \ - MOODLE_MAIL_NOREPLY_ADDRESS=noreply@localhost \ - MOODLE_MAIL_PREFIX=[moodle] \ - client_max_body_size=50M \ - post_max_size=50M \ - upload_max_filesize=50M \ - max_input_vars=1000 - -#RUN curl --location $MOODLE_URL | tar xz --strip-components=1 -C /var/www/html/ diff --git a/docker/moodle/moodle.yml b/docker/moodle/moodle.yml index c3febea..03ddf83 100644 --- a/docker/moodle/moodle.yml +++ b/docker/moodle/moodle.yml @@ -14,8 +14,7 @@ services: depends_on: - isard-apps-postgresql environment: - - LANG=${LANG} - - LANGUAGE:${LANGUAGE} + - MOODLE_VERSION=${MOODLE_VERSION} - SITE_URL=https://moodle.${DOMAIN} - DB_TYPE=pgsql - DB_HOST=isard-apps-postgresql @@ -25,9 +24,10 @@ services: - DB_PASS=${MOODLE_POSTGRES_PASSWORD} - DB_PREFIX=mdl_ - SSLPROXY=true - - MOODLE_EMAIL=${MOODLE_EMAIL} - - MOODLE_LANGUAGE=es - - MOODLE_SITENAME=isard-office + - MOODLE_EMAIL=${MOODLE_EMAIL} # + - MOODLE_LANGUAGE=${LANGUAGE_CODE} # + - MOODLE_SITENAME=${TITLE} # + - MOODLE_SHORTSITENAME=${TITLE_SHORT} # - MOODLE_USERNAME=${MOODLE_ADMIN_USER} - MOODLE_PASSWORD=${MOODLE_ADMIN_PASSWORD} - SMTP_HOST=${SMTP_HOST} @@ -37,6 +37,10 @@ services: - SMTP_PROTOCOL=${SMTP_PROTOCOL} - MOODLE_MAIL_NOREPLY_ADDRESS=${MOODLE_MAIL_NOREPLY_ADDRESS} - MOODLE_MAIL_PREFIX=${MOODLE_MAIL_PREFIX} + - client_max_body_size=${MOODLE_MAX_FILESIZE_UPLOAD} + - post_max_size=${MOODLE_MAX_FILESIZE_UPLOAD} + - upload_max_filesize=${MOODLE_MAX_FILESIZE_UPLOAD} + - max_input_vars=1000 networks: - isard_net From 117330cfcd0730b27e7f7945db39030e0d6e0bc8 Mon Sep 17 00:00:00 2001 From: root Date: Thu, 10 Jun 2021 23:27:26 +0200 Subject: [PATCH 4/8] Moodle: Upgrade jitsi and bbb plugins to latest version --- docker/moodle/03-plugins.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/moodle/03-plugins.sh b/docker/moodle/03-plugins.sh index 79cde8c..bb6a5fc 100755 --- a/docker/moodle/03-plugins.sh +++ b/docker/moodle/03-plugins.sh @@ -1,9 +1,9 @@ if [ ! -f /var/www/html/config.php ]; then - curl --location https://moodle.org/plugins/download.php/23360/mod_jitsi_moodle310_2021020300.zip > jitsi.zip + curl --location https://moodle.org/plugins/download.php/23360/mod_jitsi_moodle310_2021052500.zip > jitsi.zip unzip jitsi.zip -d /var/www/html/mod/ rm jitsi.zip - curl --location https://moodle.org/plugins/download.php/23294/mod_bigbluebuttonbn_moodle310_2019101004.zip > bbb.zip + curl --location https://moodle.org/plugins/download.php/23294/mod_bigbluebuttonbn_moodle310_2019101009.zip > bbb.zip unzip bbb.zip -d /var/www/html/mod/ rm bbb.zip From c06f9591814d7dcfa7716b0b6f758ab5011fdd34 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 11 Jun 2021 12:22:31 +0200 Subject: [PATCH 5/8] Fixed multisite rewrite rules --- docker/wordpress/.htaccess | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docker/wordpress/.htaccess b/docker/wordpress/.htaccess index d6d03f1..e316870 100644 --- a/docker/wordpress/.htaccess +++ b/docker/wordpress/.htaccess @@ -9,6 +9,6 @@ RewriteRule ^wp-admin$ wp-admin/ [R=301,L] RewriteCond %{REQUEST_FILENAME} -f [OR] RewriteCond %{REQUEST_FILENAME} -d RewriteRule ^ - [L] -RewriteRule ^(wp-(content|admin|includes).*) $1 [L] -RewriteRule ^(.*\.php)$ $1 [L] -RewriteRule . index.php [L] \ No newline at end of file +RewriteRule ^([_0-9a-zA-Z-]+/)?(wp-(content|admin|includes).*) $2 [L] +RewriteRule ^([_0-9a-zA-Z-]+/)?(.*\.php)$ $2 [L] +RewriteRule . index.php [L] From dcff5c0996c6e87a2ce73a9e088e9541ef9ea640 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 11 Jun 2021 15:14:46 +0200 Subject: [PATCH 6/8] Fixed moodle, nextcloud, wordpress img versions --- docker/moodle/Dockerfile | 12 +++++++----- docker/moodle/moodle.yml | 2 ++ docker/nextcloud/Dockerfile | 3 ++- docker/nextcloud/nextcloud.yml | 2 ++ docker/wordpress/wordpress.yml | 4 ++-- 5 files changed, 15 insertions(+), 8 deletions(-) diff --git a/docker/moodle/Dockerfile b/docker/moodle/Dockerfile index ac30f0e..e6f7663 100644 --- a/docker/moodle/Dockerfile +++ b/docker/moodle/Dockerfile @@ -1,8 +1,10 @@ -ARG LANG=$LANG -ARG LANGUAGE=$LANGUAGE - -ARG ARCH= -FROM ${ARCH}erseco/alpine-php7-webserver +# ARG LANG=$LANG +# ARG LANGUAGE=$LANGUAGE +# +# ARG ARCH= +ARG IMG=$MOODLE_IMG +FROM ${IMG} +# FROM ${ARCH}${IMG} LABEL maintainer="Adapted from: Ernesto Serrano " diff --git a/docker/moodle/moodle.yml b/docker/moodle/moodle.yml index 03ddf83..cbc30e5 100644 --- a/docker/moodle/moodle.yml +++ b/docker/moodle/moodle.yml @@ -4,6 +4,8 @@ services: build: context: ${BUILD_ROOT_PATH}/docker/moodle dockerfile: Dockerfile + args: + - IMG=${MOODLE_IMG} container_name: isard-apps-moodle restart: unless-stopped volumes: diff --git a/docker/nextcloud/Dockerfile b/docker/nextcloud/Dockerfile index edfe77a..4b1d42b 100644 --- a/docker/nextcloud/Dockerfile +++ b/docker/nextcloud/Dockerfile @@ -1,4 +1,5 @@ -FROM nextcloud:fpm-alpine +ARG IMG=$NEXTCLOUD_IMG +FROM ${IMG} RUN set -ex; \ \ diff --git a/docker/nextcloud/nextcloud.yml b/docker/nextcloud/nextcloud.yml index 2c65cc0..2f067a6 100644 --- a/docker/nextcloud/nextcloud.yml +++ b/docker/nextcloud/nextcloud.yml @@ -4,6 +4,8 @@ services: build: context: ${BUILD_ROOT_PATH}/docker/nextcloud dockerfile: Dockerfile + args: + - IMG=${NEXTCLOUD_IMG} #target: production container_name: isard-apps-nextcloud-app restart: unless-stopped diff --git a/docker/wordpress/wordpress.yml b/docker/wordpress/wordpress.yml index 350be10..03e7b3a 100644 --- a/docker/wordpress/wordpress.yml +++ b/docker/wordpress/wordpress.yml @@ -13,7 +13,7 @@ x-volumes: services: isard-apps-wordpress: - image: wordpress:latest # https://hub.docker.com/_/wordpress/ + image: ${WORDPRESS_IMG} # https://hub.docker.com/_/wordpress/ container_name: isard-apps-wordpress # ports: # - ${IP}:80:80 # change ip if required @@ -33,7 +33,7 @@ services: - isard_net isard-apps-wordpress-cli: - image: wordpress:cli + image: ${WORDPRESS_CLI_IMG} container_name: isard-apps-wordpress-cli volumes: *wordpress-volumes From 83cb6c453818749e22b6609660da779a3310b58e Mon Sep 17 00:00:00 2001 From: root Date: Mon, 14 Jun 2021 09:33:02 +0200 Subject: [PATCH 7/8] Fixed restart to unless-stopped --- docker/etherpad/etherpad.yml | 2 +- docker/jitsi/jitsi.yml | 2 +- docker/mariadb/mariadb.yml | 1 + docker/onlyoffice/onlyoffice.yml | 1 + docker/redis/redis.yml | 1 + docker/wordpress/wordpress.yml | 1 + 6 files changed, 6 insertions(+), 2 deletions(-) diff --git a/docker/etherpad/etherpad.yml b/docker/etherpad/etherpad.yml index 8d35b84..7d8c46a 100644 --- a/docker/etherpad/etherpad.yml +++ b/docker/etherpad/etherpad.yml @@ -6,7 +6,7 @@ services: context: ${BUILD_ROOT_PATH}/docker/etherpad dockerfile: Dockerfile container_name: isard-apps-etherpad - restart: on-failure:10 + restart: unless-stopped volumes: - /etc/localtime:/etc/localtime:ro # ports: diff --git a/docker/jitsi/jitsi.yml b/docker/jitsi/jitsi.yml index ef0d717..64db5dc 100644 --- a/docker/jitsi/jitsi.yml +++ b/docker/jitsi/jitsi.yml @@ -5,7 +5,7 @@ services: jitsi: container_name: jitsi image: jitsi/web:latest - restart: ${RESTART_POLICY} + restart: unless-stopped # ports: # - '${HTTP_PORT}:80' # - '${HTTPS_PORT}:443' diff --git a/docker/mariadb/mariadb.yml b/docker/mariadb/mariadb.yml index f8ef1df..b0a0901 100644 --- a/docker/mariadb/mariadb.yml +++ b/docker/mariadb/mariadb.yml @@ -20,5 +20,6 @@ services: MYSQL_DATABASE: wordpress MYSQL_USER: wordpress MYSQL_PASSWORD: ${WORDPRESS_MARIADB_PASSWORD} + restart: unless-stopped networks: - isard_net \ No newline at end of file diff --git a/docker/onlyoffice/onlyoffice.yml b/docker/onlyoffice/onlyoffice.yml index 0457f14..88b5a62 100644 --- a/docker/onlyoffice/onlyoffice.yml +++ b/docker/onlyoffice/onlyoffice.yml @@ -6,6 +6,7 @@ services: volumes: - /etc/localtime:/etc/localtime:ro - ${BUILD_ROOT_PATH}/docker/onlyoffice/local.json:/etc/onlyoffice/documentserver/local.json:ro + restart: unless-stopped networks: - isard_net diff --git a/docker/redis/redis.yml b/docker/redis/redis.yml index a3beb00..03d945f 100644 --- a/docker/redis/redis.yml +++ b/docker/redis/redis.yml @@ -6,5 +6,6 @@ services: volumes: - /etc/localtime:/etc/localtime:ro - ${DB_FOLDER}/redis:/data + restart: unless-stopped networks: - isard_net \ No newline at end of file diff --git a/docker/wordpress/wordpress.yml b/docker/wordpress/wordpress.yml index 03e7b3a..ff7ede8 100644 --- a/docker/wordpress/wordpress.yml +++ b/docker/wordpress/wordpress.yml @@ -29,6 +29,7 @@ services: - isard-apps-mariadb links: - isard-apps-mariadb + restart: unless-stopped networks: - isard_net From 15a1d577fb654005ab7c84eb1a932ce41d49df7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sim=C3=B3=20Albert=20i=20Beltran?= Date: Thu, 22 Jul 2021 10:42:33 +0200 Subject: [PATCH 8/8] Fix nextcloud navbar by hiding menu when clicking outside This doesn't fix when clicking files app + button. --- .../nextcloud/themes/digitaldemocratic/core/js/navbar.js | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/docker/nextcloud/themes/digitaldemocratic/core/js/navbar.js b/docker/nextcloud/themes/digitaldemocratic/core/js/navbar.js index 09e7f10..599e33f 100644 --- a/docker/nextcloud/themes/digitaldemocratic/core/js/navbar.js +++ b/docker/nextcloud/themes/digitaldemocratic/core/js/navbar.js @@ -12,4 +12,13 @@ jQuery(document).ready(() => { $('#dropdownMenuApps').toggle() }) }) + $(window).click( (event) => { + if ( + !$(event.target).parents( + '#dropdownMenuAppsButton, #dropdownMenuApps' + ).length + ) { + $('#dropdownMenuApps').hide() + } + }) })