diff options
author | Hugo Hörnquist <hugo@lysator.liu.se> | 2023-01-12 10:32:42 +0100 |
---|---|---|
committer | Hugo Hörnquist <hugo@lysator.liu.se> | 2023-01-16 22:29:45 +0100 |
commit | 94816798e85291ce5e9f3a85f98ba06be599456f (patch) | |
tree | b2bb201179ac6db2337e88433445082245caef38 /manifests | |
parent | Introduce profiles::certificates + repomaster work. (diff) | |
download | profiles-94816798e85291ce5e9f3a85f98ba06be599456f.tar.gz profiles-94816798e85291ce5e9f3a85f98ba06be599456f.tar.xz |
Update shiori to use new letsencrypt setup.
Diffstat (limited to 'manifests')
-rw-r--r-- | manifests/shiori.pp | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/manifests/shiori.pp b/manifests/shiori.pp index 3e22768..c73f1fb 100644 --- a/manifests/shiori.pp +++ b/manifests/shiori.pp @@ -22,32 +22,32 @@ class profiles::shiori ( include ::nginx - $certname = lookup('certname') + include ::profiles::certificate + letsencrypt::domain { $server_name: + cert_name => $profiles::certificate::cert_name, + } - # TODO merge these options with lookup('nginx::nginx_servers_defaults') ? nginx::resource::server { $server_name: ipv6_enable => true, ipv6_listen_options => '', - ssl => true, - ssl_redirect => true, - ssl_cert => "/etc/letsencrypt/live/${certname}/fullchain.pem", - ssl_key => "/etc/letsencrypt/live/${certname}/privkey.pem", www_root => $shiori::dir, use_default_location => false, access_log => absent, error_log => absent, + * => letsencrypt::conf::nginx($server_name), } - - nginx::resource::location { 'shiori /': - location => '/', - proxy => "http://[::]:$port", - index_files => [], - ssl => true, - ssl_only => true, - server => $server_name, - add_header => { - 'Access-Control-Allow-Origin' => 'https://lysator.liu.se', + if $facts['letsencrypt_directory'][$server_name] { + nginx::resource::location { 'shiori /': + location => '/', + proxy => "http://[::]:$port", + index_files => [], + ssl => true, + ssl_only => true, + server => $server_name, + add_header => { + 'Access-Control-Allow-Origin' => 'https://lysator.liu.se', + } } } } |