diff options
| author | Christoph <chris@inferno.nadir.org> | 2014-05-22 10:46:58 +0200 |
|---|---|---|
| committer | Christoph <chris@inferno.nadir.org> | 2014-05-22 11:26:58 +0200 |
| commit | 692359e1bb9e5101c3ba882e5b9d3de1c4c63716 (patch) | |
| tree | 216e1b1e0c25fe8b40da9c88db20ab4fa08bfe23 /puppet/modules/site_webapp | |
| parent | 752f980d1cc45d4cd617675722feedc286739878 (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/modules/site_webapp')
| -rw-r--r-- | puppet/modules/site_webapp/manifests/haproxy.pp | 5 | ||||
| -rw-r--r-- | puppet/modules/site_webapp/manifests/init.pp | 2 |
2 files changed, 1 insertions, 6 deletions
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 |