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 <VirtualHost *:80> - ServerName svn.wikimedia.org - DocumentRoot /srv/org/wikimedia/svn + ServerName svn.wikimedia.org + DocumentRoot /srv/org/wikimedia/svn - <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> + <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 + <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> + Options Indexes FollowSymLinks + </Directory> - <Location /svnroot> - DAV svn - SVNParentPath /svnroot - AuthzSVNAccessFile /etc/apache2/svn-authz - # SVNIndexXSLT /svnindex.xsl + <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> + Order Allow,Deny + Allow from all + <LimitExcept GET PROPFIND OPTIONS REPORT> + Deny from all + </LimitExcept> + </Location> - 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 </VirtualHost> NameVirtualHost *:443 <VirtualHost *: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") %> - <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> + <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 + <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> + Options Indexes FollowSymLinks + </Directory> - <Location /svnroot> - DAV svn - SVNParentPath /svnroot - AuthzSVNAccessFile /etc/apache2/svn-authz - # SVNIndexXSLT /svnindex.xsl + <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> + Order Allow,Deny + Allow from all + <LimitExcept GET PROPFIND OPTIONS REPORT> + Deny from all + </LimitExcept> + </Location> - ScriptAlias /viewvc /usr/lib/cgi-bin/viewvc.cgi + ScriptAlias /viewvc /usr/lib/cgi-bin/viewvc.cgi - Redirect permanent /doc https://doc.wikimedia.org/mediawiki-core/master/php/html + Redirect permanent /doc https://doc.wikimedia.org/mediawiki-core/master/php/html </VirtualHost> -- To view, visit https://gerrit.wikimedia.org/r/167328 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I09394932886e7de617faecfff95a2f447ee42212 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Dzahn <dz...@wikimedia.org> Gerrit-Reviewer: Dzahn <dz...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
