thary/sp-config
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sp-modules: get rid of systemd.tmpfiles

Browse Source 
Because it causes troubles when using bind-mounts for /var/lib/*.
This commit is contained in:
Alexander Tomokhov
2023-12-18 15:33:09 +04:00
parent 83e8f6e8a1
commit 67c2b12c44
4 changed files with 48 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
sp-modules/pleroma/module.nix
View File

@@ -18,11 +18,19 @@ in
fileSystems = lib.mkIf sp.useBinds {
"/var/lib/pleroma" = {
device = "/volumes/${sp.modules.pleroma.location}/pleroma";
options = [ "bind" ];
options = [
"bind"
"x-systemd.required-by=pleroma-secrets.service"
"x-systemd.required-by=pleroma.service"
];
};
"/var/lib/postgresql" = {
device = "/volumes/${sp.modules.pleroma.location}/postgresql";
options = [ "bind" ];
options = [
"bind"
"x-systemd.required-by=pleroma-secrets.service"
"x-systemd.required-by=pleroma.service"
];
};
};
services = {
@@ -70,14 +78,12 @@ in
EOF
)
install -m 0750 -o pleroma -g pleroma -DT \
install -C -m 0700 -o pleroma -g pleroma -d /var/lib/pleroma
install -C -m 0700 -o pleroma -g pleroma -DT \
<(printf "%s" "$filecontents") ${secrets-exs}
'';
};
systemd.tmpfiles.rules = [
"d /var/lib/pleroma 0700 pleroma pleroma - -"
"f ${secrets-exs} 0755 pleroma pleroma - -"
];
environment.etc."setup.psql".text = ''
CREATE USER pleroma;
CREATE DATABASE pleroma OWNER pleroma;