diff --git a/hosts/common/server.nix b/hosts/common/server.nix index 7997f2c..428ce65 100644 --- a/hosts/common/server.nix +++ b/hosts/common/server.nix @@ -26,7 +26,7 @@ environmentFile = config.sops.templates."caddy.env".path; virtualHosts."centraldogma.site:".extraConfig = '' - root * /srv/root/ + root /srv/root/ file_server encode zstd gzip @@ -50,9 +50,6 @@ virtualHosts."git.centraldogma.site:".extraConfig = '' reverse_proxy /* 127.0.0.1:3000 ''; - virtualHosts."spy.centraldogma.site:".extraConfig = '' - reverse_proxy /* 192.168.1.78:4444 - ''; }; services.flaresolverr.enable = true; @@ -62,7 +59,6 @@ package = pkgs.mongodb-ce; initialRootPasswordFile = config.sops.secrets."mongodb/initial_password".path; }; - services.jackett.enable = true; services.factorio = { @@ -71,9 +67,9 @@ requireUserVerification = true; username = "TheMaskedMan95"; admins = ["TheMaskedMan95"]; + extraSettingsFile = config.sops.templates."factorio.json".path; game-name = "Realm of the Masked Men"; description = "No Dogs allowed"; - extraSettingsFile = config.sops.templates."factorio.json".path; saveName = "SPACExxxx"; openFirewall = true; }; @@ -89,6 +85,7 @@ domains = [ "@" "www" + "*" ]; usev4 = "webv4, webv4=ipify-ipv4"; passwordFile = config.sops.secrets."namecheap/ddyn_password".path; @@ -107,31 +104,32 @@ }; }; - services.adguardhome = { - enable = true; - host = "0.0.0.0"; - port = 3003; - settings = { - allowDHCP = true; - dns = { - upstream_dns = [ - "9.9.9.9#dns.quad9.net" - "149.112.112.112#dns.quad9.net" - ]; - }; - filtering = { - protection_enabled = true; - filtering_enabled = true; - parental_enabled = true; - safe_search.enabled = false; - }; - filters = map (url: { - enabled = true; - url = url; - }) [ - "https://adguardteam.github.io/HostlistsRegistry/assets/filter_9.txt" - "https://adguardteam.github.io/HostlistsRegistry/assets/filter_11.txt" - ]; - }; - }; + # services.adguardhome = { + # enable = true; + # host = "0.0.0.0"; + # port = 3003; + # settings = { + # allowDHCP = true; + # dns = { + # upstream_dns = [ + # "9.9.9.9#dns.quad9.net" + # "149.112.112.112#dns.quad9.net" + # ]; + # }; + # filtering = { + # protection_enabled = true; + # filtering_enabled = true; + # parental_enabled = true; + # safe_search.enabled = false; + # }; + # filters = + # map (url: { + # enabled = true; + # url = url; + # }) [ + # "https://adguardteam.github.io/HostlistsRegistry/assets/filter_9.txt" + # "https://adguardteam.github.io/HostlistsRegistry/assets/filter_11.txt" + # ]; + # }; + # }; }