diff options
| author | Micah Anderson <micah@leap.se> | 2014-05-24 11:40:52 -0400 |
|---|---|---|
| committer | Micah Anderson <micah@leap.se> | 2014-05-24 11:40:52 -0400 |
| commit | 1585d3694c6c021a11f8363290a57261f5ee4c2b (patch) | |
| tree | 6180b2de39b6ea76914873f42e4875440b1557ec /puppet/modules/site_webapp/manifests | |
| parent | a622e49c5df2150049afb6f6ed47177537b7e6da (diff) | |
| parent | 27f0d5731593e3a305dbfb315804294960ad204e (diff) | |
Merge remote-tracking branch 'cz8s/feature/allow_webapp_and_mx_on_one_host' into develop
Diffstat (limited to 'puppet/modules/site_webapp/manifests')
| -rw-r--r-- | puppet/modules/site_webapp/manifests/haproxy.pp | 13 | ||||
| -rw-r--r-- | puppet/modules/site_webapp/manifests/init.pp | 2 |
2 files changed, 1 insertions, 14 deletions
diff --git a/puppet/modules/site_webapp/manifests/haproxy.pp b/puppet/modules/site_webapp/manifests/haproxy.pp deleted file mode 100644 index b69c69da..00000000 --- a/puppet/modules/site_webapp/manifests/haproxy.pp +++ /dev/null @@ -1,13 +0,0 @@ -class site_webapp::haproxy { - - include site_haproxy - - $haproxy = hiera('haproxy') - - # 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_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 |