Giuseppe Lavagetto has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/374553 )
Change subject: puppetmaster::passenger: fix template scoping
......................................................................
puppetmaster::passenger: fix template scoping
Bug: T171704
Change-Id: Ie99063fba172c1b4e8d55c221b3a6415c3257492
---
M modules/puppetmaster/templates/ports.conf.erb
1 file changed, 6 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/53/374553/1
diff --git a/modules/puppetmaster/templates/ports.conf.erb
b/modules/puppetmaster/templates/ports.conf.erb
index 26727fb..bcd92f0 100644
--- a/modules/puppetmaster/templates/ports.conf.erb
+++ b/modules/puppetmaster/templates/ports.conf.erb
@@ -1,20 +1,20 @@
# This file is managed by Puppet!
-
+<%- server_type = scope['::puppetmaster::server_type'] %>
<IfModule mod_ssl.c>
-<% if @server_type == 'standalone' or @server_type == 'frontend' -%>
+<% if server_type == 'standalone' or server_type == 'frontend' -%>
Listen 8140
- <% if @server_type == 'frontend' %>NameVirtualHost *:8140<% end %>
+ <% if server_type == 'frontend' %>NameVirtualHost *:8140<% end %>
<% end -%>
-<% if @server_type == 'backend' or @server_type == 'frontend' -%>
+<% if server_type == 'backend' or server_type == 'frontend' -%>
Listen 8141
<% end -%>
</IfModule>
<IfModule mod_gnutls.c>
-<% if @server_type == 'standalone' or @server_type == 'frontend' -%>
+<% if server_type == 'standalone' or server_type == 'frontend' -%>
Listen 8140
<% end -%>
-<% if @server_type == 'backend' or @server_type == 'frontend' -%>
+<% if server_type == 'backend' or server_type == 'frontend' -%>
Listen 8141
<% end -%>
</IfModule>
--
To view, visit https://gerrit.wikimedia.org/r/374553
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie99063fba172c1b4e8d55c221b3a6415c3257492
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
