diff --git a/nixos/configuration.nix b/nixos/configuration.nix index cf4d35f..901b05b 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -18,15 +18,12 @@ ./programs/synapse.nix ./programs/fail2ban.nix ./programs/maddy.nix - ./programs/plausible.nix - ./programs/clickhouse.nix ./programs/docker.nix ./programs/microboard.nix ./programs/freshrss.nix ./programs/comfycamp.nix ./programs/phoenix.nix ./programs/deluge.nix - ./programs/adguard.nix ./programs/prosody.nix ./programs/yggdrasil.nix ]; diff --git a/nixos/networking.nix b/nixos/networking.nix index 3b5e40e..c386784 100644 --- a/nixos/networking.nix +++ b/nixos/networking.nix @@ -11,7 +11,6 @@ enable = true; allowedTCPPorts = [ 22 # SSH - 53 # adguard 80 # nginx 443 # nginx 25 # smtp inbound @@ -31,10 +30,8 @@ 6881 # torrents 16001 # yggdrasil tcp 16002 # yggdrasil tls - 55010 # adguard ]; allowedUDPPorts = [ - 53 # adguard 1900 # jellyfin 7359 # jellyfin 6881 # torrents diff --git a/nixos/programs/adguard.nix b/nixos/programs/adguard.nix deleted file mode 100644 index 4a4a9fa..0000000 --- a/nixos/programs/adguard.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ config, ... }: { - services.adguardhome = { - enable = true; - mutableSettings = true; - settings.bind_port = 55010; - }; -} diff --git a/nixos/programs/clickhouse.nix b/nixos/programs/clickhouse.nix deleted file mode 100644 index c6183a7..0000000 --- a/nixos/programs/clickhouse.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ config, ... }: -{ - services.clickhouse = { - enable = false; - }; - - # See https://github.com/NixOS/nixpkgs/pull/186667 - # and https://github.com/plausible/hosting/blob/master/clickhouse/clickhouse-config.xml - environment.etc = { - "clickhouse-server/config.d/logging.xml" = { - text = '' - - - warning - - - - - - - - - - - - - ''; - }; - }; -} diff --git a/nixos/programs/plausible.nix b/nixos/programs/plausible.nix deleted file mode 100644 index 5ef3c9a..0000000 --- a/nixos/programs/plausible.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ config, lib, ... }: -{ - services.plausible = { - enable = false; - database.postgres = { - setup = false; - dbname = "plausible"; - }; - database.clickhouse = { - setup = false; - url = "http://localhost:8123/plausible"; - }; - server = { - baseUrl = "https://plausible.comfycamp.space"; - port = 55005; - secretKeybaseFile = "/var/lib/secrets/plausible/keybase.txt"; - }; - adminUser = { - name = "lumin"; - email = "lumin@comfycamp.space"; - passwordFile = "/var/lib/secrets/plausible/admin-pass.txt"; - }; - mail = { - email = "plausible@comfycamp.space"; - smtp = { - enableSSL = true; - hostAddr = "comfycamp.space"; - hostPort = 465; - passwordFile = "/var/lib/secrets/plausible/smtp-pass.txt"; - user = "plausible@comfycamp.space"; - }; - }; - }; -}