Dzahn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/145493
Change subject: wikitech apache erb - qualify vars
......................................................................
wikitech apache erb - qualify vars
Change-Id: I650d60f2f863db65cf6ca66c9f72c59fc7f7fc7b
---
M templates/apache/sites/wikitech.wikimedia.org.erb
1 file changed, 7 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/93/145493/1
diff --git a/templates/apache/sites/wikitech.wikimedia.org.erb
b/templates/apache/sites/wikitech.wikimedia.org.erb
index 809a905..d35258b 100644
--- a/templates/apache/sites/wikitech.wikimedia.org.erb
+++ b/templates/apache/sites/wikitech.wikimedia.org.erb
@@ -6,7 +6,7 @@
<VirtualHost *:80>
ServerAdmin n...@wikimedia.org
- ServerName <%= webserver_hostname %>
+ ServerName <%= @webserver_hostname %>
ServerAlias wmflabs.org www.wmflabs.org
DocumentRoot /var/www
@@ -37,24 +37,24 @@
</VirtualHost>
<VirtualHost *:443>
ServerAdmin n...@wikimedia.org
- ServerName <%= webserver_hostname %>
+ ServerName <%= @webserver_hostname %>
SSLEngine on
SSLProtocol -ALL +SSLv3 +TLSv1
SSLCipherSuite
AES128-GCM-SHA256:RC4-SHA:RC4-MD5:DES-CBC3-SHA:AES128-SHA:AES256-SHA
SSLHonorCipherOrder on
SSLCertificateFile /etc/ssl/certs/<%= certificate %>.pem
- SSLCertificateKeyFile /etc/ssl/private/<%= certificate %>.key
+ SSLCertificateKeyFile /etc/ssl/private/<%= @certificate %>.key
SSLCACertificatePath /etc/ssl/certs/
Header append Strict-Transport-Security "max-age=604800"
- RedirectMatch ^/$ https://<%= webserver_hostname %>/wiki/
+ RedirectMatch ^/$ https://<%= @webserver_hostname %>/wiki/
RewriteEngine on
- RewriteRule ^/view/(.*)$ https://<%= webserver_hostname %>/wiki/$1 [L,R]
- RewriteCond %{HTTP_HOST} !^<%= webserver_hostname.gsub(%r[\.],'\\.') %>
[NC]
- RewriteRule ^/(.*) https://<%= webserver_hostname %>/$1 [L,R]
+ RewriteRule ^/view/(.*)$ https://<%= @webserver_hostname %>/wiki/$1 [L,R]
+ RewriteCond %{HTTP_HOST} !^<%= @webserver_hostname.gsub(%r[\.],'\\.') %>
[NC]
+ RewriteRule ^/(.*) https://<%= @webserver_hostname %>/$1 [L,R]
DocumentRoot /var/www
<Directory />
--
To view, visit https://gerrit.wikimedia.org/r/145493
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I650d60f2f863db65cf6ca66c9f72c59fc7f7fc7b
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <dz...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
