Merge pull request #387 from MaRDI4NFDI/fix_gui_statement_links

Fix GUI statement links
MaRDI4NFDI · Oct 4, 2023 · 63145cc · 63145cc
2 parents 07359aa + a8fc624
commit 63145cc
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -14,7 +14,9 @@ x-common-variables: &wikibase_variables
   DB_NAME: ${DB_NAME:-my_wiki}
   TLD: ${TLD:-de}
   DEPLOYMENT_ENV: ${DEPLOYMENT_ENV:-local}
-  WIKIBASE_HOST: ${WIKIBASE_HOST:-portal.mardi4nfdi.${TLD}}
+  WIKIBASE_SCHEME: ${WIKIBASE_SCHEME:-https}
+  WIKIBASE_HOST: ${WIKIBASE_HOST:-localhost}
+  WIKIBASE_PORT: ${WIKIBASE_PORT:-80}
   QS_PUBLIC_SCHEME_HOST_AND_PORT: https://quickstatements.portal.mardi4nfdi.${TLD}
   TRAEFIK_PW: ${TRAEFIK_PW}
 x-extra-variables: &wikibase_extra_variables
@@ -53,7 +55,7 @@ services:
     environment:
       <<: [ *wikibase_variables, *wikibase_extra_variables]
       WIKIBASE_PINGBACK:
-      MW_WG___UPLOADS:
+      MW_WG_ENABLE_UPLOADS:
       MATOMO_TOKEN: ${MATOMO_TOKEN}
       GOOGLE_OPENID_SECRET: ${GOOGLE_OPENID_SECRET}
     labels:

diff --git a/mediawiki/LocalSettings.d/Wikibase.php b/mediawiki/LocalSettings.d/Wikibase.php
@@ -4,17 +4,25 @@
 wfLoadExtension( 'WikibaseClient', "$IP/extensions/Wikibase/extension-client.json" );
 require_once "$IP/extensions/Wikibase/client/ExampleSettings.php";
 
+$wikibaseHost = getenv('WIKIBASE_HOST');
+
+if ($wikibaseHost === 'localhost') {
+    $portalHost = getenv('WIKIBASE_SCHEME') . '://localhost:' . getenv('WIKIBASE_PORT');
+} else {
+    $portalHost = getenv('WIKIBASE_SCHEME') . $wikibaseHost;
+}
+
 # enable linking between wikibase and content pages
 $wgWBRepoSettings['siteLinkGroups'] = [ 'mathematics' ];
 $wgWBClientSettings['siteLinkGroups'] = [ 'mathematics' ];
 $wgWBClientSettings['siteGlobalID'] = 'mardi';
-$wgWBClientSettings['repoUrl'] = 'https://portal.mardi4nfdi.de';
+$wgWBClientSettings['repoUrl'] = $portalHost;
 $wgWBClientSettings['repoScriptPath'] = '/w';
 $wgWBClientSettings['repoArticlePath'] = '/wiki/$1';
 $wgWBClientSettings['entitySources'] = [
 		'mardi_source' => [
 				'repoDatabase' => 'my_wiki',
-				'baseUri' => 'https://portal.mardi4nfdi.de/entity',
+				'baseUri' => $portalHost . '/entity',
 				'entityNamespaces' => [
 						'item' => 120,
 						'property' => 122,