diff --git a/hosts/vps-public/default.nix b/hosts/vps-public/default.nix index 2bc2917..f80104f 100644 --- a/hosts/vps-public/default.nix +++ b/hosts/vps-public/default.nix @@ -41,7 +41,9 @@ caddy.virtualHosts."dav.${sproutedDomain}" = { inherit (config.custom.web-services.radicale) port; extraConfig = '' - respond /.web/ "Access denied" 403 { close } + respond /.web/ "Access denied" 403 { + close + } ''; }; }; @@ -80,11 +82,6 @@ branding.name = "SproutedBin"; }; - screego = { - enable = true; - domain = "mirror.${sproutedDomain}"; - }; - radicale = { enable = true; domain = "dav.${privateDomain}"; diff --git a/modules/system/web-services/screego.nix b/modules/system/web-services/screego.nix deleted file mode 100644 index 7a1d554..0000000 --- a/modules/system/web-services/screego.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ config, lib, ... }: -let - cfg = config.custom.web-services.screego; -in -{ - options.custom.web-services.screego = { - enable = lib.mkEnableOption ""; - domain = lib.mkOption { - type = lib.types.nonEmptyStr; - default = ""; - }; - port = lib.mkOption { - type = lib.types.port; - default = 5050; - }; - }; - - config = lib.mkIf cfg.enable { - services.screego = { - enable = true; - openFirewall = true; - settings = { - SCREEGO_EXTERNAL_IP = config.custom.networking.underlay.address; - SCREEGO_SERVER_ADDRESS = "127.0.0.1:${toString cfg.port}"; - SCREEGO_TURN_ADDRESS = "${config.custom.networking.underlay.address}:3478"; - }; - }; - - custom.services.caddy.virtualHosts.${cfg.domain}.port = cfg.port; - }; -}