From 0bebcd7d1fb10a9d4a191e1766597b08f3eff8c2 Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Sat, 18 Jan 2014 19:38:13 +0000
Subject: [PATCH] folders of pidFile and uriFile should be writable by couchdb
 user/group

---
 nixos/modules/services/databases/couchdb.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/databases/couchdb.nix b/nixos/modules/services/databases/couchdb.nix
index 926cb02c5e5b..334b0ac77297 100644
--- a/nixos/modules/services/databases/couchdb.nix
+++ b/nixos/modules/services/databases/couchdb.nix
@@ -167,7 +167,6 @@ in
         fi
         if ! test -e ${cfg.uriFile}; then
           mkdir -p `dirname ${cfg.uriFile}`;
-          touch ${cfg.uriFile};
         fi
         if ! test -e ${cfg.logFile}; then
           mkdir -p `dirname ${cfg.logFile}`;
@@ -183,8 +182,8 @@ in
         if ! test -e ${cfg.viewIndexDir}; then
           mkdir -p ${cfg.viewIndexDir};
         fi
-        chown ${cfg.user}:${cfg.group} ${cfg.pidFile}
-        chown ${cfg.user}:${cfg.group} ${cfg.uriFile}
+        chown ${cfg.user}:${cfg.group} `dirname ${cfg.pidFile}`
+        chown ${cfg.user}:${cfg.group} `dirname ${cfg.uriFile}`
         chown ${cfg.user}:${cfg.group} ${cfg.logFile}
         chown ${cfg.user}:${cfg.group} ${cfg.customConfigFile}
         chown ${cfg.user}:${cfg.group} ${cfg.databaseDir}