docker/services/proxy-frontend

@@ -15,10 +15,10 @@
     restart: always
     cap_add:
       - NET_ADMIN
-    networks:
-      internal:
     depends_on:
       - tinc
+    networks:
+      internal:
     logging:
       driver: "json-file"
       options:

proxy-frontend/entry/lixonet.sh.tmpl

@@ -1,5 +1,5 @@
 #!/bin/sh
-gateway=`getent ahostsv4 tinc | awk '{ print \$1 }' | head -n 1`
+gateway=`getent hosts tinc | awk '{ print \$1 }'`
 route="${network_address}/${global_prefix:-16}"
 iface="eth0"
 

proxy-frontend/nginx.conf

@@ -26,15 +26,15 @@ http {
   upstream wiretap_glower_agency {
     server 172.31.206.2:80;
   }
+  upstream rpwriting_com {
+    server 172.31.23.2:80;
+  }
   upstream pepperchan_shop {
     server 172.31.206.1:80;
  }
-  upstream maud_needs_rocks {
+upstream maud_needs_rocks {
     server 172.31.206.1:80;
  }
-  upstream docs_motorsportsresearch_org {
-    server 172.31.23.3:80;
-  }
   server {
     listen          80;
     server_name     watch.mommys.plumbing;
@@ -72,9 +72,9 @@ http {
   }
   server {
     listen          80;
-    server_name     docs.motorsportsresearch.org;
+    server_name     rpwriting.com;
     location / {
-      proxy_pass      http://docs_motorsportsresearch_org;
+      proxy_pass      http://rpwriting_com;
     }
   }
 }

proxy-frontend/stream.d/sni.conf

@@ -5,7 +5,6 @@ map $ssl_preread_server_name $name_443 {
     rpwriting.com            rp_writing_com;
     pepperchan.shop          pepperchan_shop;
     maud.needs.rocks         maud_needs_rocks;
-    docs.motorsportsresearch.org         docs_motorsportsresearch_org;
 }
 
 map $ssl_preread_server_name $name_8448 {
@@ -31,10 +30,7 @@ upstream rp_writing_com {
     server 172.31.23.3:443;
 }
 upstream maud_needs_rocks {
-    server 172.31.206.1:443;
-}
-upstream docs_motorsportsresearch_org {
-    server 172.31.23.3:443;
+    server 172.31.206.1:443
 }
 
 server {