Skip to content

Commit

Permalink
Merge pull request #278 from jfroche/concat-ensure
Browse files Browse the repository at this point in the history
fix missing ensure on concat::fragment resources
  • Loading branch information
James Fryman committed Mar 19, 2014
2 parents ff76e4f + 4618ab1 commit a0c565f
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 0 deletions.
2 changes: 2 additions & 0 deletions manifests/resource/location.pp
Original file line number Diff line number Diff line change
Expand Up @@ -270,6 +270,7 @@
## Create stubs for vHost File Fragment Pattern
if ($ssl_only != true) {
concat::fragment { "${vhost_sanitized}-${priority}-${location_sanitized}":
ensure => present,
target => $config_file,
content => $content_real,
order => "${priority}",
Expand All @@ -280,6 +281,7 @@
if ($ssl == true) {
$ssl_priority = $priority + 300
concat::fragment {"${vhost_sanitized}-${ssl_priority}-${location_sanitized}-ssl":
ensure => present,
target => $config_file,
content => $content_real,
order => "${ssl_priority}",
Expand Down
2 changes: 2 additions & 0 deletions manifests/resource/mailhost.pp
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,7 @@

if ($listen_port != $ssl_port) {
concat::fragment { "${name}-header":
ensure => present,
target => $config_file,
content => template('nginx/mailhost/mailhost.erb'),
order => '001',
Expand All @@ -134,6 +135,7 @@
# Create SSL File Stubs if SSL is enabled
if ($ssl) {
concat::fragment { "${name}-ssl":
ensure => present,
target => $config_file,
content => template('nginx/mailhost/mailhost_ssl.erb'),
order => '700',
Expand Down
2 changes: 2 additions & 0 deletions manifests/resource/vhost.pp
Original file line number Diff line number Diff line change
Expand Up @@ -423,6 +423,7 @@

if ($listen_port != $ssl_port) {
concat::fragment { "${name_sanitized}-header":
ensure => present,
target => $config_file,
content => template('nginx/vhost/vhost_header.erb'),
order => '001',
Expand All @@ -432,6 +433,7 @@
# Create a proper file close stub.
if ($listen_port != $ssl_port) {
concat::fragment { "${name_sanitized}-footer":
ensure => present,
target => $config_file,
content => template('nginx/vhost/vhost_footer.erb'),
order => '699',
Expand Down

0 comments on commit a0c565f

Please sign in to comment.