From 4f84405974687ddf757e45347a8b350b8ce0a759 Mon Sep 17 00:00:00 2001 From: Nick Albion Date: Tue, 24 Jun 2014 16:48:16 +1000 Subject: [PATCH 1/2] $ssl is implied by $ssl_only (I'm too lazy to add ssl=true AND ssl_only=true to each location) --- manifests/resource/location.pp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifests/resource/location.pp b/manifests/resource/location.pp index fca744935..c1b2c15e3 100644 --- a/manifests/resource/location.pp +++ b/manifests/resource/location.pp @@ -270,7 +270,7 @@ } else { $content_real = template('nginx/vhost/vhost_location_empty.erb') } - + if $fastcgi != undef and !defined(File[$fastcgi_params]) { file { $fastcgi_params: ensure => present, @@ -292,7 +292,7 @@ } ## Only create SSL Specific locations if $ssl is true. - if ($ssl == true) { + if ($ssl == true or $ssl_only == true) { $ssl_priority = $priority + 300 $sslTmpFile=md5("${vhost_sanitized}-${ssl_priority}-${location_sanitized}-ssl") From c4beb5f62e9e4429bb2e9cdc9d967c4e31f60c4e Mon Sep 17 00:00:00 2001 From: Nick Albion Date: Tue, 24 Jun 2014 16:49:16 +1000 Subject: [PATCH 2/2] $ssl is implied by $ssl_only (I'm too lazy to add ssl=true AND ssl_only=true to each location) --- manifests/resource/location.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/resource/location.pp b/manifests/resource/location.pp index c1b2c15e3..78429afcc 100644 --- a/manifests/resource/location.pp +++ b/manifests/resource/location.pp @@ -270,7 +270,7 @@ } else { $content_real = template('nginx/vhost/vhost_location_empty.erb') } - + if $fastcgi != undef and !defined(File[$fastcgi_params]) { file { $fastcgi_params: ensure => present,