From 99653d2b752d4a9fa31ee26acfe729487699e5d4 Mon Sep 17 00:00:00 2001
From: "Niels G. W. Serup" <ngws@metanohi.name>
Date: Sun, 23 Aug 2020 23:48:38 +0200
Subject: [PATCH] Simplify nginx configuration.

---
 nginx/base.conf => metanohi.nginx.conf |  4 +---
 nginx/site.conf                        | 19 -------------------
 2 files changed, 1 insertion(+), 22 deletions(-)
 rename nginx/base.conf => metanohi.nginx.conf (98%)
 delete mode 100644 nginx/site.conf

diff --git a/nginx/base.conf b/metanohi.nginx.conf
similarity index 98%
rename from nginx/base.conf
rename to metanohi.nginx.conf
index 61c6fae..6c85297 100644
--- a/nginx/base.conf
+++ b/metanohi.nginx.conf
@@ -1,6 +1,4 @@
-server_name metanohi.name www.metanohi.name;
-
-root /var/www/metanohi.name/web-serve;
+root /home/niels/www/metanohi/web-serve;
 index index.html;
 
 error_page 404 /404.html;
diff --git a/nginx/site.conf b/nginx/site.conf
deleted file mode 100644
index 60542bf..0000000
--- a/nginx/site.conf
+++ /dev/null
@@ -1,19 +0,0 @@
-server {
-    listen 80;
-    listen [::]:80;
-
-    include /etc/nginx/snippets/letsencrypt.conf;
-    include /etc/nginx/basics/niels/metanohi.name.conf;
-}
-
-server {
-    listen 443 ssl http2;
-    listen [::]:443 ssl http2;
-
-    ssl_certificate /etc/letsencrypt/live/metanohi.name/fullchain.pem;
-    ssl_certificate_key /etc/letsencrypt/live/metanohi.name/privkey.pem;
-    ssl_trusted_certificate /etc/letsencrypt/live/metanohi.name/fullchain.pem;
-
-    include /etc/nginx/snippets/ssl.conf;
-    include /etc/nginx/basics/niels/metanohi.name.conf;
-}