diff options
| author | Christoph <chris@inferno.nadir.org> | 2014-05-24 13:12:17 +0200 |
|---|---|---|
| committer | Christoph <chris@inferno.nadir.org> | 2014-05-24 13:12:17 +0200 |
| commit | 27f0d5731593e3a305dbfb315804294960ad204e (patch) | |
| tree | 35a6593a9194f69c5a8b6f3412ae85a62f58d245 /puppet | |
| parent | c8025a3b2a13f01fd1be436609855e944f7b625b (diff) | |
move haproxy-template to modules/site_haproxy
Diffstat (limited to 'puppet')
| -rw-r--r-- | puppet/modules/site_haproxy/manifests/init.pp | 4 | ||||
| -rw-r--r-- | puppet/modules/site_haproxy/templates/haproxy_couchdb.cfg.erb (renamed from puppet/modules/site_webapp/templates/haproxy_couchdb.cfg.erb) | 0 |
2 files changed, 2 insertions, 2 deletions
diff --git a/puppet/modules/site_haproxy/manifests/init.pp b/puppet/modules/site_haproxy/manifests/init.pp index 304df0bd..6bcf3f5c 100644 --- a/puppet/modules/site_haproxy/manifests/init.pp +++ b/puppet/modules/site_haproxy/manifests/init.pp @@ -30,11 +30,11 @@ class site_haproxy { source => 'puppet:///modules/site_haproxy/haproxy-stats.cfg'; } - # Template uses $global_options, $defaults_options and $haproxy + # Template uses $haproxy concat::fragment { 'leap_haproxy_webapp_couchdb': target => '/etc/haproxy/haproxy.cfg', order => '20', - content => template('site_webapp/haproxy_couchdb.cfg.erb'), + content => template('site_haproxy/haproxy_couchdb.cfg.erb'), } include site_check_mk::agent::haproxy diff --git a/puppet/modules/site_webapp/templates/haproxy_couchdb.cfg.erb b/puppet/modules/site_haproxy/templates/haproxy_couchdb.cfg.erb index 1fa01b96..1fa01b96 100644 --- a/puppet/modules/site_webapp/templates/haproxy_couchdb.cfg.erb +++ b/puppet/modules/site_haproxy/templates/haproxy_couchdb.cfg.erb |