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

Merge pull request #1911 from offlinehacker/nixos/couchdb/fix

Browse Source 
nixos/couchdb: fix stopping of service, by making it non-forking, a few other improvments
This commit is contained in:
Mathijs Kwik 2014-03-11 09:35:27 +01:00
commit 42d7923752
1 changed files with 9 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,9 +1,7 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
with pkgs.lib;
with pkgs.lib;
let let
cfg = config.services.couchdb; cfg = config.services.couchdb;
configFile = pkgs.writeText "couchdb.ini" configFile = pkgs.writeText "couchdb.ini"
'' ''
@ -19,10 +17,8 @@ let
[log] [log]
file = ${cfg.logFile} file = ${cfg.logFile}
''; '';
configExtraFile = pkgs.writeText "couchdb-extra.ini" cfg.extraConfig;
in in {
{
###### interface ###### interface
@ -64,14 +60,6 @@ in
''; '';
}; };
pidFile = mkOption {
type = types.path;
default = "/var/run/couchdb/couchdb.pid";
description = ''
pid file.
'';
};
# couchdb options: http://docs.couchdb.org/en/latest/config/index.html # couchdb options: http://docs.couchdb.org/en/latest/config/index.html
databaseDir = mkOption { databaseDir = mkOption {
@ -153,26 +141,23 @@ in
preStart = preStart =
'' ''
mkdir -p `dirname ${cfg.pidFile}`;
mkdir -p `dirname ${cfg.uriFile}`; mkdir -p `dirname ${cfg.uriFile}`;
mkdir -p `dirname ${cfg.logFile}`; mkdir -p `dirname ${cfg.logFile}`;
touch ${cfg.logFile};
mkdir -p ${cfg.databaseDir}; mkdir -p ${cfg.databaseDir};
mkdir -p ${cfg.viewIndexDir}; mkdir -p ${cfg.viewIndexDir};
chown ${cfg.user}:${cfg.group} `dirname ${cfg.pidFile}`
if [ "$(id -u)" = 0 ]; then
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.databaseDir} chown ${cfg.user}:${cfg.group} ${cfg.databaseDir}
chown ${cfg.user}:${cfg.group} ${cfg.viewIndexDir} chown ${cfg.user}:${cfg.group} ${cfg.viewIndexDir}
fi
''; '';
serviceConfig = { serviceConfig = {
PermissionsStartOnly = true; PermissionsStartOnly = true;
User = cfg.user; User = cfg.user;
Group = cfg.group; Group = cfg.group;
Type = "forking"; ExecStart = "${cfg.package}/bin/couchdb -a ${configFile} -a ${pkgs.writeText "couchdb-extra.ini" cfg.extraConfig}";
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";
}; };
}; };