diff options
| author | Gary Larizza <gary@puppetlabs.com> | 2012-11-20 09:56:45 -0800 |
|---|---|---|
| committer | Gary Larizza <gary@puppetlabs.com> | 2012-11-20 09:56:45 -0800 |
| commit | 2c1d7c9c2547fcc420bfdcb7be1d3dcd8426deac (patch) | |
| tree | c1832768ed6b5f85d5392649284e7ee699ef846b | |
| parent | af60ab3b4d49583c2ca3e1be467b940954b17446 (diff) | |
| parent | 1bea8b8aea88eeb689f6cfc8d9d190ae94d6eda1 (diff) | |
Merge pull request #24 from hunner/listen_service_order
Order listening services better
| -rw-r--r-- | manifests/listen.pp | 2 | ||||
| -rw-r--r-- | spec/defines/listen_spec.rb | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/manifests/listen.pp b/manifests/listen.pp index ee9e320..00636e3 100644 --- a/manifests/listen.pp +++ b/manifests/listen.pp @@ -82,7 +82,7 @@ define haproxy::listen ( ) { # Template uses: $name, $ipaddress, $ports, $options concat::fragment { "${name}_listen_block": - order => "20-${name}", + order => "20-${name}-00", target => '/etc/haproxy/haproxy.cfg', content => template('haproxy/haproxy_listen_block.erb'), } diff --git a/spec/defines/listen_spec.rb b/spec/defines/listen_spec.rb index 6102285..31dd4c8 100644 --- a/spec/defines/listen_spec.rb +++ b/spec/defines/listen_spec.rb @@ -12,7 +12,7 @@ describe 'haproxy::listen' do end it { should contain_concat__fragment('croy_listen_block').with( - 'order' => '20-croy', + 'order' => '20-croy-00', 'target' => '/etc/haproxy/haproxy.cfg', 'content' => "listen croy\n\n bind 1.1.1.1:18140\n\n balance roundrobin\n option tcplog\n option ssl-hello-chk\n" ) } @@ -30,7 +30,7 @@ describe 'haproxy::listen' do end it { should contain_concat__fragment('apache_listen_block').with( - 'order' => '20-apache', + 'order' => '20-apache-00', 'target' => '/etc/haproxy/haproxy.cfg', 'content' => "listen apache\n\n bind 23.23.23.23:80\n\n bind 23.23.23.23:443\n\n balance roundrobin\n option tcplog\n option ssl-hello-chk\n" ) } @@ -45,7 +45,7 @@ describe 'haproxy::listen' do end it { should contain_concat__fragment('apache_listen_block').with( - 'order' => '20-apache', + 'order' => '20-apache-00', 'target' => '/etc/haproxy/haproxy.cfg', 'content' => "listen apache\n\n bind 23.23.23.23:80\n\n bind 23.23.23.23:443\n\n balance roundrobin\n option tcplog\n option ssl-hello-chk\n" ) } |