6 files changed, 42 insertions, 101 deletions
diff --git a/nginx/http.d/@.joeac.net.conf b/nginx/http.d/@.joeac.net.conf
deleted file mode 100644
index 24b31fb..0000000
--- a/nginx/http.d/@.joeac.net.conf
+++ /dev/null
@@ -1,27 +0,0 @@
-server {
-    server_name joeac.net;
-
-    location / {
-        proxy_pass http://127.0.0.1:8080;
-    }
-
-    listen [::]:443 ssl ipv6only=on; # managed by Certbot
-    listen 443 ssl; # managed by Certbot
-    ssl_certificate /etc/letsencrypt/live/joeac.net-0001/fullchain.pem; # managed by Certbot
-    ssl_certificate_key /etc/letsencrypt/live/joeac.net-0001/privkey.pem; # managed by Certbot
-    include /etc/letsencrypt/options-ssl-nginx.conf; # managed by Certbot
-    ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem; # managed by Certbot
-}
-
-server {
-    if ($host = joeac.net) {
-        return 301 https://$host$request_uri;
-    } # managed by Certbot
-
-
-    listen 80 default_server;
-    listen [::]:80 default_server;
-
-    server_name joeac.net;
-    return 404; # managed by Certbot
-}
diff --git a/nginx/http.d/docs.joeac.net.conf b/nginx/http.d/docs.joeac.net.conf
deleted file mode 100644
index 6b4779a..0000000
--- a/nginx/http.d/docs.joeac.net.conf
+++ /dev/null
@@ -1,26 +0,0 @@
-server {
-    server_name docs.joeac.net;
-
-    location / {
-        proxy_pass http://localhost:9001;
-    }
-
-
-    listen 443 ssl; # managed by Certbot
-    ssl_certificate /etc/letsencrypt/live/docs.joeac.net/fullchain.pem; # managed by Certbot
-    ssl_certificate_key /etc/letsencrypt/live/docs.joeac.net/privkey.pem; # managed by Certbot
-    include /etc/letsencrypt/options-ssl-nginx.conf; # managed by Certbot
-    ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem; # managed by Certbot
-
-}
-
-server {
-    if ($host = docs.joeac.net) {
-        return 301 https://$host$request_uri;
-    } # managed by Certbot
-
-
-    server_name docs.joeac.net;
-    listen 80;
-    return 404; # managed by Certbot
-}
diff --git a/nginx/http.d/ln.joeac.net.conf b/nginx/http.d/ln.joeac.net.conf
deleted file mode 100644
index 5e21c32..0000000
--- a/nginx/http.d/ln.joeac.net.conf
+++ /dev/null
@@ -1,25 +0,0 @@
-server {
-    server_name ln.joeac.net;
-
-    location / {
-        root /var/ln.joeac.net/public;
-        try_files $uri $uri.html $uri/index.html =404;
-        error_page 404 /index.html;
-    }
-
-    listen 443 ssl; # managed by Certbot
-    ssl_certificate /etc/letsencrypt/live/ln.joeac.net/fullchain.pem; # managed by Certbot
-    ssl_certificate_key /etc/letsencrypt/live/ln.joeac.net/privkey.pem; # managed by Certbot
-    include /etc/letsencrypt/options-ssl-nginx.conf; # managed by Certbot
-    ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem; # managed by Certbot
-}
-
-server {
-    if ($host = ln.joeac.net) {
-        return 301 https://$host$request_uri;
-    } # managed by Certbot
-
-    server_name ln.joeac.net;
-    listen 80;
-    return 404; # managed by Certbot
-}
diff --git a/nginx/http.d/pwd.joeac.net.conf b/nginx/http.d/pwd.joeac.net.conf
deleted file mode 100644
index 0808f09..0000000
--- a/nginx/http.d/pwd.joeac.net.conf
+++ /dev/null
@@ -1,23 +0,0 @@
-server {
-    server_name pwd.joeac.net;
-
-    location / {
-        proxy_pass http://localhost:9000;
-    }
-
-    listen 443 ssl; # managed by Certbot
-    ssl_certificate /etc/letsencrypt/live/pwd.joeac.net/fullchain.pem; # managed by Certbot
-    ssl_certificate_key /etc/letsencrypt/live/pwd.joeac.net/privkey.pem; # managed by Certbot
-    include /etc/letsencrypt/options-ssl-nginx.conf; # managed by Certbot
-    ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem; # managed by Certbot
-}
-
-server {
-    if ($host = pwd.joeac.net) {
-        return 301 https://$host$request_uri;
-    } # managed by Certbot
-
-    server_name pwd.joeac.net;
-    listen 80;
-    return 404; # managed by Certbot
-}
diff --git a/nginx/http.d/reverse_proxy.conf.template b/nginx/http.d/reverse_proxy.conf.template
new file mode 100644
index 0000000..dc85cef
--- /dev/null
+++ b/nginx/http.d/reverse_proxy.conf.template
@@ -0,0 +1,20 @@
+server {
+    server_name ${DOMAIN};
+    location / {
+        proxy_pass http://${HOST}:${PORT};
+    }
+    listen 443 ssl;
+    ssl_certificate /etc/letsencrypt/live/${DOMAIN}/fullchain.pem;
+    ssl_certificate_key /etc/letsencrypt/live/${DOMAIN}/privkey.pem;
+    include /etc/letsencrypt/options-ssl-nginx.conf;
+    ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem;
+}
+
+server {
+    if ($$host = ${DOMAIN}) {
+        return 301 https://$$host$$request_uri;
+    }
+    server_name ${DOMAIN};
+    listen 80;
+    return 404;
+}
diff --git a/nginx/http.d/static.conf.template b/nginx/http.d/static.conf.template
new file mode 100644
index 0000000..faf5874
--- /dev/null
+++ b/nginx/http.d/static.conf.template
@@ -0,0 +1,22 @@
+server {
+    server_name ${DOMAIN};
+    location / {
+        root ${ROOT};
+        try_files $uri $uri.html $uri/index.html =404;
+        error_page 404 /index.html;
+    }
+    listen 443 ssl;
+    ssl_certificate /etc/letsencrypt/live/${DOMAIN}/fullchain.pem;
+    ssl_certificate_key /etc/letsencrypt/live/${DOMAIN}/privkey.pem;
+    include /etc/letsencrypt/options-ssl-nginx.conf;
+    ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem;
+}
+
+server {
+    if ($$host = ${DOMAIN}) {
+        return 301 https://$$host$$request_uri;
+    } # managed by Certbot
+    server_name ln.joeac.net;
+    listen 80;
+    return 404; # managed by Certbot
+}