Dzahn has submitted this change and it was merged. Change subject: gitblit apache template - retab ......................................................................
gitblit apache template - retab on top of Change-Id: I50eb8fb493425d per comments about tabs there Change-Id: I33ee72a0fb6b92bbb7ceb2bf15bd02cbdf354e42 --- M modules/gitblit/templates/git.wikimedia.org.erb 1 file changed, 43 insertions(+), 43 deletions(-) Approvals: jenkins-bot: Verified Dzahn: Looks good to me, approved diff --git a/modules/gitblit/templates/git.wikimedia.org.erb b/modules/gitblit/templates/git.wikimedia.org.erb index d03eeb6..9652bf3 100644 --- a/modules/gitblit/templates/git.wikimedia.org.erb +++ b/modules/gitblit/templates/git.wikimedia.org.erb @@ -10,62 +10,62 @@ NameVirtualHost *:80 <VirtualHost *:80> - ServerAdmin [email protected] - ServerName <%= @host %> + ServerAdmin [email protected] + ServerName <%= @host %> # gitblit supposed to generate https URLs # we are behind varnish RequestHeader set X-Forwarded-Proto https RequestHeader set X-Forwarded-Port 443 - # Misbehaving bots - SetEnvIf User-Agent 80legs bad_browser - SetEnvIf User-Agent bingbot bad_browser - SetEnvIf User-Agent Baiduspider bad_browser - SetEnvIf User-Agent Sogou bad_browser - SetEnvIf User-Agent TweetmemeBot bad_browser - SetEnvIf User-Agent Yeti bad_browser - SetEnvIf Remote_Addr 208.110.84.34 bad_browser - SetEnvIf Remote_Addr 89.83.122.45 bad_browser - SetEnvIf Remote_Addr 129.242.4.62 bad_browser + # Misbehaving bots + SetEnvIf User-Agent 80legs bad_browser + SetEnvIf User-Agent bingbot bad_browser + SetEnvIf User-Agent Baiduspider bad_browser + SetEnvIf User-Agent Sogou bad_browser + SetEnvIf User-Agent TweetmemeBot bad_browser + SetEnvIf User-Agent Yeti bad_browser + SetEnvIf Remote_Addr 208.110.84.34 bad_browser + SetEnvIf Remote_Addr 89.83.122.45 bad_browser + SetEnvIf Remote_Addr 129.242.4.62 bad_browser - TimeOut 720 + TimeOut 720 - DocumentRoot /var/www - <Directory /> - Options FollowSymLinks - AllowOverride None - Order deny,allow - deny from env=bad_browser - deny from 208.110.84.34 - </Directory> - <Directory /var/www/> - Options Indexes FollowSymLinks MultiViews - AllowOverride None - </Directory> + DocumentRoot /var/www + <Directory /> + Options FollowSymLinks + AllowOverride None + Order deny,allow + deny from env=bad_browser + deny from 208.110.84.34 + </Directory> + <Directory /var/www/> + Options Indexes FollowSymLinks MultiViews + AllowOverride None + </Directory> - ProxyRequests Off - ProxyVia Off - ProxyPreserveHost On + ProxyRequests Off + ProxyVia Off + ProxyPreserveHost On - <Proxy *> - Order deny,allow - deny from env=bad_browser - deny from 208.110.84.34 - </Proxy> + <Proxy *> + Order deny,allow + deny from env=bad_browser + deny from 208.110.84.34 + </Proxy> - AllowEncodedSlashes NoDecode - RewriteEngine On - RewriteCond %{REQUEST_URI} !^/robots.txt$ - RewriteRule ^/(.*) http://127.0.0.1:8080/$1 [NE,P] + AllowEncodedSlashes NoDecode + RewriteEngine On + RewriteCond %{REQUEST_URI} !^/robots.txt$ + RewriteRule ^/(.*) http://127.0.0.1:8080/$1 [NE,P] - ErrorLog /var/log/apache2/error.log + ErrorLog /var/log/apache2/error.log - # Possible values include: debug, info, notice, warn, error, crit, - # alert, emerg. - LogLevel warn + # Possible values include: debug, info, notice, warn, error, crit, + # alert, emerg. + LogLevel warn - CustomLog /var/log/apache2/access.log combined_time - ServerSignature Off + CustomLog /var/log/apache2/access.log combined_time + ServerSignature Off </VirtualHost> -- To view, visit https://gerrit.wikimedia.org/r/155829 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I33ee72a0fb6b92bbb7ceb2bf15bd02cbdf354e42 Gerrit-PatchSet: 4 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Dzahn <[email protected]> Gerrit-Reviewer: Dzahn <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
