diff --git a/config/globals.nix b/config/globals.nix index 7dd7ff6..6977146 100644 --- a/config/globals.nix +++ b/config/globals.nix @@ -37,5 +37,9 @@ url = "levr.porzh.me"; user = "levr"; }; + wikijs = { + url = "notes.porzh.me"; + port = 3002 ; + }; }; } diff --git a/modules/services/wikijs.nix b/modules/services/wikijs.nix index f17ec9f..8da2a7e 100644 --- a/modules/services/wikijs.nix +++ b/modules/services/wikijs.nix @@ -1,18 +1,22 @@ { pkgs, ... }: -{ +let + globals = import ../../config/globals.nix ; +in { systemd.services.wiki-js = { requires = [ "postgresql.service" ]; after = [ "postgresql.service" ]; }; services.wiki-js = { enable = true; - port = 3002 ; - settings.db = { - db = "wiki-js"; - host = "/run/postgresql"; - type = "postgres"; - user = "wiki-js"; - }; + settings = { + db = { + db = "wiki-js"; + host = "/run/postgresql"; + type = "postgres"; + user = "wiki-js"; + }; + port = 3002 ; + }; }; services.postgresql = { enable = true; @@ -23,7 +27,7 @@ }]; }; - services.caddy.virtualHosts."notes.porzh.me".extraConfig = '' - reverse_proxy 127.0.0.1:3004 + services.caddy.virtualHosts.${globals.services.wikijs.url}.extraConfig = '' + reverse_proxy localhost:${toString globals.services.wikijs.port} ''; }