Merge branch 'puppet3'

Conflicts:
	ntpd/templates/ntp.conf.erb
	wiki/templates/collab-wsgi.conf.erb

nagios/templates/cgi.cfg.erb

@@ -12,7 +12,7 @@
 # The CGIs will read the main and host config files for any other
 # data they might need.
 
-main_config_file=<%= etcdir %>/nagios.cfg
+main_config_file=<%= @etcdir %>/nagios.cfg
 
 
 
@@ -21,7 +21,7 @@ main_config_file=<%= etcdir %>/nagios.cfg
 # value is used to locate the logo images needed by the statusmap
 # and statuswrl CGIs.
 
-physical_html_path=<%= htdocs %>
+physical_html_path=<%= @htdocs %>
 
 
 
@@ -70,10 +70,10 @@ use_pending_states=1
 # have to be tweaked a bit, as different versions of the plugin
 # use different command line arguments/syntaxes.
 
-<% if osfamily == 'Debian' -%>
+<% if @osfamily == 'Debian' -%>
 nagios_check_command=/usr/lib/nagios/plugins/check_nagios /var/cache/nagios3/status.dat 5 '/usr/sbin/nagios3'
 <% else -%>
-<%   if architecture == 'x86_64' %>
+<%   if @architecture == 'x86_64' %>
 nagios_check_command=/usr/lib64/nagios/plugins/check_nagios /var/log/nagios/status.dat 5 '/usr/sbin/nagios'
 <%   else -%>
 nagios_check_command=/usr/lib/nagios/plugins/check_nagios /var/log/nagios/status.dat 5 '/usr/sbin/nagios'

nagios/templates/nagios-httpd.conf.erb

@@ -1,12 +1,12 @@
-ScriptAlias <%= scriptalias %> <%= cgibin %>/
-Alias       /nagios <%= htdocs %>
+ScriptAlias <%= @scriptalias %> <%= @cgibin %>/
+Alias       /nagios <%= @htdocs %>
 
-<Directory "<%= cgibin %>">
+<Directory "<%= @cgibin %>">
  Options ExecCGI
  AllowOverride AuthConfig
 </Directory>
 
-<Directory "<%= htdocs %>">
+<Directory "<%= @htdocs %>">
  Options FollowSymLinks
  AllowOverride AuthConfig
 </Directory>