Add missing imports and remove unused parameter (#434)

* Add missing imports * Remove unused variableArrayIndex parameter
CanastaWiki · Sep 2, 2024 · d40ef79 · d40ef79
1 parent ea2ce42
commit d40ef79
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/_sources/scripts/functions.sh b/_sources/scripts/functions.sh
@@ -24,7 +24,7 @@ get_mediawiki_db_var() {
             echo "Unexpected variable name passed to the get_mediawiki_db_var() function: $1"
             return
     esac
-    VALUE=$(php /getMediawikiSettings.php --variable=wgDBservers --variableArrayIndex="[0,\"$I\"]" --format=string)
+    VALUE=$(php /getMediawikiSettings.php --variable=wgDBservers --format=string)
     if [ -z "$VALUE" ]; then
         VALUE=$(get_mediawiki_variable "$1")
     fi
@@ -50,7 +50,7 @@ get_hostname_with_port() {
 get_mediawiki_cirrus_search_server() {
     server=$(get_mediawiki_variable wgCirrusSearchServers first)
     if [ -z "$server" ]; then
-        server=$(php /getMediawikiSettings.php --variable=wgCirrusSearchClusters --variableArrayIndex="[\"default\",0]" --format=string)
+        server=$(php /getMediawikiSettings.php --variable=wgCirrusSearchClusters --format=string)
     fi
     get_hostname_with_port "$server" 9200
 }

diff --git a/_sources/scripts/run-all.sh b/_sources/scripts/run-all.sh
@@ -101,6 +101,7 @@ cd "$MW_HOME" || exit
 echo "Checking for LocalSettings..."
 if [ -e "$MW_VOLUME/config/LocalSettings.php" ] || [ -e "$MW_VOLUME/config/CommonSettings.php" ]; then
   # Run auto-update
+  . /run-maintenance-scripts.sh
   run_autoupdate
   if [ -e "$MW_VOLUME/config/wikis.yaml" ]; then
     config_subdir_wikis

diff --git a/_sources/scripts/update-docker-gateway.sh b/_sources/scripts/update-docker-gateway.sh
@@ -4,6 +4,10 @@ set -x
 
 . /functions.sh
 
+get_docker_gateway () {
+  getent hosts "gateway.docker.internal" | awk '{ print $1 }'
+}
+
 # Try to fetch gateway IP from extra host
 DOCKER_GATEWAY=$(get_docker_gateway)