Merge pull request #327 from hundredacres/master

Puppet-lint fixes
This commit is contained in:
James Fryman 2014-06-04 22:17:31 +02:00
commit 3c7b544b9b
5 changed files with 28 additions and 31 deletions

View file

@ -281,7 +281,6 @@ define nginx::resource::location (
## Create stubs for vHost File Fragment Pattern
if ($ssl_only != true) {
$tmpFile=md5("${vhost_sanitized}-${priority}-${location_sanitized}")
concat::fragment { "${tmpFile}":
@ -294,11 +293,9 @@ define nginx::resource::location (
## Only create SSL Specific locations if $ssl is true.
if ($ssl == true) {
$ssl_priority = $priority + 300
$sslTmpFile=md5("${vhost_sanitized}-${ssl_priority}-${location_sanitized}-ssl")
concat::fragment {"${sslTmpFile}":
ensure => present,
target => $config_file,