WIP: temmie/userweb: fcgiwrap

This commit is contained in:
h7x4
2026-06-17 13:58:11 +09:00
parent aa2712005a
commit a2078c590a
5 changed files with 119 additions and 25 deletions
+2 -1
View File
@@ -88,8 +88,9 @@ in
[[ -d "$dir" ]] || continue [[ -d "$dir" ]] || continue
uid="$(stat -c '%u' "$dir")" uid="$(stat -c '%u' "$dir")"
username="$(basename "$dir")"
mountpoint="/run/pvvhome/by-uid/$uid" mountpoint="/run/pvvhome/by-uid/$uid/$1/$username"
mkdir -p "$mountpoint" mkdir -p "$mountpoint"
unit_name=$(systemd-escape --path --suffix=mount "$mountpoint") unit_name=$(systemd-escape --path --suffix=mount "$mountpoint")
@@ -1,5 +1,6 @@
{ {
imports = [ imports = [
./fcgiwrap.nix
./httpd.nix ./httpd.nix
./log-processor.nix ./log-processor.nix
./mail.nix ./mail.nix
@@ -0,0 +1,85 @@
{ config, lib, pkgs, ... }:
let
mcfg = config.services.pvv-userweb;
in
{
config = lib.mkIf mcfg.enable {
systemd.slices.system-userweb-fcgiwrap = { };
# NOTE: expected %i here is the UID of the user
systemd.sockets."userweb-fcgiwrap@" = {
description = "UserWeb fcgiwrap server for user %i";
socketConfig = {
ListenStream = "/run/userweb-fcgiwrap/%i.sock";
RemoveOnStop = true;
SocketUser = "wwwrun";
SocketGroup = "wwwrun";
SocketMode = "0660";
};
};
systemd.services."userweb-fcgiwrap@" = {
after = [
"httpd-passwd-sync.service"
];
requires = [
"httpd-passwd-sync.service"
];
documentation = [ "man:fcgiwrap(8)" ];
unitConfig = {
AssertPathExists = "/run/pvvhome/by-uid/%i";
};
serviceConfig = {
Slice = "system-userweb-fcgiwrap.slice";
Type = "simple";
User = "%i";
ExecStart = "${lib.getExe pkgs.fcgiwrap}";
RuntimeDirectoryMode = "0750";
RuntimeDirectory = [
"fcgiwrap/%i/root-mnt"
];
RootDirectory = "/run/fcgiwrap/%i/root-mnt";
MountAPIVFS = true;
BindReadOnlyPaths = [
builtins.storeDir
"/etc"
# TODO: set up minimal fake passwd + group in `ExecStartPre` instead
"/var/lib/httpd-passwd-sync/passwd:/etc/passwd"
"/var/lib/httpd-passwd-sync/group:/etc/group"
"${pkgs.writeText "userweb-fake-nsswitch.conf" ''
passwd: files
group: files
shadow: files
sudoers: files
hosts: mymachines resolve [!UNAVAIL=return] files myhostname dns
networks: files
ethers: files
services: files
protocols: files
rpc: files
subuid: files
subgid: files
''}:/etc/nsswitch.conf"
] ++ lib.optionals mcfg.debugMode [
"/bin"
] ++ mcfg.fhsBindPaths;
# TODO: handle /amd/homepvv${l}
BindPaths = [
"/run/pvvhome/by-uid/%i:/home/pvv"
];
};
};
};
}
+1 -24
View File
@@ -277,30 +277,7 @@ in
"/dev/null" "/dev/null"
"/var/lib/acme" "/var/lib/acme"
"/var/run/nscd" "/var/run/nscd"
"${mcfg.fhsEnv}/bin:/bin" ] ++ mcfg.fhsBindPaths;
"${mcfg.fhsEnv}/sbin:/sbin"
"${mcfg.fhsEnv}/lib:/lib"
"${mcfg.fhsEnv}/share:/share"
] ++ (lib.mapCartesianProduct ({ parent, child }: "${mcfg.fhsEnv}${child}:${parent}${child}") {
parent = [
"/local"
"/opt"
"/opt/local"
"/store"
"/store/gnu"
"/usr"
"/usr/local"
"/run/current-system/sw"
];
child = [
"/bin"
"/sbin"
"/lib"
"/libexec"
"/include"
"/share"
];
});
BindPaths = (lib.mapCartesianProduct ({ directoryFn, letter }: "/run/pvvhome/${letter}:${directoryFn letter}${letter}") { BindPaths = (lib.mapCartesianProduct ({ directoryFn, letter }: "/run/pvvhome/${letter}:${directoryFn letter}${letter}") {
directoryFn = [ directoryFn = [
(_: "/home/pvv/") (_: "/home/pvv/")
+30
View File
@@ -106,6 +106,36 @@ in
]; ];
}; };
}; };
fhsBindPaths = lib.mkOption {
type = lib.types.listOf lib.types.str;
readOnly = true;
default = [
"${cfg.fhsEnv}/bin:/bin"
"${cfg.fhsEnv}/sbin:/sbin"
"${cfg.fhsEnv}/lib:/lib"
"${cfg.fhsEnv}/share:/share"
] ++ (lib.mapCartesianProduct ({ parent, child }: "${cfg.fhsEnv}${child}:${parent}${child}") {
parent = [
"/local"
"/opt"
"/opt/local"
"/store"
"/store/gnu"
"/usr"
"/usr/local"
"/run/current-system/sw"
];
child = [
"/bin"
"/sbin"
"/lib"
"/libexec"
"/include"
"/share"
];
});
};
}; };
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {