Mic92/stockholm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'makefu'

Browse Source
This commit is contained in:
lassulus 2015-09-13 16:39:02 +02:00
commit e83f8f3baa
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
krebs/3modules/retiolum.nix
View File

@ -105,7 +105,7 @@ let
after = [ "network.target" ]; after = [ "network.target" ];
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
path = [ tinc iproute ]; path = [ tinc iproute ];
serviceConfig = { serviceConfig = rec {
PermissionsStartOnly = "true"; PermissionsStartOnly = "true";
PrivateTmp = "true"; PrivateTmp = "true";
Restart = "always"; Restart = "always";
@ -115,7 +115,7 @@ let
#! /bin/sh #! /bin/sh
install -o ${user.name} -m 0400 ${cfg.privateKeyFile} /tmp/retiolum-rsa_key.priv 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"; SyslogIdentifier = "retiolum";
}; };
}; };

1
makefu/1systems/pnp.nix
View File

@ -34,6 +34,7 @@
krebs.build.user = config.krebs.users.makefu; krebs.build.user = config.krebs.users.makefu;
krebs.build.target = "root@pnp"; krebs.build.target = "root@pnp";
nixpkgs.config.packageOverrides = pkgs: { tinc = pkgs.tinc_pre; };
krebs.build.deps = { krebs.build.deps = {
nixpkgs = { nixpkgs = {