diff --git a/configurations/camelot/default.nix b/configurations/camelot/default.nix index 27ef456..7956c28 100644 --- a/configurations/camelot/default.nix +++ b/configurations/camelot/default.nix @@ -53,7 +53,6 @@ }; }; - my.server.mollysocket.enable = true; my.server.blog.enable = true; my.server.papermc.enable = true; diff --git a/modules/server/default.nix b/modules/server/default.nix index 664bfe4..277f76e 100644 --- a/modules/server/default.nix +++ b/modules/server/default.nix @@ -3,7 +3,6 @@ ../common ./network.nix ./nginx.nix - ./mollysocket.nix ./blog.nix ./minecraft.nix ]; diff --git a/modules/server/mollysocket.nix b/modules/server/mollysocket.nix deleted file mode 100644 index ed54d3a..0000000 --- a/modules/server/mollysocket.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ - lib, - config, - extraInfo, - ... -}: -let - msConfig = config.services.mollysocket.settings; -in -with lib; -{ - options.my.server.mollysocket.enable = mkOption { - type = types.bool; - default = false; - description = '' - Enable the mollysocket server, allowing UnifiedPush notifications for te Molly app. - ''; - }; - - config = mkIf config.my.server.mollysocket.enable { - services.mollysocket = { - enable = true; - settings = { - allowed_uuids = [ - extraInfo.signal.clientUuid - ]; - }; - }; - - services.nginx.virtualHosts.${extraInfo.signal.notificationServerUri} = { - enableACME = true; - forceSSL = true; - - locations."/" = { - recommendedProxySettings = true; - proxyWebsockets = true; - proxyPass = "http://${msConfig.host}:${builtins.toString msConfig.port}"; - }; - }; - }; -}