From c9c83619909105f6e3496ecb9cfa647dda019eaf Mon Sep 17 00:00:00 2001 From: Jim Radford Date: Mon, 8 Dec 2014 11:27:58 -0800 Subject: [PATCH] location: fix ensure --- manifests/resource/location.pp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/manifests/resource/location.pp b/manifests/resource/location.pp index d121b853f..d66e90f7e 100644 --- a/manifests/resource/location.pp +++ b/manifests/resource/location.pp @@ -335,7 +335,7 @@ $content_real = template('nginx/vhost/locations/empty.erb') } - if $fastcgi != undef and !defined(File[$fastcgi_params]) { + if $ensure == present and $fastcgi != undef and !defined(File[$fastcgi_params]) { file { $fastcgi_params: ensure => present, mode => '0770', @@ -348,7 +348,7 @@ $tmpFile=md5("${vhost_sanitized}-${priority}-${location_sanitized}") concat::fragment { $tmpFile: - ensure => present, + ensure => $ensure, target => $config_file, content => join([ template('nginx/vhost/location_header.erb'), @@ -365,7 +365,7 @@ $sslTmpFile=md5("${vhost_sanitized}-${ssl_priority}-${location_sanitized}-ssl") concat::fragment { $sslTmpFile: - ensure => present, + ensure => $ensure, target => $config_file, content => join([ template('nginx/vhost/location_header.erb'), @@ -379,7 +379,7 @@ if ($auth_basic_user_file != undef) { #Generate htpasswd with provided file-locations file { "${::nginx::config::conf_dir}/${location_sanitized}_htpasswd": - ensure => $ensure, + ensure => $ensure_real, mode => '0644', source => $auth_basic_user_file, }