mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-22 23:13:19 +00:00
treewide: ReadWriteDirectories -> ReadWritePaths.
These were renamed in systemd v231:
2a624c36e6
This commit is contained in:
parent
7b6b627a66
commit
9d7a729277
@ -350,7 +350,7 @@ in {
|
||||
RestartSec = "10s";
|
||||
CacheDirectory = dirs cacheDirs;
|
||||
RuntimeDirectory = dirName;
|
||||
ReadWriteDirectories = lib.mkIf useCustomDir [ cfg.storageDir ];
|
||||
ReadWritePaths = lib.mkIf useCustomDir [ cfg.storageDir ];
|
||||
StateDirectory = dirs (lib.optionals (!useCustomDir) libDirs);
|
||||
LogsDirectory = dirName;
|
||||
PrivateTmp = true;
|
||||
|
@ -107,7 +107,7 @@ in
|
||||
UMask = "0077";
|
||||
Environment = "HOME=%S/step-ca";
|
||||
WorkingDirectory = ""; # override upstream
|
||||
ReadWriteDirectories = ""; # override upstream
|
||||
ReadWritePaths = ""; # override upstream
|
||||
|
||||
# LocalCredential handles file permission problems arising from the use of DynamicUser.
|
||||
LoadCredential = "intermediate_password:${cfg.intermediatePasswordFile}";
|
||||
|
@ -368,7 +368,7 @@ in
|
||||
ExecReload = [ "" ''${cfg.package}/bin/caddy reload ${runOptions} --force'' ];
|
||||
User = cfg.user;
|
||||
Group = cfg.group;
|
||||
ReadWriteDirectories = cfg.dataDir;
|
||||
ReadWritePaths = [ cfg.dataDir ];
|
||||
StateDirectory = mkIf (cfg.dataDir == "/var/lib/caddy") [ "caddy" ];
|
||||
LogsDirectory = mkIf (cfg.logDir == "/var/log/caddy") [ "caddy" ];
|
||||
Restart = "on-failure";
|
||||
|
@ -170,7 +170,7 @@ in {
|
||||
PrivateDevices = true;
|
||||
ProtectHome = true;
|
||||
ProtectSystem = "full";
|
||||
ReadWriteDirectories = cfg.dataDir;
|
||||
ReadWritePaths = [ cfg.dataDir ];
|
||||
RuntimeDirectory = "traefik";
|
||||
};
|
||||
};
|
||||
|
Loading…
Reference in New Issue
Block a user