diff options
| author | Hugo Hörnquist <hugo@lysator.liu.se> | 2023-01-14 21:03:17 +0100 |
|---|---|---|
| committer | Hugo Hörnquist <hugo@lysator.liu.se> | 2023-01-16 22:29:54 +0100 |
| commit | c6f100a6f998a2b7a54574c7d854e683b8aeaf80 (patch) | |
| tree | 7a4aec21be81e9e038fa54fb58a581750b424c8f /manifests/wiki.pp | |
| parent | Add profile for general webserer. (diff) | |
| download | profiles-c6f100a6f998a2b7a54574c7d854e683b8aeaf80.tar.gz profiles-c6f100a6f998a2b7a54574c7d854e683b8aeaf80.tar.xz | |
Update wiki to use new letsencrypt.
Diffstat (limited to 'manifests/wiki.pp')
| -rw-r--r-- | manifests/wiki.pp | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/manifests/wiki.pp b/manifests/wiki.pp index e850e47..bcc1d6b 100644 --- a/manifests/wiki.pp +++ b/manifests/wiki.pp @@ -1,25 +1,20 @@ class profiles::wiki ( String $wwwroot = '/var/www/wiki/', + String $server_name = "wiki.${::fqdn}", ) { - # TODO letsencrypt for this - ensure_packages([ 'vimwiki-scripts', 'xapian-omega', ]) - $cert_dir = $facts['letsencrypt_directory'][$::fqdn] - nginx::resource::server { "wiki.${::fqdn}": + nginx::resource::server { $server_name: ipv6_enable => true, ipv6_listen_options => '', - ssl_redirect => true, - ssl => true, - ssl_cert => "${cert_dir}/fullchain.pem", - ssl_key => "${cert_dir}/privkey.pem", www_root => $wwwroot, use_default_location => false, autoindex => 'on', + * => letsencrypt::conf::nginx($server_name), server_cfg_append => { charset => 'UTF-8', }, @@ -32,9 +27,8 @@ class profiles::wiki ( nginx::resource::location { default: - server => "wiki.${::fqdn}", - ssl => true, - ssl_only => true, + server => $server_name, + * => letsencrypt::conf::nginx::location($server_name), ; 'wiki /search': location => '/search', |