[MediaWiki-commits] [Gerrit] svn - retab Apache template - change (operations/puppet)

2014-10-17 Thread Dzahn (Code Review) 
Dzahn has submitted this change and it was merged.

Change subject: svn - retab Apache template
..


svn - retab Apache template

Change-Id: I09394932886e7de617faecfff95a2f447ee42212
---
M modules/subversion/templates/apache/svn.wikimedia.org.erb
1 file changed, 68 insertions(+), 68 deletions(-)

Approvals:
  jenkins-bot: Verified
  Dzahn: Looks good to me, approved



diff --git a/modules/subversion/templates/apache/svn.wikimedia.org.erb 
b/modules/subversion/templates/apache/svn.wikimedia.org.erb
index 7193a3a..f05c9e16 100644
--- a/modules/subversion/templates/apache/svn.wikimedia.org.erb
+++ b/modules/subversion/templates/apache/svn.wikimedia.org.erb
@@ -2,93 +2,93 @@
 # vim: filetype=apache
 
 
-   ServerName svn.wikimedia.org
-   DocumentRoot /srv/org/wikimedia/svn
+ServerName svn.wikimedia.org
+DocumentRoot /srv/org/wikimedia/svn
 
-   
-   # 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
-   
+
+# 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
+
 
-   
-   Order Allow,Deny
-   Allow from all
-   Deny from 220.181.19.85
-   Deny from 221.115.95.197
-   Deny from 81.208.25.37
+
+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
-   
+Options Indexes FollowSymLinks
+
 
-   
-   DAV svn
-   SVNParentPath /svnroot
-   AuthzSVNAccessFile /etc/apache2/svn-authz
-   #SVNIndexXSLT /svnindex.xsl
+
+DAV svn
+SVNParentPath /svnroot
+AuthzSVNAccessFile /etc/apache2/svn-authz
+#SVNIndexXSLT /svnindex.xsl
 
-   Order Allow,Deny
-   Allow from all
-   
-   Deny from all
-   
-   
+Order Allow,Deny
+Allow from all
+
+Deny from all
+
+
 
-   ScriptAlias /viewvc /usr/lib/cgi-bin/viewvc.cgi
+ScriptAlias /viewvc /usr/lib/cgi-bin/viewvc.cgi
 
-   Redirect permanent /doc 
http://doc.wikimedia.org/mediawiki-core/master/php/html
+Redirect permanent /doc 
http://doc.wikimedia.org/mediawiki-core/master/php/html
 
 
 NameVirtualHost *:443
 
-   ServerName svn.wikimedia.org
-   DocumentRoot /srv/org/wikimedia/svn
+ServerName svn.wikimedia.org
+DocumentRoot /srv/org/wikimedia/svn
 
-   SSLEngine on
+SSLEngine on
 SSLProtocol +ALL -SSLv2 -SSLv3
-   SSLCertificateFile /etc/ssl/certs/svn.wikimedia.org.pem
-   SSLCertificateKeyFile /etc/ssl/private/svn.wikimedia.org.key
-   SSLCACertificatePath /etc/ssl/certs/
+SSLCertificateFile /etc/ssl/certs/svn.wikimedia.org.pem
+SSLCertificateKeyFile /etc/ssl/private/svn.wikimedia.org.key
+SSLCACertificatePath /etc/ssl/certs/
 <%= @ssl_settings.join("\n") %>
 
-   
-   # 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
-   
+
+# 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
+
 
-   
-   Order Allow,Deny
-   Allow from all
-   Deny from 220.181.19.85
-   Deny from 221.115.95.197
-   Deny from 81.208.25.37
+
+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
-   
+Options Indexes FollowSymLinks
+
 
-   
-   DAV svn
-   SVNParentPath /svnroot
-   AuthzSVNAccessFile /etc/apache2/svn-authz
-   #SVNIndexXSLT /svnindex.xsl
+
+DAV svn
+SVNParentPath /svnroot
+AuthzSVNAccessFile /etc/apache2/svn-authz
+#S

[MediaWiki-commits] [Gerrit] svn - retab Apache template - change (operations/puppet)

2014-10-17 Thread Dzahn (Code Review) 
Dzahn has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/167328

Change subject: svn - retab Apache template
..

svn - retab Apache template

Change-Id: I09394932886e7de617faecfff95a2f447ee42212
---
M modules/subversion/templates/apache/svn.wikimedia.org.erb
1 file changed, 68 insertions(+), 68 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/28/167328/1

diff --git a/modules/subversion/templates/apache/svn.wikimedia.org.erb 
b/modules/subversion/templates/apache/svn.wikimedia.org.erb
index 7193a3a..f05c9e16 100644
--- a/modules/subversion/templates/apache/svn.wikimedia.org.erb
+++ b/modules/subversion/templates/apache/svn.wikimedia.org.erb
@@ -2,93 +2,93 @@
 # vim: filetype=apache
 
 
-   ServerName svn.wikimedia.org
-   DocumentRoot /srv/org/wikimedia/svn
+ServerName svn.wikimedia.org
+DocumentRoot /srv/org/wikimedia/svn
 
-   
-   # 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
-   
+
+# 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
+
 
-   
-   Order Allow,Deny
-   Allow from all
-   Deny from 220.181.19.85
-   Deny from 221.115.95.197
-   Deny from 81.208.25.37
+
+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
-   
+Options Indexes FollowSymLinks
+
 
-   
-   DAV svn
-   SVNParentPath /svnroot
-   AuthzSVNAccessFile /etc/apache2/svn-authz
-   #SVNIndexXSLT /svnindex.xsl
+
+DAV svn
+SVNParentPath /svnroot
+AuthzSVNAccessFile /etc/apache2/svn-authz
+#SVNIndexXSLT /svnindex.xsl
 
-   Order Allow,Deny
-   Allow from all
-   
-   Deny from all
-   
-   
+Order Allow,Deny
+Allow from all
+
+Deny from all
+
+
 
-   ScriptAlias /viewvc /usr/lib/cgi-bin/viewvc.cgi
+ScriptAlias /viewvc /usr/lib/cgi-bin/viewvc.cgi
 
-   Redirect permanent /doc 
http://doc.wikimedia.org/mediawiki-core/master/php/html
+Redirect permanent /doc 
http://doc.wikimedia.org/mediawiki-core/master/php/html
 
 
 NameVirtualHost *:443
 
-   ServerName svn.wikimedia.org
-   DocumentRoot /srv/org/wikimedia/svn
+ServerName svn.wikimedia.org
+DocumentRoot /srv/org/wikimedia/svn
 
-   SSLEngine on
+SSLEngine on
 SSLProtocol +ALL -SSLv2 -SSLv3
-   SSLCertificateFile /etc/ssl/certs/svn.wikimedia.org.pem
-   SSLCertificateKeyFile /etc/ssl/private/svn.wikimedia.org.key
-   SSLCACertificatePath /etc/ssl/certs/
+SSLCertificateFile /etc/ssl/certs/svn.wikimedia.org.pem
+SSLCertificateKeyFile /etc/ssl/private/svn.wikimedia.org.key
+SSLCACertificatePath /etc/ssl/certs/
 <%= @ssl_settings.join("\n") %>
 
-   
-   # 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
-   
+
+# 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
+
 
-   
-   Order Allow,Deny
-   Allow from all
-   Deny from 220.181.19.85
-   Deny from 221.115.95.197
-   Deny from 81.208.25.37
+
+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
-   
+Options Indexes FollowSymLinks
+
 
-   
-   DAV svn
-   SVNParentPath /svnroot
-   AuthzSVNAccessFile /etc/apache2/svn-authz
-   #SVNIndexXSLT /svnindex.xsl
+
+DAV svn
+SVNParentPath /svnroot
+AuthzSVN