summaryrefslogtreecommitdiff
path: root/puppet/modules/site_haproxy/manifests
diff options
context:
space:
mode:
authorMicah Anderson <micah@leap.se>2014-06-19 14:12:08 -0400
committerMicah Anderson <micah@leap.se>2014-06-19 14:12:08 -0400
commit9198af78956972a01aaf85e19753c5c9e62ea018 (patch)
tree7c2c4901c92528b2fababb0e4283d5bec6cd1aef /puppet/modules/site_haproxy/manifests
parent6100b6ded99241f10e7fb12c13a0820fda084912 (diff)
parentf991e8a4c877cff1d274fd1cac26488f8c3fda84 (diff)
Merge tag '0.5.2'
tagging 0.5.2 release
Diffstat (limited to 'puppet/modules/site_haproxy/manifests')
-rw-r--r--puppet/modules/site_haproxy/manifests/init.pp9
1 files changed, 9 insertions, 0 deletions
diff --git a/puppet/modules/site_haproxy/manifests/init.pp b/puppet/modules/site_haproxy/manifests/init.pp
index 1a681373..6bcf3f5c 100644
--- a/puppet/modules/site_haproxy/manifests/init.pp
+++ b/puppet/modules/site_haproxy/manifests/init.pp
@@ -1,4 +1,5 @@
class site_haproxy {
+ $haproxy = hiera('haproxy')
class { 'haproxy':
enable => true,
@@ -28,5 +29,13 @@ class site_haproxy {
order => '90',
source => 'puppet:///modules/site_haproxy/haproxy-stats.cfg';
}
+
+ # Template uses $haproxy
+ concat::fragment { 'leap_haproxy_webapp_couchdb':
+ target => '/etc/haproxy/haproxy.cfg',
+ order => '20',
+ content => template('site_haproxy/haproxy_couchdb.cfg.erb'),
+ }
+
include site_check_mk::agent::haproxy
}