diff --git a/manifests/params.pp b/manifests/params.pp index df5d2ca..c0d68ec 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -735,6 +735,7 @@ 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" diff --git a/manifests/server/files.pp b/manifests/server/files.pp index 0ca6a1c..421238b 100644 --- a/manifests/server/files.pp +++ b/manifests/server/files.pp @@ -59,5 +59,18 @@ class confdroid_nagios::server::files ( 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'], + } } } diff --git a/templates/loadbalancer/loadmodule.conf.erb b/templates/loadbalancer/loadmodule.conf.erb new file mode 100644 index 0000000..9e7ddeb --- /dev/null +++ b/templates/loadbalancer/loadmodule.conf.erb @@ -0,0 +1,6 @@ +############################################################################### +########## parameterized loadmodule config created by Puppet ########## +########## manual changes will be overwritten !!! ########## +############################################################################### + +LoadModule remoteip_module modules/mod_remoteip.so diff --git a/templates/loadbalancer/remoteip.conf.erb b/templates/loadbalancer/remoteip.conf.erb index 6b303cf..dd97770 100644 --- a/templates/loadbalancer/remoteip.conf.erb +++ b/templates/loadbalancer/remoteip.conf.erb @@ -3,7 +3,5 @@ ########## manual changes will be overwritten !!! ########## ############################################################################### -LoadModule remoteip_module modules/mod_remoteip.so - RemoteIPHeader X-Forwarded-For -RemoteIPTrustedProxy <%= @ng_trusted_proxy %> \ No newline at end of file +RemoteIPTrustedProxy <%= @ng_trusted_proxy %>