Andrew Bogott has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/403178 )
Change subject: simplestatic.erb: remove some inappropriate variable
qualifications
......................................................................
simplestatic.erb: remove some inappropriate variable qualifications
I was overly-zealous in my previous patch
Change-Id: I2dde03a32bd1efc13ea0d7fd9907da1667eacf28
---
M modules/role/templates/apache/sites/simplestatic.erb
1 file changed, 3 insertions(+), 3 deletions(-)
Approvals:
Andrew Bogott: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/role/templates/apache/sites/simplestatic.erb
b/modules/role/templates/apache/sites/simplestatic.erb
index 537250f..95df49d 100644
--- a/modules/role/templates/apache/sites/simplestatic.erb
+++ b/modules/role/templates/apache/sites/simplestatic.erb
@@ -4,8 +4,8 @@
<% @host_names.each do |host_name| -%>
<VirtualHost *:80>
- ServerName <%= @host_name %>
- DocumentRoot <%= @base_path %>/<%= @host_name %>
+ ServerName <%= host_name %>
+ DocumentRoot <%= @base_path %>/<%= host_name %>
# Redirect HTTP to HTTPS
# Assumes that X-Forwarded-Proto is being set by a layer in front of
apache
@@ -18,7 +18,7 @@
# Enable HSTS
Header always set Strict-Transport-Security "max-age=31536000"
- <Directory <%= @base_path %>/<%= @host_name %>>
+ <Directory <%= @base_path %>/<%= host_name %>>
Require all granted
</Directory>
</VirtualHost>
--
To view, visit https://gerrit.wikimedia.org/r/403178
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2dde03a32bd1efc13ea0d7fd9907da1667eacf28
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott <[email protected]>
Gerrit-Reviewer: Andrew Bogott <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
