Ottomata has uploaded a new change for review.
https://gerrit.wikimedia.org/r/109314
Change subject: Fixing conditional Listen in wikimetrics.vhost.erb
......................................................................
Fixing conditional Listen in wikimetrics.vhost.erb
Change-Id: Idf3de3bfe4131f73483437744d6ac4480b825d8a
---
M templates/wikimetrics.vhost.erb
1 file changed, 3 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet/wikimetrics
refs/changes/14/109314/1
diff --git a/templates/wikimetrics.vhost.erb b/templates/wikimetrics.vhost.erb
index 1bca9d0..5d840c9 100644
--- a/templates/wikimetrics.vhost.erb
+++ b/templates/wikimetrics.vhost.erb
@@ -1,11 +1,11 @@
-<% if @server_port and @server_port != 80 -%>
+<% if @server_port and @server_port.to_i != 80 -%>
Listen <%= @server_port %>
<% end -%>
<VirtualHost *:<%= @server_port %>>
ServerName <%= @server_name %>
<% if @server_aliases and not Array(@server_aliases).empty? -%>
ServerAlias <%= Array(@server_aliases).join(' ') %>
-<% end %>
+<% end -%>
DocumentRoot <%= @docroot %>
ServerAdmin n...@wikimedia.org
@@ -15,7 +15,7 @@
# alert, emerg.
LogLevel warn
- CustomLog /var/log/apache2/access.metrics.log combined
+ CustomLog /var/log/apache2/access.wikimetrics.log combined
<% if @ssl_redirect -%>
RewriteEngine on
--
To view, visit https://gerrit.wikimedia.org/r/109314
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Idf3de3bfe4131f73483437744d6ac4480b825d8a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet/wikimetrics
Gerrit-Branch: master
Gerrit-Owner: Ottomata <o...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
