From 388dadec9674d3800cdb4a318cdc739e9642673e Mon Sep 17 00:00:00 2001
From: Jonathan Chan <afnl686@gmail.com>
Date: Sun, 20 Jan 2019 21:01:20 -0800
Subject: [PATCH] Added conc.ert.space (Funkwhale) and pix.ert.space
 (PixelFed); added newlines at the end of all files.

---
 al.ert.space    |  1 +
 conc.ert.space  | 45 +++++++++++++++++++++++++++++++++++++++++++++
 ert.space       |  1 +
 ex.ert.space    |  1 +
 gitb.ert.space  |  1 +
 hilb.ert.space  |  1 +
 in.ert.space    |  2 ++
 pix.ert.space   | 30 ++++++++++++++++++++++++++++++
 ress.ert.space  |  1 +
 stand.ert.space |  1 +
 10 files changed, 84 insertions(+)
 create mode 100644 conc.ert.space
 create mode 100644 pix.ert.space

diff --git a/al.ert.space b/al.ert.space
index cca2950..7006374 100644
--- a/al.ert.space
+++ b/al.ert.space
@@ -28,6 +28,7 @@ server {
     ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem; # managed by Certbot
 
 }
+
 server {
     if ($host = al.ert.space) {
         return 301 https://$host$request_uri;
diff --git a/conc.ert.space b/conc.ert.space
new file mode 100644
index 0000000..1b9ba46
--- /dev/null
+++ b/conc.ert.space
@@ -0,0 +1,45 @@
+upstream fw {
+    # depending on your setup, you may want to update this
+    server 0.0.0.0:5678;
+}
+map $http_upgrade $connection_upgrade {
+    default upgrade;
+    ''      close;
+}
+
+server {
+    server_name conc.ert.space;
+    client_max_body_size 512M;
+
+    # HSTS
+    add_header Strict-Transport-Security "max-age=31536000";
+
+    location / {
+        include /etc/nginx/funkwhale_proxy.conf;
+        proxy_pass   http://fw/;
+    }
+
+    listen [::]:443 ssl; # managed by Certbot
+    listen 443 ssl; # managed by Certbot
+    ssl_certificate /etc/letsencrypt/live/ert.space/fullchain.pem; # managed by Certbot
+    ssl_certificate_key /etc/letsencrypt/live/ert.space/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 = conc.ert.space) {
+        return 301 https://$host$request_uri;
+    } # managed by Certbot
+
+
+    listen 80;
+    listen [::]:80;
+    server_name conc.ert.space;
+    return 404; # managed by Certbot
+
+
+}
\ No newline at end of file
diff --git a/ert.space b/ert.space
index 0cfee0e..7c6f877 100644
--- a/ert.space
+++ b/ert.space
@@ -13,6 +13,7 @@ server {
     ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem; # managed by Certbot
 
 }
+
 server {
     if ($host = ert.space) {
         return 301 https://$host$request_uri;
diff --git a/ex.ert.space b/ex.ert.space
index 397e1aa..a0c7b36 100644
--- a/ex.ert.space
+++ b/ex.ert.space
@@ -15,6 +15,7 @@ server {
     ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem; # managed by Certbot
 
 }
+
 server {
     if ($host = ex.ert.space) {
         return 301 https://$host$request_uri;
diff --git a/gitb.ert.space b/gitb.ert.space
index 1483e92..e48f395 100644
--- a/gitb.ert.space
+++ b/gitb.ert.space
@@ -14,6 +14,7 @@ server {
     ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem; # managed by Certbot
 
 }
+
 server {
     if ($host = gitb.ert.space) {
         return 301 https://$host$request_uri;
diff --git a/hilb.ert.space b/hilb.ert.space
index dbe527c..b7e3277 100644
--- a/hilb.ert.space
+++ b/hilb.ert.space
@@ -15,6 +15,7 @@ server {
     ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem; # managed by Certbot
 
 }
+
 server {
     if ($host = hilb.ert.space) {
         return 301 https://$host$request_uri;
diff --git a/in.ert.space b/in.ert.space
index eb3b7fa..76061d1 100644
--- a/in.ert.space
+++ b/in.ert.space
@@ -14,6 +14,7 @@ server {
     ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem; # managed by Certbot
 
 }
+
 server {
     if ($host = in.ert.space) {
         return 301 https://$host$request_uri;
@@ -27,3 +28,4 @@ server {
 
 
 }
+
diff --git a/pix.ert.space b/pix.ert.space
new file mode 100644
index 0000000..2444bbd
--- /dev/null
+++ b/pix.ert.space
@@ -0,0 +1,30 @@
+server {
+    server_name pix.ert.space;
+    location / {
+        proxy_pass http://localhost:8008;
+        proxy_set_header Host $host;
+        proxy_set_header X-Real-IP $remote_addr;
+    }
+
+    listen [::]:443 ssl; # managed by Certbot
+    listen 443 ssl; # managed by Certbot
+    ssl_certificate /etc/letsencrypt/live/ert.space/fullchain.pem; # managed by Certbot
+    ssl_certificate_key /etc/letsencrypt/live/ert.space/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 = pix.ert.space) {
+        return 301 https://$host$request_uri;
+    } # managed by Certbot
+
+
+    listen 80;
+    listen [::]:80;
+    server_name pix.ert.space;
+    return 404; # managed by Certbot
+
+
+}
\ No newline at end of file
diff --git a/ress.ert.space b/ress.ert.space
index 6c5857c..a77ec77 100644
--- a/ress.ert.space
+++ b/ress.ert.space
@@ -14,6 +14,7 @@ server {
     ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem; # managed by Certbot
 
 }
+
 server {
     if ($host = ress.ert.space) {
         return 301 https://$host$request_uri;
diff --git a/stand.ert.space b/stand.ert.space
index 8ae948a..9a2c656 100644
--- a/stand.ert.space
+++ b/stand.ert.space
@@ -14,6 +14,7 @@ server {
     ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem; # managed by Certbot
 
 }
+
 server {
     if ($host = stand.ert.space) {
         return 301 https://$host$request_uri;