Recommit for updates in build 232
This commit is contained in:
@@ -4482,8 +4482,7 @@ inherited by all classes except defines.
|
||||
793
|
||||
794
|
||||
795
|
||||
796
|
||||
797</pre>
|
||||
796</pre>
|
||||
</td>
|
||||
<td>
|
||||
<pre class="code"><span class="info file"># File 'manifests/params.pp', line 449</span>
|
||||
@@ -4777,7 +4776,6 @@ class confdroid_nagios::params (
|
||||
$ng_cgi_cfg_file = "${ng_main_dir}/cgi.cfg"
|
||||
$ng_cgi_cfg_erb = 'confdroid_nagios/nagios/cgi_cfg.erb'
|
||||
$ng_remoteip_file = '/etc/httpd/conf.d/loadbalancer-remoteip.conf'
|
||||
$ng_loadmodule_file = '/etc/httpd/conf.modules.d/10-remoteip.conf'
|
||||
|
||||
# nagios
|
||||
$ng_target_templates = "${ng_conf_d_dir}/nagios_templates.cfg"
|
||||
|
||||
@@ -158,19 +158,7 @@
|
||||
60
|
||||
61
|
||||
62
|
||||
63
|
||||
64
|
||||
65
|
||||
66
|
||||
67
|
||||
68
|
||||
69
|
||||
70
|
||||
71
|
||||
72
|
||||
73
|
||||
74
|
||||
75</pre>
|
||||
63</pre>
|
||||
</td>
|
||||
<td>
|
||||
<pre class="code"><span class="info file"># File 'manifests/server/files.pp', line 6</span>
|
||||
@@ -230,18 +218,6 @@ class confdroid_nagios::server::files (
|
||||
content => template('confdroid_nagios/loadbalancer/remoteip.conf.erb'),
|
||||
notify => Service['httpd'],
|
||||
}
|
||||
file { $ng_loadmodule_file:
|
||||
ensure => file,
|
||||
owner => 'root',
|
||||
group => 'root',
|
||||
mode => '0644',
|
||||
selrange => s0,
|
||||
selrole => object_r,
|
||||
seltype => httpd_conf_t,
|
||||
seluser => system_u,
|
||||
content => template('confdroid_nagios/loadbalancer/loadmodule.conf.erb'),
|
||||
notify => Service['httpd'],
|
||||
}
|
||||
}
|
||||
}
|
||||
}</pre>
|
||||
|
||||
Reference in New Issue
Block a user