From a390cff3edc08feab0660776888856a0461a95d6 Mon Sep 17 00:00:00 2001
From: dena <dena@wikimedia.de>
Date: Wed, 8 Jan 2025 13:17:16 +0100
Subject: [PATCH 1/2] adjust local http switch only for docker-compose

---
 dist-persist/wbstack/src/Settings/LocalSettings.php | 3 ++-
 docker-compose.yml                                  | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/dist-persist/wbstack/src/Settings/LocalSettings.php b/dist-persist/wbstack/src/Settings/LocalSettings.php
index 5b03642b1..2cb2fbaee 100644
--- a/dist-persist/wbstack/src/Settings/LocalSettings.php
+++ b/dist-persist/wbstack/src/Settings/LocalSettings.php
@@ -29,6 +29,7 @@
 $wwIsPhpUnit = isset( $maintClass ) && $maintClass === 'PHPUnitMaintClass';
 $wwIsLocalisationRebuild = basename( $_SERVER['SCRIPT_NAME'] ) === 'rebuildLocalisationCache.php';
 $wwLocalization = new Localization( $wgExtensionMessagesFiles, $wgMessagesDirs, $wgBaseDirectory, $wwIsLocalisationRebuild );
+$wwDockerCompose = getenv('WBSTACK_DOCKER_COMPOSE') === 'yes';
 
 $wwUseMailgunExtension = true; // default for wbstack
 if (getenv('MW_MAILGUN_DISABLED') === 'yes') {
@@ -93,7 +94,7 @@
     ];
 }
 
-if ( $wwDomainSaysLocal ) {
+if ( $wwDockerCompose ) {
     $wgServer = "http://" . $wikiInfo->domain;
 } else {
     $wgServer = "https://" . $wikiInfo->domain;
diff --git a/docker-compose.yml b/docker-compose.yml
index ba72c6997..ce5fcb28e 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -21,6 +21,7 @@ services:
     environment:
 
       - WBSTACK_LOAD_MW_INTERNAL=yes # THIS is normally hidden
+      - WBSTACK_DOCKER_COMPOSE=yes
       - PLATFORM_API_BACKEND_HOST=api.svc
 
       - MW_DB_SERVER_MASTER=mysql.svc:3306

From aa903d84e413ecac5e51f313136a09877ad16ec6 Mon Sep 17 00:00:00 2001
From: dena <dena@wikimedia.de>
Date: Wed, 8 Jan 2025 13:22:25 +0100
Subject: [PATCH 2/2] run sync

---
 dist/wbstack/src/Settings/LocalSettings.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dist/wbstack/src/Settings/LocalSettings.php b/dist/wbstack/src/Settings/LocalSettings.php
index 5b03642b1..2cb2fbaee 100644
--- a/dist/wbstack/src/Settings/LocalSettings.php
+++ b/dist/wbstack/src/Settings/LocalSettings.php
@@ -29,6 +29,7 @@
 $wwIsPhpUnit = isset( $maintClass ) && $maintClass === 'PHPUnitMaintClass';
 $wwIsLocalisationRebuild = basename( $_SERVER['SCRIPT_NAME'] ) === 'rebuildLocalisationCache.php';
 $wwLocalization = new Localization( $wgExtensionMessagesFiles, $wgMessagesDirs, $wgBaseDirectory, $wwIsLocalisationRebuild );
+$wwDockerCompose = getenv('WBSTACK_DOCKER_COMPOSE') === 'yes';
 
 $wwUseMailgunExtension = true; // default for wbstack
 if (getenv('MW_MAILGUN_DISABLED') === 'yes') {
@@ -93,7 +94,7 @@
     ];
 }
 
-if ( $wwDomainSaysLocal ) {
+if ( $wwDockerCompose ) {
     $wgServer = "http://" . $wikiInfo->domain;
 } else {
     $wgServer = "https://" . $wikiInfo->domain;