diff --git a/configuration.nix b/configuration.nix index b03a587..3f48408 100644 --- a/configuration.nix +++ b/configuration.nix @@ -49,6 +49,7 @@ ./system-modules/nx2site/proxy.nix ./system-modules/nx2site/audiobookshelf.nix # ./system-modules/nx2site/baikal.nix + # ./system-modules/nx2site/nxcaldav.nix ./system-modules/nx2site/copyparty.nix ./system-modules/nx2site/gitea.nix ./system-modules/nx2site/open-web-calendar.nix diff --git a/system-modules/nx2site/nxcaldav.nix b/system-modules/nx2site/nxcaldav.nix new file mode 100644 index 0000000..477cd83 --- /dev/null +++ b/system-modules/nx2site/nxcaldav.nix @@ -0,0 +1 @@ +{ pkgs, ... }@all: with all; { } diff --git a/system-modules/nx2site/open-web-calendar.nix b/system-modules/nx2site/open-web-calendar.nix index 2a8967f..4cf343e 100644 --- a/system-modules/nx2site/open-web-calendar.nix +++ b/system-modules/nx2site/open-web-calendar.nix @@ -1,9 +1,8 @@ -{ pkgs, ... }@all: with all; -{ +{ pkgs, ... }@all: with all; { services = { open-web-calendar = { enable = true; - domain = "cal.${hyper.domain}"; + domain = "owc.${hyper.domain}"; package = pkgs.open-web-calendar; settings = { # PORT = 21342; @@ -11,4 +10,5 @@ calendarSettings = { }; }; }; + # proxy endpoint is done is done automatically } diff --git a/system-modules/nx2site/proxy.nix b/system-modules/nx2site/proxy.nix index d9d3753..a7516ab 100644 --- a/system-modules/nx2site/proxy.nix +++ b/system-modules/nx2site/proxy.nix @@ -156,6 +156,10 @@ listen = dl; locations = { "/" = { proxyPass = "http://127.0.0.1:5232"; }; }; }); + "nxc.${hyper.domain}" = lib.mkIf config.services.radicale.enable (vh // { + listen = dl; + locations = { "/" = { proxyPass = "http://127.0.0.1:14243"; }; }; + }); # "nc.${hyper.domain}" = vh // { # # directly to nc # }; @@ -185,17 +189,13 @@ }; }; # is done atomatically - # "cal.${hyper.domain}" = vh // { + # "owc.${hyper.domain}" = vh // { # listen = dl; # locations = { "/" = { # proxyPass = "http://unix:///run/open-web-calendar/socket"; # proxyWebsockets = true; # }; }; # }; - # "baikal.${hyper.domain}" = { - # forceSSL = true; - # enableACME = true; - # }; "file.${hyper.domain}" = { # copyparty listen = dl; forceSSL = true; diff --git a/system-modules/postgres.nix b/system-modules/postgres.nix index b441bca..62b9a47 100644 --- a/system-modules/postgres.nix +++ b/system-modules/postgres.nix @@ -28,6 +28,7 @@ "vaultwarden" "paperless" "nextcloud" + "nxcaldav" ]; settings = { port = 5432; # default @@ -54,6 +55,10 @@ name = "paperless"; ensureDBOwnership = true; } + { + name = "nxcaldav"; + ensureDBOwnership = true; + } ]; }; postgresqlBackup = {