From ede83e1514fdb1a67bb82ef6da5c96a59425d65f Mon Sep 17 00:00:00 2001
From: Evilham <contact@evilham.com>
Date: Thu, 22 Sep 2022 15:38:09 +0200
Subject: [PATCH] [moodle] Reduce unnecessary diff against upstream

---
 dd-apps/docker/moodle/02-configure-moodle.sh | 23 +++++++++++++++++---
 dd-apps/docker/moodle/is_moodle_ready.sh     |  1 +
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/dd-apps/docker/moodle/02-configure-moodle.sh b/dd-apps/docker/moodle/02-configure-moodle.sh
index 0b0cbac..5e670f1 100755
--- a/dd-apps/docker/moodle/02-configure-moodle.sh
+++ b/dd-apps/docker/moodle/02-configure-moodle.sh
@@ -1,6 +1,10 @@
 #!/bin/sh
+#
+# Moodle configuration script
+#
 set -eo pipefail
 
+# Check that the database is available
 echo "Waiting for $database:$port to be ready"
 while ! nc -w 1 $DB_HOST $DB_PORT; do
     # Show some progress
@@ -8,10 +12,13 @@ while ! nc -w 1 $DB_HOST $DB_PORT; do
     sleep 1;
 done
 echo "$database is ready"
+# Give it another 3 seconds.
 sleep 3;
 
-if [ ! -f /var/www/html/config.php ]; then
 
+# Check if the config.php file exists
+if [ ! -f /var/www/html/config.php ]; then
+    # TODO: Why is this image even using the src/rootfs dir? Just for cron?
     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
@@ -43,6 +50,7 @@ if [ ! -f /var/www/html/config.php ]; then
 
 fi
 
+# Check if the database is already installed
 if php -d max_input_vars=$max_input_vars /var/www/html/admin/cli/isinstalled.php ; then
 
     echo "Installing database..."
@@ -56,8 +64,13 @@ if php -d max_input_vars=$max_input_vars /var/www/html/admin/cli/isinstalled.php
         --agree-license
 
     echo "Configuring settings..."
+    # php -d max_input_vars=$max_input_vars /var/www/html/admin/cli/cfg.php --name=slasharguments --set=0
     php -d max_input_vars=$max_input_vars /var/www/html/admin/cli/cfg.php --name=pathtophp --set=/usr/bin/php
     php -d max_input_vars=$max_input_vars /var/www/html/admin/cli/cfg.php --name=pathtodu --set=/usr/bin/du
+    # php -d max_input_vars=$max_input_vars /var/www/html/admin/cli/cfg.php --name=aspellpath --set=/usr/bin/aspell
+    # php -d max_input_vars=$max_input_vars /var/www/html/admin/cli/cfg.php --name=pathtodot --set=/usr/bin/dot
+    # php -d max_input_vars=$max_input_vars /var/www/html/admin/cli/cfg.php --name=pathtogs --set=/usr/bin/gs
+    # php -d max_input_vars=$max_input_vars /var/www/html/admin/cli/cfg.php --name=pathtopython --set=/usr/bin/python3
     php -d max_input_vars=$max_input_vars /var/www/html/admin/cli/cfg.php --name=enableblogs --set=0
 
 
@@ -67,10 +80,14 @@ if php -d max_input_vars=$max_input_vars /var/www/html/admin/cli/isinstalled.php
     php -d max_input_vars=$max_input_vars /var/www/html/admin/cli/cfg.php --name=smtpsecure --set=$SMTP_PROTOCOL
     php -d max_input_vars=$max_input_vars /var/www/html/admin/cli/cfg.php --name=noreplyaddress --set=$MOODLE_MAIL_NOREPLY_ADDRESS
     php -d max_input_vars=$max_input_vars /var/www/html/admin/cli/cfg.php --name=emailsubjectprefix --set=$MOODLE_MAIL_PREFIX
+
+elif false; then
+    echo "Upgrading moodle..."
+    php -d max_input_vars=$max_input_vars /var/www/html/admin/cli/maintenance.php --enable
+    php -d max_input_vars=$max_input_vars /var/www/html/admin/cli/upgrade.php --non-interactive --allow-unstable
+    php -d max_input_vars=$max_input_vars /var/www/html/admin/cli/maintenance.php --disable
 fi
 
-chown -R nobody:root /var/www/html
-
 
 
 
diff --git a/dd-apps/docker/moodle/is_moodle_ready.sh b/dd-apps/docker/moodle/is_moodle_ready.sh
index c184a96..de4f0d1 100755
--- a/dd-apps/docker/moodle/is_moodle_ready.sh
+++ b/dd-apps/docker/moodle/is_moodle_ready.sh
@@ -2,6 +2,7 @@
 
 # Check exclusively whether moodle has been installed and the web service is up
 if test -f /var/www/html/admin/cli/isinstalled.php && \
+	test -f /var/www/html/config.php && \
 	! php -d max_input_vars=$max_input_vars \
 		/var/www/html/admin/cli/isinstalled.php 2>&1 > /dev/null && \
 	curl -s --output /dev/null localhost:8080; then