From 020cca687178c17a58b8d4c5b6afa378e05c6c7f Mon Sep 17 00:00:00 2001
From: "Niels G. W. Serup" <ngws@metanohi.name>
Date: Sat, 3 Sep 2016 15:02:15 +0200
Subject: [PATCH] nohix conf

---
 nohix/apache.conf     | 16 ----------------
 nohix/nginx/base.conf | 13 +++++++++++++
 nohix/nginx/site.conf | 19 +++++++++++++++++++
 3 files changed, 32 insertions(+), 16 deletions(-)
 delete mode 100644 nohix/apache.conf
 create mode 100644 nohix/nginx/base.conf
 create mode 100644 nohix/nginx/site.conf

diff --git a/nohix/apache.conf b/nohix/apache.conf
deleted file mode 100644
index 86523dd..0000000
--- a/nohix/apache.conf
+++ /dev/null
@@ -1,16 +0,0 @@
-<VirtualHost *:80>
-	ServerName nohix.metanohi.name
-	ServerAlias www.nohix.metanohi.name
-	ServerAdmin ngws@metanohi.name
-
-	DocumentRoot /home/niels/prog/metanohi-misc-subsites/nohix
-	<Directory /home/niels/prog/metanohi-misc-subsites/nohix/>
-		Options Indexes Includes FollowSymLinks MultiViews
-		AllowOverride All
-                Require all granted
-	</Directory>
-
-  	LogLevel warn
-	ErrorLog ${APACHE_LOG_DIR}/error-nohix.metanohi.name.log
-	CustomLog ${APACHE_LOG_DIR}/access-nohix.metanohi.name.log combined
-</VirtualHost>
diff --git a/nohix/nginx/base.conf b/nohix/nginx/base.conf
new file mode 100644
index 0000000..3d1d734
--- /dev/null
+++ b/nohix/nginx/base.conf
@@ -0,0 +1,13 @@
+server_name nohix.metanohi.name www.nohix.metanohi.name;
+
+root /home/niels/prog/metanohi-misc-subsites/nohix;
+index index.html index.php;
+
+location ~ \.php$ {
+    include snippets/fastcgi-php.conf;
+    fastcgi_pass unix:/run/php/php7.0-fpm.sock;
+}
+
+location / {
+    autoindex on;
+}
diff --git a/nohix/nginx/site.conf b/nohix/nginx/site.conf
new file mode 100644
index 0000000..379b03a
--- /dev/null
+++ b/nohix/nginx/site.conf
@@ -0,0 +1,19 @@
+server {
+    listen 80;
+    listen [::]:80;
+
+    include /etc/nginx/snippets/letsencrypt.conf;
+    include /etc/nginx/basics/niels/nohix.metanohi.name.conf;
+}
+
+server {
+    listen 443 ssl http2;
+    listen [::]:443 ssl http2;
+
+    ssl_certificate /etc/letsencrypt/live/nohix.metanohi.name/fullchain.pem;
+    ssl_certificate_key /etc/letsencrypt/live/nohix.metanohi.name/privkey.pem;
+    ssl_trusted_certificate /etc/letsencrypt/live/nohix.metanohi.name/fullchain.pem;
+
+    include /etc/nginx/snippets/ssl.conf;
+    include /etc/nginx/basics/niels/nohix.metanohi.name.conf;
+}