Changeset 416

Show
Ignore:
Timestamp:
02/21/08 10:28:08 (11 months ago)
Author:
mbailey
Message:

updated how template variable for allowed hosts

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/lib/deprec/recipes/monit.rb

    r397 r416  
    1616  set :monit_webserver_port, 2812 
    1717  set :monit_webserver_address, 'localhost' 
    18   set :monit_webserver_allowed_hosts, 'localhost' 
     18  set :monit_webserver_allowed_hosts_and_networks, %w(localhost) 
    1919  set :monit_webserver_auth_user, 'admin' 
    2020  set :monit_webserver_auth_pass, 'monit' 

  • trunk/lib/deprec/templates/monit/monitrc.erb

    r393 r416  
    9494<% if monit_webserver_enabled %> 
    9595set httpd port <%= monit_webserver_port %> and 
    96      use address <%= monit_webserver_address %>  # only accept connection from <%= monit_webserver_address %> 
    97      allow <%= monit_webserver_allowed_hosts %>        # allow <%= monit_webserver_allowed_hosts %> to connect to the server and 
     96     use address <%= monit_webserver_address %>  # listen on <%= monit_webserver_address %> 
     97  <% monit_webserver_allowed_hosts_and_networks.each do |host| %> 
     98     allow <%= host %> # allow <%= host %> to connect to the server 
     99  <% end %> 
    98100     allow <%= monit_webserver_auth_user %>:<%= monit_webserver_auth_pass %>      # require user <%= monit_webserver_auth_user %> with password <%= monit_webserver_auth_pass %> 
    99101<% end %>