Skip to content

Commit

Permalink
Merge pull request #681 from CIRB/master
Browse files Browse the repository at this point in the history
fix missing ensure on concat::fragment resources
  • Loading branch information
igalic committed Mar 19, 2014
2 parents 1421244 + 98f21a0 commit 208005d
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 0 deletions.
3 changes: 3 additions & 0 deletions manifests/balancer.pp
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@
}

concat::fragment { "00-${name}-header":
ensure => present,
target => $target,
order => '01',
content => "<Proxy balancer://${name}>\n",
Expand All @@ -67,12 +68,14 @@
# concat fragments. We don't have to do anything about them.

concat::fragment { "01-${name}-proxyset":
ensure => present,
target => $target,
order => '19',
content => inline_template("<% proxy_set.each do |key, value| %> Proxyset <%= key %>=<%= value %>\n<% end %>"),
}

concat::fragment { "01-${name}-footer":
ensure => present,
target => $target,
order => '20',
content => "</Proxy>\n",
Expand Down
1 change: 1 addition & 0 deletions manifests/balancermember.pp
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
) {

concat::fragment { "BalancerMember ${url}":
ensure => present,
target => "${::apache::params::confd_dir}/balancer_${balancer_cluster}.conf",
content => inline_template(" BalancerMember ${url} <%= @options.join ' ' %>\n"),
}
Expand Down
1 change: 1 addition & 0 deletions manifests/init.pp
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,7 @@
require => Package['httpd'],
}
concat::fragment { 'Apache ports header':
ensure => present,
target => $ports_file,
content => template('apache/ports_header.erb')
}
Expand Down
1 change: 1 addition & 0 deletions manifests/listen.pp
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

# Template uses: $listen_addr_port
concat::fragment { "Listen ${listen_addr_port}":
ensure => present,
target => $::apache::ports_file,
content => template('apache/listen.erb'),
}
Expand Down
1 change: 1 addition & 0 deletions manifests/namevirtualhost.pp
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

# Template uses: $addr_port
concat::fragment { "NameVirtualHost ${addr_port}":
ensure => present,
target => $::apache::ports_file,
content => template('apache/namevirtualhost.erb'),
}
Expand Down

0 comments on commit 208005d

Please sign in to comment.