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')

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