jenkins-bot has submitted this change and it was merged.
Change subject: twemproxy isn't mediawiki
......................................................................
twemproxy isn't mediawiki
Config always looks for datacenter suffix
[ -f "/usr/local/apache/common/wmf-config/twemproxy-$(cat
/etc/wikimedia-site)".yaml ] || { stop; exit 0; }
Move version back to twemproxy-eqiad.yaml
Change-Id: I6f1f3f8af5b97aa0e537fbae308ce27b28071894
---
A docroot/noc/conf/twemproxy-eqiad.yaml.txt
D docroot/noc/conf/twemproxy.yaml.txt
M docroot/noc/createTxtFileSymlinks.sh
R wmf-config/twemproxy-eqiad.yaml
4 files changed, 2 insertions(+), 2 deletions(-)
Approvals:
Reedy: Looks good to me, approved
jenkins-bot: Verified
diff --git a/docroot/noc/conf/twemproxy-eqiad.yaml.txt
b/docroot/noc/conf/twemproxy-eqiad.yaml.txt
new file mode 120000
index 0000000..d24dff9
--- /dev/null
+++ b/docroot/noc/conf/twemproxy-eqiad.yaml.txt
@@ -0,0 +1 @@
+../../../wmf-config/twemproxy-eqiad.yaml
\ No newline at end of file
diff --git a/docroot/noc/conf/twemproxy.yaml.txt
b/docroot/noc/conf/twemproxy.yaml.txt
deleted file mode 120000
index cb5c28a..0000000
--- a/docroot/noc/conf/twemproxy.yaml.txt
+++ /dev/null
@@ -1 +0,0 @@
-../../../wmf-config/twemproxy.yaml
\ No newline at end of file
diff --git a/docroot/noc/createTxtFileSymlinks.sh
b/docroot/noc/createTxtFileSymlinks.sh
index 99bfc97..61dd81f 100755
--- a/docroot/noc/createTxtFileSymlinks.sh
+++ b/docroot/noc/createTxtFileSymlinks.sh
@@ -40,7 +40,7 @@
wmf-config/squid-labs.php
wmf-config/session.php
wmf-config/session-labs.php
- wmf-config/twemproxy.yaml
+ wmf-config/twemproxy-eqiad.yaml
wmf-config/Wikibase.php
)
diff --git a/wmf-config/twemproxy.yaml b/wmf-config/twemproxy-eqiad.yaml
similarity index 100%
rename from wmf-config/twemproxy.yaml
rename to wmf-config/twemproxy-eqiad.yaml
--
To view, visit https://gerrit.wikimedia.org/r/118296
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6f1f3f8af5b97aa0e537fbae308ce27b28071894
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Reedy <re...@wikimedia.org>
Gerrit-Reviewer: Reedy <re...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
