Dzahn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/155077
Change subject: put svn.wikimedia.org behind misc. varnish
......................................................................
put svn.wikimedia.org behind misc. varnish
- add antimony as backend for svn in misc Varnish template
(antimony is already defined as a backend in role/cache.pp)
- remove the now unused Apache SSL config from the backend
- profit, one more service that doesn't need a public IP and
doesn't have a separate Apache SSL setup
needs a DNS change to go with it
Change-Id: I1d08b67621bbcac8a08110b8ddd96e4451feee91
---
M modules/subversion/templates/apache/svn.wikimedia.org.erb
M templates/varnish/misc.inc.vcl.erb
2 files changed, 2 insertions(+), 51 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/77/155077/1
diff --git a/modules/subversion/templates/apache/svn.wikimedia.org.erb
b/modules/subversion/templates/apache/svn.wikimedia.org.erb
index 90795e5..f0c85be 100644
--- a/modules/subversion/templates/apache/svn.wikimedia.org.erb
+++ b/modules/subversion/templates/apache/svn.wikimedia.org.erb
@@ -44,54 +44,3 @@
Redirect permanent /doc
http://doc.wikimedia.org/mediawiki-core/master/php/html
</VirtualHost>
-NameVirtualHost *:443
-<VirtualHost *:443>
- ServerName svn.wikimedia.org
- DocumentRoot /srv/org/wikimedia/svn
-
- SSLEngine on
- SSLProtocol +ALL -SSLv2
- SSLCipherSuite
ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA:AES128-GCM-SHA256:AES256-GCM-SHA384:ECDHE-RSA-RC4-SHA:ECDHE-ECDSA-RC4-SHA:AES128:AES256:RC4-SHA:HIGH:!aNULL:!eNULL:!EXPORT:!DES:!3DES:!MD5:!PSK:!DH
- SSLHonorCipherOrder on
- SSLCertificateFile /etc/ssl/certs/svn.wikimedia.org.pem
- SSLCertificateKeyFile /etc/ssl/private/svn.wikimedia.org.key
- SSLCACertificatePath /etc/ssl/certs/
-
-
- <Location />
- # Some annoying bots that have slowed things down in the past
- Deny from 220.181.19.85
- Deny from 221.115.95.197
- Deny from 81.208.25.37
- # Evil spider 2008-03-10... .153 and .152 at least
- Deny from 121.14.96.0/24
- Deny from 58.60.14.236
- </Location>
-
- <Directory /srv/org/wikimedia/svn>
- Order Allow,Deny
- Allow from all
- Deny from 220.181.19.85
- Deny from 221.115.95.197
- Deny from 81.208.25.37
-
- Options Indexes FollowSymLinks
- </Directory>
-
- <Location /svnroot>
- DAV svn
- SVNParentPath /svnroot
- AuthzSVNAccessFile /etc/apache2/svn-authz
- # SVNIndexXSLT /svnindex.xsl
-
- Order Allow,Deny
- Allow from all
- <LimitExcept GET PROPFIND OPTIONS REPORT>
- Deny from all
- </LimitExcept>
- </Location>
-
- ScriptAlias /viewvc /usr/lib/cgi-bin/viewvc.cgi
-
- Redirect permanent /doc
https://doc.wikimedia.org/mediawiki-core/master/php/html
-</VirtualHost>
diff --git a/templates/varnish/misc.inc.vcl.erb
b/templates/varnish/misc.inc.vcl.erb
index 2293b62..01a186a 100644
--- a/templates/varnish/misc.inc.vcl.erb
+++ b/templates/varnish/misc.inc.vcl.erb
@@ -28,6 +28,8 @@
set req.backend = iridium;
} elsif (req.http.Host == "contacts.wikimedia.org") {
set req.backend = zirconium;
+ } elsif (req.http.Host == "svn.wikimedia.org") {
+ set req.backend = antimony;
} else {
error 404 "Domain not served here";
}
--
To view, visit https://gerrit.wikimedia.org/r/155077
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1d08b67621bbcac8a08110b8ddd96e4451feee91
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
