From 692359e1bb9e5101c3ba882e5b9d3de1c4c63716 Mon Sep 17 00:00:00 2001 From: Christoph Date: Thu, 22 May 2014 10:46:58 +0200 Subject: 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 --- puppet/modules/site_mx/manifests/haproxy.pp | 5 ----- puppet/modules/site_mx/manifests/init.pp | 2 +- puppet/modules/site_webapp/manifests/haproxy.pp | 5 ----- puppet/modules/site_webapp/manifests/init.pp | 2 +- 4 files changed, 2 insertions(+), 12 deletions(-) delete mode 100644 puppet/modules/site_mx/manifests/haproxy.pp delete mode 100644 puppet/modules/site_webapp/manifests/haproxy.pp 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 -- cgit v1.2.3