From dd784a916e1760a7719f37d7b3d229ed28bb18f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hugo=20H=C3=B6rnquist?= <hugo@lysator.liu.se>
Date: Thu, 30 Dec 2021 03:31:50 +0100
Subject: Merge nginx for blog{,b}

---
 manifests/site.pp | 24 +++++++++---------------
 1 file 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,
   }
 
-- 
cgit v1.2.3