summaryrefslogtreecommitdiff
path: root/puppet
diff options
context:
space:
mode:
authorChristoph <chris@inferno.nadir.org>2014-05-22 10:46:58 +0200
committerChristoph <chris@inferno.nadir.org>2014-05-22 11:26:58 +0200
commit692359e1bb9e5101c3ba882e5b9d3de1c4c63716 (patch)
tree216e1b1e0c25fe8b40da9c88db20ab4fa08bfe23 /puppet
parent752f980d1cc45d4cd617675722feedc286739878 (diff)
remove old classes
site_mx::haproxy and site_webapp::haproxy only included site_haproxy. They didn't do anything else. So just include site_haproxy in manifests/init.pp and remove the unused classes
Diffstat (limited to 'puppet')
-rw-r--r--puppet/modules/site_mx/manifests/haproxy.pp5
-rw-r--r--puppet/modules/site_mx/manifests/init.pp2
-rw-r--r--puppet/modules/site_webapp/manifests/haproxy.pp5
-rw-r--r--puppet/modules/site_webapp/manifests/init.pp2
4 files changed, 2 insertions, 12 deletions
diff --git a/puppet/modules/site_mx/manifests/haproxy.pp b/puppet/modules/site_mx/manifests/haproxy.pp
deleted file mode 100644
index 4e5675eb..00000000
--- a/puppet/modules/site_mx/manifests/haproxy.pp
+++ /dev/null
@@ -1,5 +0,0 @@
-class site_mx::haproxy {
-
- include site_haproxy
-
-}
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
diff --git a/puppet/modules/site_webapp/manifests/haproxy.pp b/puppet/modules/site_webapp/manifests/haproxy.pp
deleted file mode 100644
index e956f71f..00000000
--- a/puppet/modules/site_webapp/manifests/haproxy.pp
+++ /dev/null
@@ -1,5 +0,0 @@
-class site_webapp::haproxy {
-
- include site_haproxy
-
-}
diff --git a/puppet/modules/site_webapp/manifests/init.pp b/puppet/modules/site_webapp/manifests/init.pp
index d02a7261..d6f1d7ae 100644
--- a/puppet/modules/site_webapp/manifests/init.pp
+++ b/puppet/modules/site_webapp/manifests/init.pp
@@ -16,7 +16,7 @@ class site_webapp {
include site_config::ruby::dev
include site_webapp::apache
include site_webapp::couchdb
- include site_webapp::haproxy
+ include site_haproxy
include site_webapp::cron
include site_config::x509::cert
include site_config::x509::key