diff --git a/dist-persist/wbstack/src/Settings/LocalSettings.php b/dist-persist/wbstack/src/Settings/LocalSettings.php index 149a8fed0..62be22f0c 100644 --- a/dist-persist/wbstack/src/Settings/LocalSettings.php +++ b/dist-persist/wbstack/src/Settings/LocalSettings.php @@ -24,7 +24,7 @@ require_once __DIR__ . '/Localization.php'; // Define some conditions to switch behaviour on -$wwDomainSaysLocal = isset($_SERVER['SERVER_NAME']) && preg_match("/(\w\.localhost)/", $_SERVER['SERVER_NAME']) === 1; +$wwDomainSaysLocal = isset($_SERVER['SERVER_NAME']) && preg_match("/\w\.(localhost|wbaas\.dev)/", $_SERVER['SERVER_NAME']) === 1; $wwDomainIsMaintenance = $wikiInfo->requestDomain === 'maintenance'; $wwIsPhpUnit = isset( $maintClass ) && $maintClass === 'PHPUnitMaintClass'; $wwIsLocalisationRebuild = basename( $_SERVER['SCRIPT_NAME'] ) === 'rebuildLocalisationCache.php'; @@ -504,6 +504,16 @@ function onSkinTemplateNavigationUniversal( SkinTemplate $skin, array &$links ) 'dnsbl.dronebl.org.', ]; +if ($wwDomainSaysLocal) { + $wgProxyWhitelist = []; + + for ($a=0; $a<255; $a++) { + for ($b=0; $b<255; $b++) { + $wgProxyWhitelist[] = "10.244.$a.$b"; + } + } +} + # ConfirmEdit # QuestyCaptcha diff --git a/dist/wbstack/src/Settings/LocalSettings.php b/dist/wbstack/src/Settings/LocalSettings.php index 149a8fed0..62be22f0c 100644 --- a/dist/wbstack/src/Settings/LocalSettings.php +++ b/dist/wbstack/src/Settings/LocalSettings.php @@ -24,7 +24,7 @@ require_once __DIR__ . '/Localization.php'; // Define some conditions to switch behaviour on -$wwDomainSaysLocal = isset($_SERVER['SERVER_NAME']) && preg_match("/(\w\.localhost)/", $_SERVER['SERVER_NAME']) === 1; +$wwDomainSaysLocal = isset($_SERVER['SERVER_NAME']) && preg_match("/\w\.(localhost|wbaas\.dev)/", $_SERVER['SERVER_NAME']) === 1; $wwDomainIsMaintenance = $wikiInfo->requestDomain === 'maintenance'; $wwIsPhpUnit = isset( $maintClass ) && $maintClass === 'PHPUnitMaintClass'; $wwIsLocalisationRebuild = basename( $_SERVER['SCRIPT_NAME'] ) === 'rebuildLocalisationCache.php'; @@ -504,6 +504,16 @@ function onSkinTemplateNavigationUniversal( SkinTemplate $skin, array &$links ) 'dnsbl.dronebl.org.', ]; +if ($wwDomainSaysLocal) { + $wgProxyWhitelist = []; + + for ($a=0; $a<255; $a++) { + for ($b=0; $b<255; $b++) { + $wgProxyWhitelist[] = "10.244.$a.$b"; + } + } +} + # ConfirmEdit # QuestyCaptcha