From 4682d7814b8293138b6b2243ffd2aef98031c9d3 Mon Sep 17 00:00:00 2001 From: natto1784 Date: Wed, 26 Jul 2023 18:03:20 +0530 Subject: [PATCH] hosts/remilia: remove most subdomains :( Signed-off-by: natto1784 --- hosts/remilia/default.nix | 1 + hosts/remilia/networking.nix | 6 +----- hosts/remilia/services.nix | 34 +++++++++++++++++----------------- 3 files changed, 19 insertions(+), 22 deletions(-) diff --git a/hosts/remilia/default.nix b/hosts/remilia/default.nix index 7cedc23..903c815 100644 --- a/hosts/remilia/default.nix +++ b/hosts/remilia/default.nix @@ -17,6 +17,7 @@ extraGroups = [ "wheel" ]; openssh.authorizedKeys.keys = lib'.network.commonSSHKeys; }; + programs.zsh.enable = true; system.stateVersion = "21.11"; } diff --git a/hosts/remilia/networking.nix b/hosts/remilia/networking.nix index 6b1c240..0279858 100644 --- a/hosts/remilia/networking.nix +++ b/hosts/remilia/networking.nix @@ -7,7 +7,7 @@ { interfaces = { ens3 = { - allowedTCPPorts = [ 80 81 443 444 993 465 143 25 22001 22002 9898 8999 99 5201 4444 ] + allowedTCPPorts = [ 80 81 443 444 993 465 143 25 22 22001 22002 4444 ] ++ (map (x: x.sourcePort) config.networking.nat.forwardPorts); allowedUDPPorts = [ 17840 ]; }; @@ -32,10 +32,6 @@ externalInterface = "ens3"; internalInterfaces = [ "wg0" ]; forwardPorts = [ - { - destination = "${marisa}:2002"; - sourcePort = 22; - } { destination = "${satori}:6600"; sourcePort = 6600; diff --git a/hosts/remilia/services.nix b/hosts/remilia/services.nix index 2e0ebee..a036daf 100644 --- a/hosts/remilia/services.nix +++ b/hosts/remilia/services.nix @@ -53,34 +53,34 @@ in serverAliases = [ "www.${domain}" ]; }; "znc.weirdnatto.in" = genericHttpRProxy { addr = "https://${marisa}:9898"; }; - "vault.${domain}" = genericHttpRProxy { addr = "https://${marisa}:8800"; }; - "consul.${domain}" = genericHttpRProxy { addr = "http://${marisa}:8500"; }; + # "vault.${domain}" = genericHttpRProxy { addr = "https://${marisa}:8800"; }; + # "consul.${domain}" = genericHttpRProxy { addr = "http://${marisa}:8500"; }; "f.${domain}" = genericHttpRProxy { addr = "http://${marisa}:8888"; }; - # "radio.${domain}" = genericHttpRProxy { addr = "http://${satori}:8001"; }; - "radio.${domain}" = { + "radio.${domain}" = genericHttpRProxy { addr = "http://${satori}:8001"; }; + /* "radio.${domain}" = { addSSL = true; enableACME = true; locations."/" = { - proxyPass = "http://${satori}:7590"; - extraConfig = '' - expires $expires; - proxy_set_header Host $host; - ''; + proxyPass = "http://${satori}:7590"; + extraConfig = '' + expires $expires; + proxy_set_header Host $host; + ''; }; locations."= /".return = "301 /radio"; - }; + };*/ - "git.${domain}" = genericHttpRProxy { - addr = "http://${marisa}:5000"; + /* "git.${domain}" = genericHttpRProxy { + addr = "http://${marisa}:5001"; conf = "client_max_body_size 64M;"; - }; - "nomad.${domain}" = genericHttpRProxy { + }; + "nomad.${domain}" = genericHttpRProxy { addr = "http://${marisa}:4646"; conf = '' - proxy_buffering off; - proxy_read_timeout 310s; + proxy_buffering off; + proxy_read_timeout 310s; ''; - }; + };*/ }; }; };