diff options
author | Artyom Shalkhakov <artyom.shalkhakov@gmail.com> | 2015-01-29 21:56:26 +0600 |
---|---|---|
committer | Matthew Bauer <mjbauer95@gmail.com> | 2016-08-16 21:00:31 +0000 |
commit | 697982b91bfdce68758d79ce01b0fa1b444105ef (patch) | |
tree | 64fe466c30700404aee186a8a688413a7a9cdc7c /nixos/modules/services/networking/gdomap.nix | |
parent | d3d580ebbe1ef6330f194ed5fd9116030bd09025 (diff) |
gnustep: fix gdnc, gdomap
Both gdnc and gdomap seem to work.
Diffstat (limited to 'nixos/modules/services/networking/gdomap.nix')
-rw-r--r-- | nixos/modules/services/networking/gdomap.nix | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/nixos/modules/services/networking/gdomap.nix b/nixos/modules/services/networking/gdomap.nix index da78810f6b21..7b5ba4fcf100 100644 --- a/nixos/modules/services/networking/gdomap.nix +++ b/nixos/modules/services/networking/gdomap.nix @@ -4,7 +4,6 @@ with lib; let cfg = config.services.gdomap; - pidFile = "${cfg.pidDir}/gdomap.pid"; in { # @@ -20,9 +19,11 @@ in Note that gdomap runs as root. "; }; - pidDir = mkOption { - default = "/var/run/gdomap"; - description = "Location of the file which stores the PID of gdomap"; + + pidfile = mkOption { + type = types.path; + default = "/tmp/gdomap.pid"; + description = "Location of the pid file for gdomap daemon"; }; }; }; @@ -37,15 +38,11 @@ in wantedBy = [ "multi-user.target" ]; after = [ "network.target" ]; path = [ pkgs.gnustep_base ]; - preStart = '' - mkdir -m 0700 -p ${cfg.pidDir} - chown -R nobody:nobody ${cfg.pidDir} - ''; serviceConfig = { + PIDFile = cfg.pidfile; ExecStart = "@${pkgs.gnustep_base}/bin/gdomap" + " -d -p" - + " -I ${pidFile}"; -# + " -j ${cfg.pidDir}"; + + " -I ${cfg.pidfile}"; Restart = "always"; RestartSec = 2; TimeoutStartSec = "30"; @@ -53,4 +50,4 @@ in }; }; }; -}
\ No newline at end of file +} |