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

retiolum netname: hostname -> enum

Browse Source
This commit is contained in:
tv 2016-04-08 03:59:26 +02:00
parent 46e818ebbc
commit 7b7e8b11b5
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
krebs/3modules/retiolum.nix
View File

@ -17,7 +17,7 @@ let
}; };
netname = mkOption { netname = mkOption {
type = types.hostname; type = types.enum (attrNames cfg.host.nets);
default = "retiolum"; default = "retiolum";
description = '' description = ''
The tinc network name. The tinc network name.
@ -114,7 +114,7 @@ let
imp = { imp = {
environment.systemPackages = [ tinc iproute ]; environment.systemPackages = [ tinc iproute ];
systemd.services.retiolum = { systemd.services.${cfg.netname} = {
description = "Tinc daemon for Retiolum"; description = "Tinc daemon for Retiolum";
after = [ "network.target" ]; after = [ "network.target" ];
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
@ -125,12 +125,12 @@ let
Restart = "always"; Restart = "always";
# TODO we cannot chroot (-R) b/c we use symlinks to hosts # TODO we cannot chroot (-R) b/c we use symlinks to hosts
# and the private key. # and the private key.
ExecStartPre = pkgs.writeScript "retiolum-init" '' ExecStartPre = pkgs.writeScript "${cfg.netname}-prestart" ''
#! /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 --pidfile=/var/run/tinc.${SyslogIdentifier}.pid"; ExecStart = "${tinc}/sbin/tincd -c ${confDir} -d 0 -U ${user.name} -D --pidfile=/var/run/tinc.${SyslogIdentifier}.pid";
SyslogIdentifier = "retiolum"; SyslogIdentifier = cfg.netname;
}; };
}; };
@ -140,7 +140,7 @@ let
}; };
user = rec { user = rec {
name = "retiolum"; name = cfg.netname;
uid = genid name; uid = genid name;
}; };