diff options
Diffstat (limited to 'manifests/instance.pp')
| -rw-r--r-- | manifests/instance.pp | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/manifests/instance.pp b/manifests/instance.pp index df1df65..721ec24 100644 --- a/manifests/instance.pp +++ b/manifests/instance.pp @@ -78,14 +78,13 @@ define website_blog_2::instance ( } nginx::resource::location { "${safe_title} - /": - location => '/', - try_files => ['$uri', '$uri/', '=404'], - index_files => [], - ssl => true, - ssl_only => true, - autoindex => on, - server => $website_blog_2::blog_server_name, - add_header => { + location => '/', + try_files => ['$uri', '$uri/', '=404'], + index_files => [], + autoindex => on, + server => $website_blog_2::blog_server_name, + * => letsencrypt::conf::nginx($website_blog_2::domain), + add_header => { 'Cache-Control' => "no-cache", }, } @@ -93,10 +92,9 @@ define website_blog_2::instance ( nginx::resource::location { "${safe_title} - css": location => '~ \.css$', try_files => [ '$uri', '=404' ], - ssl => true, - ssl_only => true, server => $website_blog_2::blog_server_name, expires => '1h', + * => letsencrypt::conf::nginx($website_blog_2::domain), add_header => { 'Cache-Control' => "no-cache", }, @@ -106,8 +104,7 @@ define website_blog_2::instance ( location => '~ \.php$', fastcgi_params => 'snippets/fastcgi-php.conf', fastcgi => 'unix:/run/php/php-fpm.sock', - ssl => true, - ssl_only => true, + * => letsencrypt::conf::nginx($website_blog_2::domain), server => $website_blog_2::blog_server_name, } @@ -115,7 +112,8 @@ define website_blog_2::instance ( location => '~ /\.ht', location_cfg_append => { deny => 'all' }, index_files => [], - ssl => true, + ssl_only => false, + * => letsencrypt::conf::nginx($website_blog_2::domain), server => $website_blog_2::blog_server_name, } } |