sp-modules: get rid of systemd.tmpfiles

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

View File

@@ -20,7 +20,11 @@
fileSystems = lib.mkIf sp.useBinds {
"/var/lib/nextcloud" = {
device = "/volumes/${sp.modules.nextcloud.location}/nextcloud";
options = [ "bind" ];
options = [
"bind"
"x-systemd.required-by=nextcloud-setup.service"
"x-systemd.required-by=nextcloud-secrets.service"
];
};
};
systemd.services.nextcloud-secrets = {
@@ -29,11 +33,11 @@
serviceConfig.Type = "oneshot";
path = with pkgs; [ coreutils jq ];
script = ''
install -m 0440 -o nextcloud -g nextcloud -DT \
install -C -m 0440 -o nextcloud -g nextcloud -DT \
<(jq -re '.modules.nextcloud.databasePassword' ${secrets-filepath}) \
${db-pass-filepath}
install -m 0440 -o nextcloud -g nextcloud -DT \
install -C -m 0440 -o nextcloud -g nextcloud -DT \
<(jq -re '.modules.nextcloud.adminPassword' ${secrets-filepath}) \
${admin-pass-filepath}
'';