public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

couchdb: remove redundant customConfigFile

Browse Source
This commit is contained in:
Domen Kožar 2014-02-27 14:34:19 +01:00
parent d6a3cada9b
commit ab0aae42a4
2 changed files with 10 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
nixos/modules/services/databases/couchdb.nix
View File

@ -131,21 +131,12 @@ in
}; };
extraConfig = mkOption { extraConfig = mkOption {
type = types.string; type = types.lines;
default = ""; default = "";
description = '' description = ''
Extra configuration. Overrides any other cofiguration. Extra configuration. Overrides any other cofiguration.
''; '';
}; };
customConfigFile = mkOption {
type = types.string;
default = "/var/lib/couchdb/custom.ini";
description = ''
Custom configuration file. File needs to be readable and writable
from couchdb user/group.
'';
};
}; };
}; };
@ -162,30 +153,15 @@ in
preStart = preStart =
'' ''
if ! test -e ${cfg.pidFile}; then
mkdir -p `dirname ${cfg.pidFile}`; mkdir -p `dirname ${cfg.pidFile}`;
fi
if ! test -e ${cfg.uriFile}; then
mkdir -p `dirname ${cfg.uriFile}`; mkdir -p `dirname ${cfg.uriFile}`;
fi
if ! test -e ${cfg.logFile}; then
mkdir -p `dirname ${cfg.logFile}`; mkdir -p `dirname ${cfg.logFile}`;
touch ${cfg.logFile}; touch ${cfg.logFile};
fi
if ! test -e ${cfg.customConfigFile}; then
mkdir -p `dirname ${cfg.customConfigFile}`;
touch ${cfg.customConfigFile};
fi
if ! test -e ${cfg.databaseDir}; then
mkdir -p ${cfg.databaseDir}; mkdir -p ${cfg.databaseDir};
fi
if ! test -e ${cfg.viewIndexDir}; then
mkdir -p ${cfg.viewIndexDir}; mkdir -p ${cfg.viewIndexDir};
fi
chown ${cfg.user}:${cfg.group} `dirname ${cfg.pidFile}` chown ${cfg.user}:${cfg.group} `dirname ${cfg.pidFile}`
chown ${cfg.user}:${cfg.group} `dirname ${cfg.uriFile}` chown ${cfg.user}:${cfg.group} `dirname ${cfg.uriFile}`
chown ${cfg.user}:${cfg.group} ${cfg.logFile} chown ${cfg.user}:${cfg.group} ${cfg.logFile}
chown ${cfg.user}:${cfg.group} ${cfg.customConfigFile}
chown ${cfg.user}:${cfg.group} ${cfg.databaseDir} chown ${cfg.user}:${cfg.group} ${cfg.databaseDir}
chown ${cfg.user}:${cfg.group} ${cfg.viewIndexDir} chown ${cfg.user}:${cfg.group} ${cfg.viewIndexDir}
''; '';
@ -195,7 +171,7 @@ in
User = cfg.user; User = cfg.user;
Group = cfg.group; Group = cfg.group;
Type = "forking"; Type = "forking";
ExecStart = "${cfg.package}/bin/couchdb -b -o /dev/null -e /dev/null -p ${cfg.pidFile} -a ${configFile} -a ${configExtraFile} -a ${cfg.customConfigFile}"; ExecStart = "${cfg.package}/bin/couchdb -b -o /dev/null -e /dev/null -p ${cfg.pidFile} -a ${configFile} -a ${configExtraFile}";
ExecStop = "${cfg.package}/bin/couchdb -d"; ExecStop = "${cfg.package}/bin/couchdb -d";
}; };
}; };

2
pkgs/top-level/all-packages.nix
View File

@ -6175,6 +6175,8 @@ let
couchdb = callPackage ../servers/http/couchdb { couchdb = callPackage ../servers/http/couchdb {
spidermonkey = spidermonkey_185; spidermonkey = spidermonkey_185;
python = python27;
sphinx = python27Packages.sphinx;
}; };
dico = callPackage ../servers/dico { }; dico = callPackage ../servers/dico { };