diff options
author | Aaron Andersen <aaron@fosslib.net> | 2019-03-17 13:04:44 -0400 |
---|---|---|
committer | Aaron Andersen <aaron@fosslib.net> | 2019-04-13 07:00:58 -0400 |
commit | 062efe018d571b1daa9c37b8c99eb39ad47d7342 (patch) | |
tree | 83a85ca23f1b078c58d2ca4a1cadcff0985b8e37 /nixos/modules | |
parent | 56c7960d668664878975471ddf50c9964035bdeb (diff) | |
download | nixpkgs-062efe018d571b1daa9c37b8c99eb39ad47d7342.tar nixpkgs-062efe018d571b1daa9c37b8c99eb39ad47d7342.tar.gz nixpkgs-062efe018d571b1daa9c37b8c99eb39ad47d7342.tar.bz2 nixpkgs-062efe018d571b1daa9c37b8c99eb39ad47d7342.tar.lz nixpkgs-062efe018d571b1daa9c37b8c99eb39ad47d7342.tar.xz nixpkgs-062efe018d571b1daa9c37b8c99eb39ad47d7342.tar.zst nixpkgs-062efe018d571b1daa9c37b8c99eb39ad47d7342.zip |
nixos/couchdb: replace deprecated usage of PermissionsStartOnly
see https://github.com/NixOS/nixpkgs/issues/53852
Diffstat (limited to 'nixos/modules')
-rw-r--r-- | nixos/modules/services/databases/couchdb.nix | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/nixos/modules/services/databases/couchdb.nix b/nixos/modules/services/databases/couchdb.nix index 84d108d9c74..5ddf8ba4bfb 100644 --- a/nixos/modules/services/databases/couchdb.nix +++ b/nixos/modules/services/databases/couchdb.nix @@ -158,27 +158,21 @@ in { services.couchdb.configFile = mkDefault (if useVersion2 then "/var/lib/couchdb/local.ini" else "/var/lib/couchdb/couchdb.ini"); + systemd.tmpfiles.rules = [ + "d '${dirOf cfg.uriFile}' - ${cfg.user} ${cfg.group} - -" + "d '${dirOf cfg.logFile}' - ${cfg.user} ${cfg.group} - -" + "d '${cfg.databaseDir}' - ${cfg.user} ${cfg.group} - -" + "d '${cfg.viewIndexDir}' - ${cfg.user} ${cfg.group} - -" + ]; + systemd.services.couchdb = { description = "CouchDB Server"; wantedBy = [ "multi-user.target" ]; preStart = '' - mkdir -p `dirname ${cfg.uriFile}`; - mkdir -p `dirname ${cfg.logFile}`; - mkdir -p ${cfg.databaseDir}; - mkdir -p ${cfg.viewIndexDir}; touch ${cfg.configFile} touch -a ${cfg.logFile} - - if [ "$(id -u)" = 0 ]; then - chown ${cfg.user}:${cfg.group} `dirname ${cfg.uriFile}`; - (test -f ${cfg.uriFile} && chown ${cfg.user}:${cfg.group} ${cfg.uriFile}) || true - chown ${cfg.user}:${cfg.group} ${cfg.databaseDir} - chown ${cfg.user}:${cfg.group} ${cfg.viewIndexDir} - chown ${cfg.user}:${cfg.group} ${cfg.configFile} - chown ${cfg.user}:${cfg.group} ${cfg.logFile} - fi ''; environment = mkIf useVersion2 { @@ -191,7 +185,6 @@ in { }; serviceConfig = { - PermissionsStartOnly = true; User = cfg.user; Group = cfg.group; ExecStart = executable; |