From 752f980d1cc45d4cd617675722feedc286739878 Mon Sep 17 00:00:00 2001
From: Christoph <chris@inferno.nadir.org>
Date: Thu, 22 May 2014 10:37:32 +0200
Subject: fix haproxy config if webapp and mx run on the same host

the problem was, that both site_mx::haproxy and site_webapp::haproxy
declared the same resource.
I fixed it by moving that resource to site_haproxy.
Since that gets included by both classes, everything works like
a charm
---
 puppet/modules/site_haproxy/manifests/init.pp | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'puppet/modules/site_haproxy/manifests/init.pp')

diff --git a/puppet/modules/site_haproxy/manifests/init.pp b/puppet/modules/site_haproxy/manifests/init.pp
index 1a681373..144d1ed2 100644
--- a/puppet/modules/site_haproxy/manifests/init.pp
+++ b/puppet/modules/site_haproxy/manifests/init.pp
@@ -1,4 +1,6 @@
 class site_haproxy {
+    $haproxy     = hiera('haproxy')
+    $local_ports = $haproxy['local_ports']
 
     class { 'haproxy':
     enable           => true,
@@ -28,5 +30,13 @@ class site_haproxy {
     order  => '90',
     source => 'puppet:///modules/site_haproxy/haproxy-stats.cfg';
   }
+
+  # Template uses $global_options, $defaults_options and $haproxy
+  concat::fragment { 'leap_haproxy_webapp_couchdb':
+    target  => '/etc/haproxy/haproxy.cfg',
+    order   => '20',
+    content => template('site_webapp/haproxy_couchdb.cfg.erb'),
+  }
+  
   include site_check_mk::agent::haproxy
 }
-- 
cgit v1.2.3


From c8025a3b2a13f01fd1be436609855e944f7b625b Mon Sep 17 00:00:00 2001
From: Christoph <chris@inferno.nadir.org>
Date: Sat, 24 May 2014 13:03:41 +0200
Subject: remove unused variable local_ports

---
 puppet/modules/site_haproxy/manifests/init.pp | 1 -
 1 file changed, 1 deletion(-)

(limited to 'puppet/modules/site_haproxy/manifests/init.pp')

diff --git a/puppet/modules/site_haproxy/manifests/init.pp b/puppet/modules/site_haproxy/manifests/init.pp
index 144d1ed2..304df0bd 100644
--- a/puppet/modules/site_haproxy/manifests/init.pp
+++ b/puppet/modules/site_haproxy/manifests/init.pp
@@ -1,6 +1,5 @@
 class site_haproxy {
     $haproxy     = hiera('haproxy')
-    $local_ports = $haproxy['local_ports']
 
     class { 'haproxy':
     enable           => true,
-- 
cgit v1.2.3


From 27f0d5731593e3a305dbfb315804294960ad204e Mon Sep 17 00:00:00 2001
From: Christoph <chris@inferno.nadir.org>
Date: Sat, 24 May 2014 13:12:17 +0200
Subject: move haproxy-template to modules/site_haproxy

---
 puppet/modules/site_haproxy/manifests/init.pp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'puppet/modules/site_haproxy/manifests/init.pp')

diff --git a/puppet/modules/site_haproxy/manifests/init.pp b/puppet/modules/site_haproxy/manifests/init.pp
index 304df0bd..6bcf3f5c 100644
--- a/puppet/modules/site_haproxy/manifests/init.pp
+++ b/puppet/modules/site_haproxy/manifests/init.pp
@@ -30,11 +30,11 @@ class site_haproxy {
     source => 'puppet:///modules/site_haproxy/haproxy-stats.cfg';
   }
 
-  # Template uses $global_options, $defaults_options and $haproxy
+  # Template uses $haproxy
   concat::fragment { 'leap_haproxy_webapp_couchdb':
     target  => '/etc/haproxy/haproxy.cfg',
     order   => '20',
-    content => template('site_webapp/haproxy_couchdb.cfg.erb'),
+    content => template('site_haproxy/haproxy_couchdb.cfg.erb'),
   }
   
   include site_check_mk::agent::haproxy
-- 
cgit v1.2.3