git.iko.soy/typeable/nixpkgs
on master help sign in
Couchdb: Don't chown /var/log to couchdb (#65347)

Couchdb: Don't chown /var/log to couchdb

commitce82d0b61a914de18ab889951a31cdd64830d39a authorSilvan Mosberger <contact@infinisil.com> dateSat 10 Aug 2019, 01:36 (7 years ago) parentdf5323412eb0f5
2 files changed+4−6
nixos/modules/services/databases/couchdb.nix+3−5 nixos/tests/all-tests.nix+1−1
nixos/modules/services/databases/couchdb.nix+3−5
@@ -160,7 +160,7 @@ in {
160160
161161 systemd.tmpfiles.rules = [
162162 "d '${dirOf cfg.uriFile}' - ${cfg.user} ${cfg.group} - -"
163− "d '${dirOf cfg.logFile}' - ${cfg.user} ${cfg.group} - -"
163+ "f '${cfg.logFile}' - ${cfg.user} ${cfg.group} - -"
164164 "d '${cfg.databaseDir}' - ${cfg.user} ${cfg.group} - -"
165165 "d '${cfg.viewIndexDir}' - ${cfg.user} ${cfg.group} - -"
166166 ];
@@ -169,11 +169,9 @@ in {
169169 description = "CouchDB Server";
170170 wantedBy = [ "multi-user.target" ];
171171
172− preStart =
173− ''
172+ preStart = ''
174173 touch ${cfg.configFile}
175− touch -a ${cfg.logFile}
176− '';
174+ '';
177175
178176 environment = mkIf useVersion2 {
179177 # we are actually specifying 4 configuration files:
nixos/tests/all-tests.nix+1−1
@@ -56,7 +56,7 @@ in
5656 containers-physical_interfaces = handleTest ./containers-physical_interfaces.nix {};
5757 containers-restart_networking = handleTest ./containers-restart_networking.nix {};
5858 containers-tmpfs = handleTest ./containers-tmpfs.nix {};
59− #couchdb = handleTest ./couchdb.nix {}; # spidermonkey-1.8.5 is marked as broken
59+ couchdb = handleTest ./couchdb.nix {};
6060 deluge = handleTest ./deluge.nix {};
6161 dhparams = handleTest ./dhparams.nix {};
6262 dnscrypt-proxy = handleTestOn ["x86_64-linux"] ./dnscrypt-proxy.nix {};