Recommit for updates in build 40

Merge remote-tracking branch 'origin/master' into jenkins-build-40
OP#493 fix path for lb template
2026-03-14 13:33:54 +01:00 · 2026-03-14 13:32:54 +01:00 · 2026-03-14 13:32:34 +01:00 · 2026-03-14 13:20:36 +01:00
2 changed files with 2 additions and 2 deletions
--- a/doc/puppet_classes/confdroid_apache_3A_3Aparams.html
+++ b/doc/puppet_classes/confdroid_apache_3A_3Aparams.html
@@ -513,7 +513,7 @@ class confdroid_apache::params (
  $ae_index_file      = &#39;/var/www/html/index.html&#39;
  $ae_index_erb       = &#39;confdroid_apache/index_html.erb&#39;
  $ae_remoteip_file   = &#39;/etc/httpd/conf.d/loadbalancer-remoteip.conf&#39;
-  $ae_remoteip_erb    = &#39;confdroid_apache/loadbalancer_remoteip_conf.erb&#39;
+  $ae_remoteip_erb    = &#39;confdroid_apache/loadbalancer/remoteip.conf.erb&#39;

 # includes must be last
  include confdroid_apache::main::config
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -99,7 +99,7 @@ class confdroid_apache::params (
  $ae_index_file      = '/var/www/html/index.html'
  $ae_index_erb       = 'confdroid_apache/index_html.erb'
  $ae_remoteip_file   = '/etc/httpd/conf.d/loadbalancer-remoteip.conf'
-  $ae_remoteip_erb    = 'confdroid_apache/loadbalancer_remoteip_conf.erb'
+  $ae_remoteip_erb    = 'confdroid_apache/loadbalancer/remoteip.conf.erb'

 # includes must be last
  include confdroid_apache::main::config
Author	SHA1	Message	Date
Jenkins Server	0b198633e9	Recommit for updates in build 40	2026-03-14 13:33:54 +01:00
Jenkins Server	93a03af824	Merge remote-tracking branch 'origin/master' into jenkins-build-40	2026-03-14 13:32:54 +01:00
12ww1160	6ff1a23e12	OP#493 fix path for lb template	2026-03-14 13:32:34 +01:00
Jenkins Server	63ee129edf	Recommit for updates in build 39	2026-03-14 13:20:36 +01:00