From 1932783d177ab8521e4f55b83d334604c8c19c88 Mon Sep 17 00:00:00 2001 From: sodema Date: Thu, 1 Dec 2022 08:44:09 +0100 Subject: [PATCH] changed install_wiki.sh, modified the way additional configs get loaded to make room for further customization --- build/Dockerfile | 2 +- build/include/install_wiki.sh | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/build/Dockerfile b/build/Dockerfile index 19df3ee..3fe187b 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -16,7 +16,7 @@ RUN git clone --branch REL1_35 https://github.com/wikimedia/mediawiki-extensions RUN git clone --branch REL1_35 https://github.com/wikimedia/mediawiki-extensions-LDAPUserInfo.git /var/www/html/extensions/LDAPUserInfo RUN git clone --branch REL1_35 https://github.com/wikimedia/mediawiki-extensions-PluggableAuth.git /var/www/html/extensions/PluggableAuth RUN git clone --branch REL1_35 https://github.com/wikimedia/mediawiki-extensions-Auth_remoteuser.git /var/www/html/extensions/Auth_remoteuser -RUN git clone --branch REL1_35 https://github.com/wikimedia/mediawiki-extensions-TemplateData.git /var/www/html/extensions/TemplateData + diff --git a/build/include/install_wiki.sh b/build/include/install_wiki.sh index ddb5b78..71077e5 100644 --- a/build/include/install_wiki.sh +++ b/build/include/install_wiki.sh @@ -3,14 +3,17 @@ php maintenance/install.php --dbname=$DB_NAME --dbserver=$DB_HOST --installdbuser=$DB_USER --installdbpass=$DB_PASS --dbuser=$DB_USER --dbpass=$DB_PASS --server=$WIKI_URL --scriptpath=$WIKI_PATH --lang=$WIKI_LANG --pass=$WIKI_ADMIN_PASS $WIKI_NAME $WIKI_ADMIN - for i in /opt/mediawiki/settings.d/* do - echo 'require_once "$IP/$(basename $i)";' >> /var/www/html/LocalSettings.php + ext=$(basename $i) + base='require_once "$IP/settings.d/' + end='";' + echo $base$ext$end >> /var/www/html/LocalSettings.php cp $i /var/www/html/settings.d/ - echo "$(basename $i) activated" + echo "$ext activated" done + sed -i "s/LDAP_DOMAINNAME/$LDAP_DOMAINNAME/g" /var/www/html/settings.d/LocalSettings.LDAP.php sed -i "s/LDAP_SERVER_NAME/$LDAP_SERVER_NAME/g" /var/www/html/settings.d/LocalSettings.LDAP.php sed -i "s/LDAP_SERVER_PORT/$LDAP_SERVER_PORT/g" /var/www/html/settings.d/LocalSettings.LDAP.php