diff options
Diffstat (limited to 'Biz/Cloud')
| -rw-r--r-- | Biz/Cloud/Ports.nix | 25 | ||||
| -rw-r--r-- | Biz/Cloud/Web.nix | 64 |
2 files changed, 53 insertions, 36 deletions
diff --git a/Biz/Cloud/Ports.nix b/Biz/Cloud/Ports.nix index 66016ec..435a0b6 100644 --- a/Biz/Cloud/Ports.nix +++ b/Biz/Cloud/Ports.nix @@ -1,13 +1,24 @@ { - ssh = 22; + bensIp = "199.26.245.64"; # not a port, but it's convenient + bitcoind = 8333; + dandel-rovbur = 8080; + delugeWeb = 8112; + devalloc = 8095; + et = 2022; + gemini = 1965; git = 9418; + hoogle = 8008; http = 80; + httpdev = { from = 8000; to = 8099; }; https = 443; - sabten = 8080; - hoogle = 8008; - gemini = 1965; - devalloc = 8095; - radicale = 5232; jellyfin = 8096; - dandel-rovbur = 8080; + jupyter = 4000; + mpd = 6600; + mpd-stream = 8097; + murmur = 64738; + radicale = 5232; + sabten = 8080; + ssh = 22; + tor = 143; + torrents = { from = 3000; to = 3099; }; } diff --git a/Biz/Cloud/Web.nix b/Biz/Cloud/Web.nix index fd28eee..5a14fb4 100644 --- a/Biz/Cloud/Web.nix +++ b/Biz/Cloud/Web.nix @@ -2,7 +2,6 @@ let rootDomain = config.networking.domain; - bensIp = "199.26.245.64"; ports = import ./Ports.nix; in { @@ -102,13 +101,13 @@ in }; "hoogle.${rootDomain}" = { - locations."/".proxyPass = "http://${bensIp}:${toString ports.hoogle}"; + locations."/".proxyPass = "http://${ports.bensIp}:${toString ports.hoogle}"; forceSSL = true; useACMEHost = rootDomain; }; "tv.${rootDomain}" = { - locations."/".proxyPass = "http://${bensIp}:${toString ports.jellyfin}"; + locations."/".proxyPass = "http://${ports.bensIp}:${toString ports.jellyfin}"; forceSSL = true; useACMEHost = rootDomain; }; @@ -120,13 +119,13 @@ in }; "devalloc.io" = { - locations."/".proxyPass = "http://${bensIp}:${toString ports.devalloc}"; + locations."/".proxyPass = "http://${ports.bensIp}:${toString ports.devalloc}"; forceSSL = true; useACMEHost = rootDomain; }; "dandel-rovbur.${rootDomain}" = { - locations."/".proxyPass = "http://${bensIp}:${toString ports.dandel-rovbur}"; + locations."/".proxyPass = "http://${ports.bensIp}:${toString ports.dandel-rovbur}"; forceSSL = true; useACMEHost = rootDomain; }; @@ -137,21 +136,25 @@ in useACMEHost = rootDomain; }; - # Jupyter is currently disabled on Biz.Dev - #"notebook.simatime.com".locations = { - # "/" = { - # proxyPass = "http://${bensIp}:3099"; - # proxyWebsockets = true; - # extraConfig = '' - # proxy_buffering off; - # proxy_read_timeout 86400; - # ''; - # }; - # "/(api/kernels/[^/]+/channels|terminals/websocket)/" = { - # proxyPass = "http://${bensIp}:3099"; - # proxyWebsockets = true; - # }; - #}; + "notebook.simatime.com" = { + forceSSL = true; + useACMEHost = rootDomain; + locations = { + "/" = { + proxyPass = "http://${ports.bensIp}:${toString ports.jupyter}"; + proxyWebsockets = true; + extraConfig = '' + proxy_buffering off; + proxy_read_timeout 86400; + ''; + }; + "/(api/kernels/[^/]+/channels|terminals/websocket)/" = { + proxyPass = "http://${ports.bensIp}:${toString ports.jupyter}"; + proxyWebsockets = true; + }; + }; + }; + "grocy.${rootDomain}" = { useACMEHost = rootDomain; forceSSL = true; @@ -162,14 +165,17 @@ in # This must contain all of the other domains we host security.acme.certs.${rootDomain}.extraDomainNames = [ - "bsima.me" "www.bsima.me" "tv.${rootDomain}" + "bsima.me" "www.bsima.me" "devalloc.io" - "matrix.${rootDomain}" - "chat.${rootDomain}" - "hoogle.${rootDomain}" - "dandel-rovbur.${rootDomain}" - "sabten.${rootDomain}" - "cal.${rootDomain}" - "grocy.${rootDomain}" - ];# + ] ++ map (sub: "${sub}.${rootDomain}") [ + "tv" + "matrix" + "chat" + "hoogle" + "dandel-rovbur" + "sabten" + "cal" + "notebook" + "grocy" + ]; } |