diff --git a/manifests/params.pp b/manifests/params.pp index c0d68ec..df5d2ca 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -735,7 +735,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" diff --git a/manifests/server/files.pp b/manifests/server/files.pp index c1d14e2..0ca6a1c 100644 --- a/manifests/server/files.pp +++ b/manifests/server/files.pp @@ -58,18 +58,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'], - } } } } diff --git a/templates/loadbalancer/loadmodule.conf.erb b/templates/loadbalancer/loadmodule.conf.erb deleted file mode 100644 index 9e7ddeb..0000000 --- a/templates/loadbalancer/loadmodule.conf.erb +++ /dev/null @@ -1,6 +0,0 @@ -############################################################################### -########## 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 dd97770..a4cc74a 100644 --- a/templates/loadbalancer/remoteip.conf.erb +++ b/templates/loadbalancer/remoteip.conf.erb @@ -5,3 +5,8 @@ RemoteIPHeader X-Forwarded-For RemoteIPTrustedProxy <%= @ng_trusted_proxy %> +RemoteIPInternalProxy <%= @ng_trusted_proxy %> + +# mod_remoteip rewrites client address for %a; use it in common/combined logs. +LogFormat "%a %l %u %t \"%r\" %>s %b" common +LogFormat "%a %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-agent}i\"" combined