summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlassulus <lass@aidsballs.de>2015-09-13 16:39:02 +0200
committerlassulus <lass@aidsballs.de>2015-09-13 16:39:02 +0200
commite83f8f3baaf4b0f862e9257e5bdd3c4a484c3a3b (patch)
tree07fe49d89dc796e097bb59e8daac13bcfee7bd78
parente863eae0eadf2b57076121264d7798177640a194 (diff)
parentbf826b0cc33ca860df83efde5746e6f516df2fa8 (diff)
Merge branch 'makefu'
-rw-r--r--krebs/3modules/retiolum.nix4
-rw-r--r--makefu/1systems/pnp.nix1
2 files changed, 3 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";
};
};
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 = {