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 ++--
 .../site_haproxy/templates/haproxy_couchdb.cfg.erb | 23 ++++++++++++++++++++++
 .../site_webapp/templates/haproxy_couchdb.cfg.erb  | 23 ----------------------
 3 files changed, 25 insertions(+), 25 deletions(-)
 create mode 100644 puppet/modules/site_haproxy/templates/haproxy_couchdb.cfg.erb
 delete mode 100644 puppet/modules/site_webapp/templates/haproxy_couchdb.cfg.erb

(limited to 'puppet')

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
diff --git a/puppet/modules/site_haproxy/templates/haproxy_couchdb.cfg.erb b/puppet/modules/site_haproxy/templates/haproxy_couchdb.cfg.erb
new file mode 100644
index 00000000..1fa01b96
--- /dev/null
+++ b/puppet/modules/site_haproxy/templates/haproxy_couchdb.cfg.erb
@@ -0,0 +1,23 @@
+
+listen bigcouch-in
+  mode     http
+  balance  roundrobin
+  option   httplog
+  option   dontlognull
+  option   httpchk GET /        # health check using simple get to root
+  option   http-server-close    # use client keep-alive, but close server connection.
+  option   allbackups           # balance among all backups, not just one.
+
+  bind localhost:4096
+
+  default-server inter 3000 fastinter 1000 downinter 1000 rise 2 fall 1
+
+<%- if @haproxy['servers'] -%>
+<%-   @haproxy['servers'].sort.each do |name,server| -%>
+<%-     backup = server['backup'] ? 'backup' : '' -%>
+  # <%=name%>
+  server couchdb_<%=server['port']%> <%=server['host']%>:<%=server['port']%> <%=backup%> weight <%=server['weight']%> check
+
+<%-   end -%>
+<%- end -%>
+
diff --git a/puppet/modules/site_webapp/templates/haproxy_couchdb.cfg.erb b/puppet/modules/site_webapp/templates/haproxy_couchdb.cfg.erb
deleted file mode 100644
index 1fa01b96..00000000
--- a/puppet/modules/site_webapp/templates/haproxy_couchdb.cfg.erb
+++ /dev/null
@@ -1,23 +0,0 @@
-
-listen bigcouch-in
-  mode     http
-  balance  roundrobin
-  option   httplog
-  option   dontlognull
-  option   httpchk GET /        # health check using simple get to root
-  option   http-server-close    # use client keep-alive, but close server connection.
-  option   allbackups           # balance among all backups, not just one.
-
-  bind localhost:4096
-
-  default-server inter 3000 fastinter 1000 downinter 1000 rise 2 fall 1
-
-<%- if @haproxy['servers'] -%>
-<%-   @haproxy['servers'].sort.each do |name,server| -%>
-<%-     backup = server['backup'] ? 'backup' : '' -%>
-  # <%=name%>
-  server couchdb_<%=server['port']%> <%=server['host']%>:<%=server['port']%> <%=backup%> weight <%=server['weight']%> check
-
-<%-   end -%>
-<%- end -%>
-
-- 
cgit v1.2.3