Merge branch 'master' into update-h5p-packages-v2

docker-compose.yml

@@ -6,6 +6,7 @@ volumes:
   edlib-resources_nodemodules:
   elasticsearch:
   maven_cache:
+  moodle_data:
   mysql:
   npm_cache:
   npm-components-storybook_nodemodules:
@@ -45,12 +46,12 @@ services:
       - 5432:5432
 
   mysql:
-    image: mariadb:10.5.12
+    image: mariadb:11
     environment:
-      MYSQL_ROOT_PASSWORD: mysqlpassword
-      MYSQL_INITDB_SKIP_TZINFO: 1
+      MARIADB_ROOT_PASSWORD: mysqlpassword
+      MARIADB_INITDB_SKIP_TZINFO: 1
     healthcheck:
-      test: [CMD, mysql, -uroot, -pmysqlpassword, "-eSELECT 1"]
+      test: [CMD, mariadb, -uroot, -pmysqlpassword, "-eSELECT 1"]
     command: --init-file /data/application/init.sql
     volumes:
       - ./localSetup/projects/mysql/init.sql:/data/application/init.sql
@@ -375,6 +376,12 @@ services:
       redis:
         condition: service_healthy
 
+  moodle:
+    build: ./localSetup/projects/moodle
+    volumes:
+      - moodle_data:/var/www/moodledata
+      - ./localSetup/projects/moodle/php.ini:/usr/local/etc/php/conf.d/zz-moodle.ini:ro
+
   www:
     build:
       context: ./sourcecode/www

localSetup/projects/moodle/Dockerfile

@@ -0,0 +1,29 @@
+FROM php:8.1-apache
+
+RUN set -eux; \
+    export DEBIAN_FRONTEND=noninteractive; \
+    apt-get update; \
+    apt-get install -y git; \
+    rm -rf /var/lib/apt/lists/*;
+
+COPY --from=mlocati/php-extension-installer /usr/bin/install-php-extensions /usr/local/bin/
+
+RUN set -eux; \
+    install-php-extensions \
+        gd \
+        intl \
+        mysqli \
+        opcache \
+        zip \
+    ; \
+    cp "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini"; \
+    a2enmod remoteip rewrite;
+
+VOLUME /var/www/html
+RUN git clone -b "MOODLE_402_STABLE" https://github.com/moodle/moodle.git /var/www/html
+
+COPY httpd.conf /etc/apache2/conf-enabled/
+
+COPY docker-entrypoint.sh /docker-entrypoint.sh
+ENTRYPOINT ["/docker-entrypoint.sh"]
+CMD ["apachectl", "-D", "FOREGROUND"]

localSetup/projects/moodle/docker-entrypoint.sh

@@ -0,0 +1,6 @@
+#!/bin/sh
+set -e
+
+chown www-data:www-data /var/www/moodledata
+
+exec "$@"

localSetup/projects/moodle/httpd.conf

@@ -0,0 +1,2 @@
+SetEnvIf X-Forwarded-Proto "https" HTTPS=on
+

localSetup/projects/moodle/php.ini

@@ -0,0 +1 @@
+max_input_vars = 5000

localSetup/projects/mysql/init.sql

@@ -5,3 +5,4 @@ CREATE DATABASE IF NOT EXISTS edlibresources;
 CREATE DATABASE IF NOT EXISTS edlibid;
 CREATE DATABASE IF NOT EXISTS edlibcontentauthor;
 CREATE DATABASE IF NOT EXISTS edlibcommon;
+CREATE DATABASE IF NOT EXISTS moodle;

localSetup/projects/nginx/templates/moodle.conf.template

@@ -0,0 +1,22 @@
+server {
+  listen 80;
+
+  server_name moodle.${EDLIB_ROOT_DOMAIN};
+
+  return 301 https://$host$request_uri;
+}
+
+server {
+  listen 443 ssl;
+  server_name  moodle.${EDLIB_ROOT_DOMAIN};
+
+  ssl_certificate  /etc/ssl/private/cerpus.crt;
+  ssl_certificate_key  /etc/ssl/private/cerpus.key;
+
+  location / {
+    proxy_pass  http://moodle;
+    proxy_set_header  Host  $host;
+    proxy_set_header  X-Forwarded-For  $proxy_add_x_forwarded_for;
+    proxy_set_header  X-Forwarded-Proto  $scheme;
+  }
+}

scripts/update-host-file.sh

@@ -11,6 +11,7 @@ $ip\tapi.$root
 $ip\tca.$root
 $ip\tdocs.$root
 $ip\tfacade.$root
+$ip\tmoodle.$root
 $ip\tnpm.components.$root
 $ip\twww.$root
 EOM

sourcecode/apis/contentauthor/Dockerfile

@@ -52,7 +52,7 @@ WORKDIR /app
 RUN npm i -g node-gyp
 
 COPY package.json package-lock.json ./
-RUN npm i --legacy-peer-deps
+RUN npm i
 
 COPY --from=composer_deps /app/vendor/ckeditor/ckeditor vendor/ckeditor/ckeditor
 COPY --from=composer_deps /app/vendor/h5p vendor/h5p

sourcecode/apis/contentauthor/app/Libraries/H5P/Audio/NDLAAudioBrowser.php

@@ -54,7 +54,6 @@ private function buildSearchQuery($queryObject): ?array
         if (empty($queryObject)) {
             return null;
         }
-        $queryObject = json_decode($queryObject, true);
         if (empty($queryObject['query'])) {
             unset($queryObject['query']);
         }

sourcecode/apis/contentauthor/app/Libraries/H5P/Video/NDLAVideoAdapter.php

@@ -85,13 +85,12 @@ private function buildSearchQuery($queryObject)
         }
 
         $query = [];
-        $queryObject = json_decode($queryObject);
-        if (!empty($queryObject->query)) {
-            $query['query'] = sprintf('text:%s', $queryObject->query);
+        if (!empty($queryObject['query'])) {
+            $query['query'] = sprintf('text:%s', $queryObject['query']);
         }
-        if (!empty($queryObject->limit) && isset($queryObject->offset)) {
-            $query['limit'] = $queryObject->limit;
-            $query['offset'] = $queryObject->offset;
+        if (!empty($queryObject['limit']) && isset($queryObject['offset'])) {
+            $query['limit'] = $queryObject['limit'];
+            $query['offset'] = $queryObject['offset'];
         }
         return $query;
     }