From 79f0ba66d7fb12a1a6358d73efcd57cce3b3c898 Mon Sep 17 00:00:00 2001 From: Tony Han Date: Sat, 9 Aug 2014 15:36:40 +0800 Subject: [PATCH] fix the web interactive_port bug --- recipes/web.rb | 8 ++++---- templates/default/webconf.php.erb | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/recipes/web.rb b/recipes/web.rb index 5c199d8..2ee0b8c 100644 --- a/recipes/web.rb +++ b/recipes/web.rb @@ -52,15 +52,15 @@ end end -xml_port = if node['ganglia']['enable_two_gmetads'] then - node['ganglia']['two_gmetads']['xml_port'] +interactive_port = if node['ganglia']['enable_two_gmetads'] then + node['ganglia']['two_gmetads']['interactive_port'] else - node['ganglia']['gmetad']['xml_port'] + node['ganglia']['gmetad']['interactive_port'] end template "/etc/ganglia-webfrontend/conf.php" do source "webconf.php.erb" mode "0644" - variables( :xml_port => xml_port, :users => users.nil? ? '' : users ) + variables( :interactive_port => interactive_port, :users => users.nil? ? '' : users ) end service "apache2" do diff --git a/templates/default/webconf.php.erb b/templates/default/webconf.php.erb index d4853b2..b119f95 100644 --- a/templates/default/webconf.php.erb +++ b/templates/default/webconf.php.erb @@ -8,7 +8,7 @@ $conf['auth_system'] = '<%= node['ganglia']['web']['auth_system'] %>'; <% if node['ganglia']['enable_rrdcached'] %> $conf['rrdcached_socket'] = "<%= node['ganglia']['rrdcached']['limited_socket'] %>"; <% end %> -$conf['ganglia_port'] = <%= @xml_port %>; +$conf['ganglia_port'] = <%= @interactive_port %>; <% if node['ganglia']['web']['auth_system'] == 'enabled' %> $acl = GangliaAcl::getInstance(); <% @users.each do |user| %>