Merge pull request voxpupuli#625 from Tombar/concat-fix

remove ensure from concat::fragment as its deprecated
slm0n87 · May 7, 2015 · 6f657ab · 6f657ab
2 parents 9ba5527 + 1ae5b39
commit 6f657ab
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 6 deletions.
diff --git a/manifests/resource/location.pp b/manifests/resource/location.pp
@@ -348,7 +348,6 @@
     $tmpFile=md5("${vhost_sanitized}-${priority}-${location_sanitized}")
 
     concat::fragment { $tmpFile:
-      ensure  => $ensure,
       target  => $config_file,
       content => join([
         template('nginx/vhost/location_header.erb'),
@@ -365,7 +364,6 @@
 
     $sslTmpFile=md5("${vhost_sanitized}-${ssl_priority}-${location_sanitized}-ssl")
     concat::fragment { $sslTmpFile:
-      ensure  => $ensure,
       target  => $config_file,
       content => join([
         template('nginx/vhost/location_header.erb'),

diff --git a/manifests/resource/mailhost.pp b/manifests/resource/mailhost.pp
@@ -133,7 +133,6 @@
 
   if ($listen_port != $ssl_port) {
     concat::fragment { "${name}-header":
-      ensure  => present,
       target  => $config_file,
       content => template('nginx/mailhost/mailhost.erb'),
       order   => '001',
@@ -143,7 +142,6 @@
   # 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',

diff --git a/manifests/resource/vhost.pp b/manifests/resource/vhost.pp
@@ -571,7 +571,6 @@
 
   if ($listen_port != $ssl_port) {
     concat::fragment { "${name_sanitized}-header":
-      ensure  => present,
       target  => $config_file,
       content => template('nginx/vhost/vhost_header.erb'),
       order   => '001',
@@ -581,7 +580,6 @@
   # 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',