diff options
| author | Aaron Andersen <aaron@fosslib.net> | 2019-02-24 16:04:37 -0500 |
|---|---|---|
| committer | Aaron Andersen <aaron@fosslib.net> | 2019-04-13 07:00:59 -0400 |
| commit | 6ac630bad3f2ba002548c57a763df91af8c185cf (patch) | |
| tree | ae891a5771482d98b1d3efe0cc29ac9fe6fb3b97 /nixos/modules/services/misc/etcd.nix | |
| parent | 062efe018d571b1daa9c37b8c99eb39ad47d7342 (diff) | |
| download | nixpkgs-6ac630bad3f2ba002548c57a763df91af8c185cf.tar nixpkgs-6ac630bad3f2ba002548c57a763df91af8c185cf.tar.gz nixpkgs-6ac630bad3f2ba002548c57a763df91af8c185cf.tar.bz2 nixpkgs-6ac630bad3f2ba002548c57a763df91af8c185cf.tar.lz nixpkgs-6ac630bad3f2ba002548c57a763df91af8c185cf.tar.xz nixpkgs-6ac630bad3f2ba002548c57a763df91af8c185cf.tar.zst nixpkgs-6ac630bad3f2ba002548c57a763df91af8c185cf.zip | |
nixos/etcd: replace deprecated usage of PermissionsStartOnly
see https://github.com/NixOS/nixpkgs/issues/53852
Diffstat (limited to 'nixos/modules/services/misc/etcd.nix')
| -rw-r--r-- | nixos/modules/services/misc/etcd.nix | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/nixos/modules/services/misc/etcd.nix b/nixos/modules/services/misc/etcd.nix index 2d1893dae64..e4d5322f9b5 100644 --- a/nixos/modules/services/misc/etcd.nix +++ b/nixos/modules/services/misc/etcd.nix @@ -142,6 +142,10 @@ in { }; config = mkIf cfg.enable { + systemd.tmpfiles.rules = [ + "d '${cfg.dataDir}' 0700 etcd - - -" + ]; + systemd.services.etcd = { description = "etcd key-value store"; wantedBy = [ "multi-user.target" ]; @@ -176,14 +180,8 @@ in { Type = "notify"; ExecStart = "${pkgs.etcd.bin}/bin/etcd"; User = "etcd"; - PermissionsStartOnly = true; LimitNOFILE = 40000; }; - - preStart = '' - mkdir -m 0700 -p ${cfg.dataDir} - if [ "$(id -u)" = 0 ]; then chown etcd ${cfg.dataDir}; fi - ''; }; environment.systemPackages = [ pkgs.etcdctl ]; |