From 2281516e57c6f9a34c4711184b5b19d83d47dc68 Mon Sep 17 00:00:00 2001 From: makefu Date: Wed, 9 Sep 2015 15:15:22 +0200 Subject: retiolum.nix: fix pidfile name --- krebs/3modules/retiolum.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/krebs/3modules/retiolum.nix b/krebs/3modules/retiolum.nix index 4e70b78aa..2617644d9 100644 --- a/krebs/3modules/retiolum.nix +++ b/krebs/3modules/retiolum.nix @@ -105,7 +105,7 @@ let after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; path = [ tinc iproute ]; - serviceConfig = { + serviceConfig = rec { PermissionsStartOnly = "true"; PrivateTmp = "true"; Restart = "always"; @@ -115,7 +115,7 @@ let #! /bin/sh install -o ${user.name} -m 0400 ${cfg.privateKeyFile} /tmp/retiolum-rsa_key.priv ''; - ExecStart = "${tinc}/sbin/tincd -c ${confDir} -d 0 -U ${user.name} -D"; + ExecStart = "${tinc}/sbin/tincd -c ${confDir} -d 0 -U ${user.name} -D --pidfile=/var/run/tinc.${SyslogIdentifier}.pid"; SyslogIdentifier = "retiolum"; }; }; -- cgit v1.2.3 From bf826b0cc33ca860df83efde5746e6f516df2fa8 Mon Sep 17 00:00:00 2001 From: makefu Date: Wed, 9 Sep 2015 15:16:34 +0200 Subject: makefu/pnp: use tinc_pre instead of tinc-stable --- makefu/1systems/pnp.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/makefu/1systems/pnp.nix b/makefu/1systems/pnp.nix index 98f3ecd22..e70fb6179 100644 --- a/makefu/1systems/pnp.nix +++ b/makefu/1systems/pnp.nix @@ -34,6 +34,7 @@ krebs.build.user = config.krebs.users.makefu; krebs.build.target = "root@pnp"; + nixpkgs.config.packageOverrides = pkgs: { tinc = pkgs.tinc_pre; }; krebs.build.deps = { nixpkgs = { -- cgit v1.2.3