diff options
Diffstat (limited to 'manifests/site.pp')
| -rw-r--r-- | manifests/site.pp | 24 |
1 files changed, 9 insertions, 15 deletions
diff --git a/manifests/site.pp b/manifests/site.pp index 2ee3ee4..e0ec321 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -290,30 +290,24 @@ node 'hornquist.se' { ], } - nginx::resource::server { 'blogg': - server_name => [ 'blogg.hornquist.se', ], + nginx::resource::server { + default: access_log => 'absent', error_log => 'absent', ssl => true, ssl_cert => "/etc/letsencrypt/live/${certname}/fullchain.pem", ssl_key => "/etc/letsencrypt/live/${certname}/privkey.pem", use_default_location => false, + ; + 'blogg': + server_name => [ 'blogg.hornquist.se', ], server_cfg_append => { 'return' => '301 $scheme://blog.hornquist.se$request_uri', - } - } - - nginx::resource::server { 'blog': - server_name => [ - 'blog.hornquist.se', - ], - access_log => 'absent', - error_log => 'absent', + }, + ; + 'blog': + server_name => [ 'blog.hornquist.se', ], index_files => [ 'index.php', 'index.html', 'index.htm', ], - ssl => true, - ssl_cert => "/etc/letsencrypt/live/${certname}/fullchain.pem", - ssl_key => "/etc/letsencrypt/live/${certname}/privkey.pem", - use_default_location => false, www_root => $blog_root, } |