Ori.livneh has submitted this change and it was merged.
Change subject: Replace references to /etc/apache2/wmf symlink with its link
target
......................................................................
Replace references to /etc/apache2/wmf symlink with its link target
Mirror the changes from Ia63c3f1
Change-Id: Ib0f34f5d14e751b9eecf4f06182dff173810c618
---
M all.conf
M loginwiki.conf
M main.conf
3 files changed, 12 insertions(+), 12 deletions(-)
Approvals:
Ori.livneh: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/all.conf b/all.conf
index d27ca7d..ffb73c8 100644
--- a/all.conf
+++ b/all.conf
@@ -3,34 +3,34 @@
# Note, the order is important
# In particular, this must be the first virtual subdomain:
-Include /etc/apache2/wmf/nonexistent.conf
+Include /usr/local/apache/conf/nonexistent.conf
# www.wikipedia.org
-Include /etc/apache2/wmf/www.wikipedia.conf
+Include /usr/local/apache/conf/www.wikipedia.conf
# Redirects also must override *.wikipedia.org
-Include /etc/apache2/wmf/redirects.conf
+Include /usr/local/apache/conf/redirects.conf
# Various domains including all the multi-subdomain projects
# Also some site-wide settings
-Include /etc/apache2/wmf/main.conf
+Include /usr/local/apache/conf/main.conf
# A few single-subdomain projects
-Include /etc/apache2/wmf/remnant.conf
+Include /usr/local/apache/conf/remnant.conf
# secure.wikimedia.org unencrypted backend
-Include /etc/apache2/wmf/wikimedia-ssl-backend.conf
+Include /usr/local/apache/conf/wikimedia-ssl-backend.conf
# *.wikimedia.org
-Include /etc/apache2/wmf/wikimedia.conf
+Include /usr/local/apache/conf/wikimedia.conf
# wikimediafoundation.org and its aliases
-Include /etc/apache2/wmf/foundation.conf
+Include /usr/local/apache/conf/foundation.conf
# A simple redirect to en, perhaps this once contained the load balancing
redirect
-Include /etc/apache2/wmf/en2.conf
+Include /usr/local/apache/conf/en2.conf
# A couple of redirects for www.XXX.wikipedia.org
-Include /etc/apache2/wmf/postrewrites.conf
+Include /usr/local/apache/conf/postrewrites.conf
# vim: syn=apache sts=4 sw=4 autoindent
diff --git a/loginwiki.conf b/loginwiki.conf
index ea85d08..ebfcb70 100644
--- a/loginwiki.conf
+++ b/loginwiki.conf
@@ -32,7 +32,7 @@
ServerName login.wikimedia.beta-hhvm.wmflabs.org
DocumentRoot "/usr/local/apache/common/docroot/login"
- Include /etc/apache2/wmf/hhvm.conf
+ Include /usr/local/apache/conf/hhvm.conf
Alias /wiki /usr/local/apache/common/docroot/wikipedia.org/w/index.php
<Directory "/usr/local/apache/common/docroot/login/w">
diff --git a/main.conf b/main.conf
index eafef99..64af213 100644
--- a/main.conf
+++ b/main.conf
@@ -28,7 +28,7 @@
ServerAlias *.wikimedia.beta-hhvm.wmflabs.org
DocumentRoot "/usr/local/apache/common/docroot/wikipedia.org"
- Include /etc/apache2/wmf/hhvm.conf
+ Include /usr/local/apache/conf/hhvm.conf
Alias /wiki /usr/local/apache/common/docroot/wikipedia.org/w/index.php
<Directory "/usr/local/apache/common/docroot/wikipedia.org/w">
--
To view, visit https://gerrit.wikimedia.org/r/143064
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib0f34f5d14e751b9eecf4f06182dff173810c618
Gerrit-PatchSet: 1
Gerrit-Project: operations/apache-config
Gerrit-Branch: betacluster
Gerrit-Owner: BryanDavis <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: Ori.livneh <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
