From 0c4f7b971f95ec2d801f539d4de100e5ccc96768 Mon Sep 17 00:00:00 2001
From: Magic_RB <magic_rb@redalder.org>
Date: Sun, 3 Sep 2023 18:03:08 +0200
Subject: [PATCH] Try to get some services to semi wan

Signed-off-by: Magic_RB <magic_rb@redalder.org>
---
 .../containers/ingress-blowhole/default.nix   |  2 +
 terranix/containers/ingress-blowhole/job.hcl  | 28 ++++++++-
 .../ingress-blowhole/upstreams.conf           | 57 +++++++------------
 3 files changed, 46 insertions(+), 41 deletions(-)

diff --git a/terranix/containers/ingress-blowhole/default.nix b/terranix/containers/ingress-blowhole/default.nix
index 867dac9..d34531e 100644
--- a/terranix/containers/ingress-blowhole/default.nix
+++ b/terranix/containers/ingress-blowhole/default.nix
@@ -12,6 +12,8 @@ in
       flake_sha = vars.flake_sha;
       store_path = config'.flake.nixngConfigurations.ingressBlowhole.config.system.build.toplevel;
       upstreams = "\${file(\"${./upstreams.conf}\")}";
+      jellyfin = "\${file(\"${./jellyfin.conf}\")}";
+      hass = "\${file(\"${./hass.conf}\")}";
     };
   };
 }
diff --git a/terranix/containers/ingress-blowhole/job.hcl b/terranix/containers/ingress-blowhole/job.hcl
index ccc53a2..ee9c56c 100644
--- a/terranix/containers/ingress-blowhole/job.hcl
+++ b/terranix/containers/ingress-blowhole/job.hcl
@@ -14,6 +14,14 @@ variable "upstreams" {
   type = string
 }
 
+variable "jellyfin" {
+  type = string
+}
+
+variable "hass" {
+  type = string
+}
+
 job "ingress" {
   datacenters = [ "homelab-1" ]
   type = "service"
@@ -29,9 +37,15 @@ job "ingress" {
     network {
       mode = "bridge"
 
-      port "http-paccess" {
-        static = 80
-        to = 81
+      port "http-jellyfin" {
+        static = 8096
+        to = 8096
+        host_network = "wan"
+      }
+
+      port "http-hass" {
+        static = 8086
+        to = 8086
         host_network = "wan"
       }
 
@@ -279,6 +293,14 @@ EOF
         change_signal = "SIGHUP"
       }
 
+      template {
+        data = var.
+
+        destination   = "local/upstreams.conf"
+        change_mode   = "signal"
+        change_signal = "SIGHUP"
+      }
+
       template {
         data = <<EOF
 upstream dovecot-imap {
diff --git a/terranix/containers/ingress-blowhole/upstreams.conf b/terranix/containers/ingress-blowhole/upstreams.conf
index 47f6527..8e7bb79 100644
--- a/terranix/containers/ingress-blowhole/upstreams.conf
+++ b/terranix/containers/ingress-blowhole/upstreams.conf
@@ -36,39 +36,21 @@ upstream matrix-mautrix-facebook {
 
 server {
   listen 80;
-  listen 81;
 
   server_name jellyfin.in.redalder.org;
 
-  include /local/security.conf;
-
-  client_max_body_size 100M;
-
-  location / {
-     # Proxy main Jellyfin traffic
-
-     # The / at the end is significant.
-     # https://www.acunetix.com/blog/articles/a-fresh-look-on-reverse-proxy-related-attacks/
-
-     proxy_pass http://jellyfin/;
-
-     proxy_pass_request_headers on;
-
-     proxy_set_header Host $host;
-
-     proxy_set_header X-Real-IP $remote_addr;
-     proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-     proxy_set_header X-Forwarded-Proto $scheme;
-     proxy_set_header X-Forwarded-Host $http_host;
-
-     proxy_set_header Upgrade $http_upgrade;
-     proxy_set_header Connection $http_connection;
-
-     # Disable buffering when the nginx proxy gets very resource heavy upon streaming
-     proxy_buffering off;
-  }
+  include /local/jellyfin.conf
 }
 
+server {
+  listen 8096;
+
+  server_name _;
+
+  include /local/jellyfin.conf
+}
+
+
 server {
   listen 80;
 
@@ -85,23 +67,22 @@ server {
 
 server {
   listen 80;
-  listen 81;
 
   server_name hass.in.redalder.org;
 
+  include /local/hass.conf
+}
+
+server {
+  listen 8086;
+
+  server_name _;
+
   include /local/security.conf;
 
   location / {
     include /local/headers.conf;
-
-    proxy_http_version 1.1;
-    proxy_set_header Upgrade $http_upgrade;
-    proxy_set_header Connection "upgrade";
-
-    proxy_pass http://home-assistant/;
-
-    # Disable buffering when the nginx proxy gets very resource heavy upon streaming
-    proxy_buffering off;
+    include /local/hass.conf
   }
 }