diff options
| -rw-r--r-- | config/users.nix | 8 | ||||
| -rw-r--r-- | config/web-server.nix | 6 | ||||
| -rw-r--r-- | data/aliases.nix | 1 | ||||
| -rw-r--r-- | machines/container-shape.nix | 1 |
4 files changed, 13 insertions, 3 deletions
diff --git a/config/users.nix b/config/users.nix index 53de154..f8c6a9f 100644 --- a/config/users.nix +++ b/config/users.nix @@ -15,10 +15,18 @@ ]; }; fcgi = { name = "fcgi"; group = "fcgi"; uid = 500; }; + systemhttpd = { + name = "systemhttpd"; + group = "systemhttpd"; + createHome = true; + uid = 502; + home = "/var/lib/systemhttpd"; + }; }; extraGroups = { fcgi = { name = "fcgi"; gid = 500; }; plugdev = { name = "plugdev"; gid = 501; }; + systemhttpd = { name = "systemhttpd"; gid = 502; }; }; }; } diff --git a/config/web-server.nix b/config/web-server.nix index 24129b0..a53f369 100644 --- a/config/web-server.nix +++ b/config/web-server.nix @@ -34,9 +34,9 @@ locations."@storage" = { root = "/storage/srv/kj.orbekk.com"; }; - locations."/beta" = { - alias = "${pkgs.www-orbekk}"; - }; + locations."/systemd" = { + proxyPass = "http://10.0.20.15:11105/"; + }; locations."/hledger" = { extraConfig = ''return 302 /hledger/;''; }; diff --git a/data/aliases.nix b/data/aliases.nix index 77eb7e0..8427547 100644 --- a/data/aliases.nix +++ b/data/aliases.nix @@ -8,5 +8,6 @@ rec { matrixFederation = { address = ip.shape; port = 8448; }; git = { address = ip.shape; port = 11103; }; fcgi = { address = ip.shape; port = 11104; }; + systemhttpd = { address = ip.shape; port = 11105; }; }; } diff --git a/machines/container-shape.nix b/machines/container-shape.nix index 5bee62b..db9df2f 100644 --- a/machines/container-shape.nix +++ b/machines/container-shape.nix @@ -13,6 +13,7 @@ ../config/mail-server.nix ../config/dns.nix ../config/borg-backup.nix + ../config/systemhttpd.nix ]; users.defaultUserShell = lib.mkForce pkgs.bash; |