restructured settings files, added settings.d directory for easier future expands, changed Dockerfile
This commit is contained in:
parent
b0fb2698f1
commit
2b92cdc81b
@ -16,8 +16,8 @@ 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-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-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-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
|
||||||
|
|
||||||
RUN if test -f /var/www/html/LocalSettings.php; then echo 'require_once "$IP/LocalSettings.LDAP.php";' >> /var/www/html/LocalSettings.php;fi
|
|
||||||
|
|
||||||
|
|
||||||
RUN set -eux; \
|
RUN set -eux; \
|
||||||
@ -45,6 +45,9 @@ RUN set -eux; \
|
|||||||
mkdir -p /opt/mediawiki; \
|
mkdir -p /opt/mediawiki; \
|
||||||
chown -R www-data:www-data /log/mediawiki
|
chown -R www-data:www-data /log/mediawiki
|
||||||
|
|
||||||
ADD include/LocalSettings.LDAP.php /opt/mediawiki
|
RUN set -eux; \
|
||||||
|
mkdir -p /var/www/html/settings.d;
|
||||||
|
|
||||||
|
ADD include/settings.d /opt/mediawiki/settings.d/
|
||||||
ADD include/install_wiki.sh /opt/mediawiki/
|
ADD include/install_wiki.sh /opt/mediawiki/
|
||||||
RUN chmod +x /opt/mediawiki/install_wiki.sh
|
RUN chmod +x /opt/mediawiki/install_wiki.sh
|
||||||
|
@ -2,17 +2,23 @@
|
|||||||
|
|
||||||
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
|
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
|
||||||
|
|
||||||
if test -f /var/www/html/LocalSettings.php; then echo 'require_once "$IP/LocalSettings.LDAP.php";' >> /var/www/html/LocalSettings.php;fi
|
|
||||||
|
|
||||||
cp /opt/mediawiki/LocalSettings.LDAP.php /var/www/html/LocalSettings.LDAP.php
|
|
||||||
sed -i "s/LDAP_DOMAINNAME/$LDAP_DOMAINNAME/g" /var/www/html/LocalSettings.LDAP.php
|
for i in /opt/mediawiki/settings.d/*
|
||||||
sed -i "s/LDAP_SERVER_NAME/$LDAP_SERVER_NAME/g" /var/www/html/LocalSettings.LDAP.php
|
do
|
||||||
sed -i "s/LDAP_SERVER_PORT/$LDAP_SERVER_PORT/g" /var/www/html/LocalSettings.LDAP.php
|
echo 'require_once "$IP/$(basename $i)";' >> /var/www/html/LocalSettings.php
|
||||||
sed -i "s/LDAP_ENCTYPE/$LDAP_ENCTYPE/g" /var/www/html/LocalSettings.LDAP.php
|
cp $i /var/www/html/settings.d/
|
||||||
sed -i "s/LDAP_BIND_USER/$LDAP_BIND_USER/g" /var/www/html/LocalSettings.LDAP.php
|
echo "$(basename $i) activated"
|
||||||
sed -i "s/LDAP_BIND_PASS/$LDAP_BIND_PASS/g" /var/www/html/LocalSettings.LDAP.php
|
done
|
||||||
sed -i "s/LDAP_BASE/$LDAP_BASE/g" /var/www/html/LocalSettings.LDAP.php
|
|
||||||
sed -i "s/LDAP_USER_ATTR/$LDAP_USER_ATTR/g" /var/www/html/LocalSettings.LDAP.php
|
sed -i "s/LDAP_DOMAINNAME/$LDAP_DOMAINNAME/g" /var/www/html/settings.d/LocalSettings.LDAP.php
|
||||||
sed -i "s/WIKI_LANG/$WIKI_LANG/g" /var/www/html/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
|
||||||
|
sed -i "s/LDAP_ENCTYPE/$LDAP_ENCTYPE/g" /var/www/html/settings.d/LocalSettings.LDAP.php
|
||||||
|
sed -i "s/LDAP_BIND_USER/$LDAP_BIND_USER/g" /var/www/html/settings.d/LocalSettings.LDAP.php
|
||||||
|
sed -i "s/LDAP_BIND_PASS/$LDAP_BIND_PASS/g" /var/www/html/settings.d/LocalSettings.LDAP.php
|
||||||
|
sed -i "s/LDAP_BASE/$LDAP_BASE/g" /var/www/html/settings.d/LocalSettings.LDAP.php
|
||||||
|
sed -i "s/LDAP_USER_ATTR/$LDAP_USER_ATTR/g" /var/www/html/settings.d/LocalSettings.LDAP.php
|
||||||
|
sed -i "s/WIKI_LANG/$WIKI_LANG/g" /var/www/html/settings.d/LocalSettings.LDAP.php
|
||||||
|
|
||||||
php maintenance/update.php --quick
|
php maintenance/update.php --quick
|
||||||
|
Loading…
Reference in New Issue
Block a user