summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHugo Hörnquist <hugo@lysator.liu.se>2023-01-15 14:04:30 +0100
committerHugo Hörnquist <hugo@lysator.liu.se>2023-01-15 14:08:17 +0100
commitbd43e7686f6637e803e5847d5cbe4ee8c5a02f0c (patch)
treec0bd2f79f58619a2b58a572643e6a488b1b11e27
parentUse hugonikanor::letsencrypt module. (diff)
downloadwebsite_blog_2-bd43e7686f6637e803e5847d5cbe4ee8c5a02f0c.tar.gz
website_blog_2-bd43e7686f6637e803e5847d5cbe4ee8c5a02f0c.tar.xz
Use correct letsencrypt function.
-rw-r--r--manifests/instance.pp10
1 files changed, 5 insertions, 5 deletions
diff --git a/manifests/instance.pp b/manifests/instance.pp
index 721ec24..d7f518b 100644
--- a/manifests/instance.pp
+++ b/manifests/instance.pp
@@ -76,14 +76,14 @@ define website_blog_2::instance (
"${module_name}/special-files.ini.epp",
{ foot_files => $foot_files, }),
}
-
+ $location_ssl = letsencrypt::conf::nginx::location($website_blog_2::domain)
nginx::resource::location { "${safe_title} - /":
location => '/',
try_files => ['$uri', '$uri/', '=404'],
index_files => [],
autoindex => on,
server => $website_blog_2::blog_server_name,
- * => letsencrypt::conf::nginx($website_blog_2::domain),
+ * => $location_ssl,
add_header => {
'Cache-Control' => "no-cache",
},
@@ -94,7 +94,7 @@ define website_blog_2::instance (
try_files => [ '$uri', '=404' ],
server => $website_blog_2::blog_server_name,
expires => '1h',
- * => letsencrypt::conf::nginx($website_blog_2::domain),
+ * => $location_ssl,
add_header => {
'Cache-Control' => "no-cache",
},
@@ -104,7 +104,7 @@ define website_blog_2::instance (
location => '~ \.php$',
fastcgi_params => 'snippets/fastcgi-php.conf',
fastcgi => 'unix:/run/php/php-fpm.sock',
- * => letsencrypt::conf::nginx($website_blog_2::domain),
+ * => $location_ssl,
server => $website_blog_2::blog_server_name,
}
@@ -113,7 +113,7 @@ define website_blog_2::instance (
location_cfg_append => { deny => 'all' },
index_files => [],
ssl_only => false,
- * => letsencrypt::conf::nginx($website_blog_2::domain),
+ * => $location_ssl,
server => $website_blog_2::blog_server_name,
}
}