Skip to content

Commit 8bf8f23

Browse files
committed
Remove settings scattered around
1 parent 866b5c0 commit 8bf8f23

File tree

4 files changed

+1
-39
lines changed

4 files changed

+1
-39
lines changed

Dockerfile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -205,11 +205,9 @@ RUN ln -s /var/www/html/ /var/www/html/w
205205
ENV MW_SITE_NAME=wikibase-docker\
206206
MW_SITE_LANG=en
207207

208-
COPY LocalSettings.php.wikibase-bundle.template /LocalSettings.php.wikibase-bundle.template
209208
COPY LocalSettings.php.mardi.template /LocalSettings.php.mardi.template
210209
COPY extra-install.sh /
211210
COPY extra-entrypoint-run-first.sh /
212-
RUN cat /LocalSettings.php.wikibase-bundle.template >> /LocalSettings.php.template && rm /LocalSettings.php.wikibase-bundle.template
213211
RUN cat /LocalSettings.php.mardi.template >> /LocalSettings.php.template && rm /LocalSettings.php.mardi.template
214212
COPY oauth.ini /templates/oauth.ini
215213
RUN mkdir /shared

LocalSettings.php.mardi.template

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
2-
# Pingback
3-
${DOLLAR}wgWBRepoSettings['wikibasePingback'] = false;
4-
51
# Load additional settings from LocalSettings.d
62
/*
73
To make loading order deterministic and to identify errors when loading the script, this script orders the include of settings.
@@ -29,3 +25,4 @@ foreach (${DOLLAR}extensionsToLoad as ${DOLLAR}filename)
2925
{
3026
include ${DOLLAR}filename;
3127
}
28+

LocalSettings.php.template

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -46,14 +46,6 @@ ${DOLLAR}wgSecretKey = "${MW_WG_SECRET_KEY}";
4646
# Set this to 1 year to avoid any changes being removed from the RC table over a shorter period of time.
4747
${DOLLAR}wgRCMaxAge = 365 * 24 * 3600;
4848

49-
wfLoadSkin( 'Vector' );
50-
51-
## Wikibase
52-
wfLoadExtension( 'WikibaseRepository', "${DOLLAR}IP/extensions/Wikibase/extension-repo.json" );
53-
require_once "${DOLLAR}IP/extensions/Wikibase/repo/ExampleSettings.php";
54-
wfLoadExtension( 'WikibaseClient', "${DOLLAR}IP/extensions/Wikibase/extension-client.json" );
55-
require_once "${DOLLAR}IP/extensions/Wikibase/client/ExampleSettings.php";
56-
5749
# Production env
5850
${DOLLAR}productionComparator = 'prod';
5951
if (${DOLLAR}productionComparator == '${DEPLOYMENT_ENV}') {

LocalSettings.php.wikibase-bundle.template

Lines changed: 0 additions & 25 deletions
This file was deleted.

0 commit comments

Comments
 (0)