summaryrefslogtreecommitdiff
path: root/puppet/modules/site_mx/manifests
diff options
context:
space:
mode:
Diffstat (limited to 'puppet/modules/site_mx/manifests')
-rw-r--r--puppet/modules/site_mx/manifests/haproxy.pp14
-rw-r--r--puppet/modules/site_mx/manifests/init.pp2
2 files changed, 1 insertions, 15 deletions
diff --git a/puppet/modules/site_mx/manifests/haproxy.pp b/puppet/modules/site_mx/manifests/haproxy.pp
deleted file mode 100644
index 988eeaf3..00000000
--- a/puppet/modules/site_mx/manifests/haproxy.pp
+++ /dev/null
@@ -1,14 +0,0 @@
-class site_mx::haproxy {
-
- include site_haproxy
-
- $haproxy = hiera('haproxy')
- $local_ports = $haproxy['local_ports']
-
- # Template uses $global_options, $defaults_options
- concat::fragment { 'leap_haproxy_webapp_couchdb':
- target => '/etc/haproxy/haproxy.cfg',
- order => '20',
- content => template('site_webapp/haproxy_couchdb.cfg.erb'),
- }
-}
diff --git a/puppet/modules/site_mx/manifests/init.pp b/puppet/modules/site_mx/manifests/init.pp
index 3949c787..c3d38a46 100644
--- a/puppet/modules/site_mx/manifests/init.pp
+++ b/puppet/modules/site_mx/manifests/init.pp
@@ -10,7 +10,7 @@ class site_mx {
include site_postfix::mx
- include site_mx::haproxy
+ include site_haproxy
include site_shorewall::mx
include site_shorewall::service::smtp
include site_mx::couchdb