From 4812fc9829e72f439c2ed9c836d1fa7ca716dbc3 Mon Sep 17 00:00:00 2001
From: 3wc <3wc.git@doesthisthing.work>
Date: Wed, 17 Feb 2021 18:21:51 +0200
Subject: [PATCH] Tweak DB initialisation

Fixes #21
---
 .env.sample        |  4 ++--
 abra.sh            |  2 +-
 entrypoint.sh.tmpl | 24 +++++++++++-------------
 3 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/.env.sample b/.env.sample
index e28aa04..2f28e89 100644
--- a/.env.sample
+++ b/.env.sample
@@ -1,7 +1,7 @@
 TYPE=mediawiki
 
-DOMAIN=wiki.example.com
-## Domain aliases
+DOMAIN=mediawiki.example.com
+
 #EXTRA_DOMAINS=', `www.wiki.example.com`'
 LETS_ENCRYPT_ENV=production
 
diff --git a/abra.sh b/abra.sh
index 29f70fd..d4fe131 100644
--- a/abra.sh
+++ b/abra.sh
@@ -1,6 +1,6 @@
 export LOCAL_SETTINGS_CONF_VERSION=v1
 export HTACCESS_CONF_VERSION=v1
-export ENTRYPOINT_CONF_VERSION=v1
+export ENTRYPOINT_CONF_VERSION=v2
 export COMPOSER_LOCAL_CONF_VERSION=v1
 export PHP_INI_VERSION=v1
 
diff --git a/entrypoint.sh.tmpl b/entrypoint.sh.tmpl
index 00be22d..a8fa6ad 100755
--- a/entrypoint.sh.tmpl
+++ b/entrypoint.sh.tmpl
@@ -5,22 +5,18 @@ set -eu -o pipefail
 init_composer() {
 	set -eu
 
-	if [ -n "${OPENID_ENABLED-}" ]; then
-		if ! type composer > /dev/null 2>&1; then
-			apt update -yqq && apt install -yqq curl git unzip zip
-			curl -sS https://getcomposer.org/installer -o /tmp/composer-setup.php
-			php /tmp/composer-setup.php --install-dir=/usr/local/bin --filename=composer --version=1.10.15
-			composer -V
-		fi
+	if ! type composer > /dev/null 2>&1; then
+		apt update -yqq && apt install -yqq curl git unzip zip
+		curl -sS https://getcomposer.org/installer -o /tmp/composer-setup.php
+		php /tmp/composer-setup.php --install-dir=/usr/local/bin --filename=composer --version=1.10.15
+		composer -V
 	fi
 }
 
 composer_install() {
 	set -eu
 
-	if [ -n "${OPENID_ENABLED-}" ]; then
-		cd /var/www/html/ && composer update && composer install
-	fi
+	cd /var/www/html/ && composer update && composer install
 }
 
 init_db() {
@@ -39,8 +35,10 @@ init_db() {
 	TABLE_COUNT=$(mysql -u "${DB_USER}" --password="$PASSWORD" -h "${DB_HOST}" "${DB_NAME}" -e "SELECT count(*) AS TOTAL FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA = 'mediawiki';" -N -B)
 
 	if [[ "${TABLE_COUNT}" == "0" ]]; then
-		php /var/www/html/maintenance/sql.php < /var/www/html/maintenance/tables.sql
-		php /var/www/html/maintenance/sql.php < /var/www/html/maintenance/interwiki.sql
+		php /var/www/html/maintenance/generateSchemaSql.php
+		php /var/www/html/maintenance/sql.php /var/www/html/maintenance/tables-generated.sql
+		php /var/www/html/maintenance/sql.php /var/www/html/maintenance/tables.sql
+		php /var/www/html/maintenance/sql.php /var/www/html/maintenance/interwiki.sql
 		# FIXME run createAndPromote.php with $ADMIN_USERNAME
 	else
 		php /var/www/html/maintenance/update.php --quick
@@ -79,9 +77,9 @@ main() {
 	set -eu
 
 	init_extensions
-	init_db
 	init_composer
 	composer_install
+	init_db
 }
 
 main