diff options
| author | lassulus <lass@aidsballs.de> | 2015-09-05 12:17:59 +0200 |
|---|---|---|
| committer | lassulus <lass@aidsballs.de> | 2015-09-05 12:17:59 +0200 |
| commit | f54a0a9ea7fd5a9902a5b38786da42f06d615b5a (patch) | |
| tree | d7c475b212d8acc35a5dc7d20ec1f2228c664010 /krebs/3modules/default.nix | |
| parent | f3c1727659c59ff638b1adead8e30ee2f79f39de (diff) | |
| parent | d6d9956abc60548c755d30e6a5bd13c10abbb181 (diff) | |
Merge branch 'makefu'
Diffstat (limited to 'krebs/3modules/default.nix')
| -rw-r--r-- | krebs/3modules/default.nix | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/krebs/3modules/default.nix b/krebs/3modules/default.nix index 78907960b..c683d406c 100644 --- a/krebs/3modules/default.nix +++ b/krebs/3modules/default.nix @@ -11,6 +11,7 @@ let ./github-hosts-sync.nix ./git.nix ./nginx.nix + ./Reaktor.nix ./retiolum.nix ./urlwatch.nix ]; @@ -332,11 +333,11 @@ let }; users = addNames { lass = { - pubkey = readFile ../../Zpubkeys/lass.ssh.pub; + pubkey = readFile ../Zpubkeys/lass.ssh.pub; mail = "lass@mors.retiolum"; }; uriel = { - pubkey = readFile ../../Zpubkeys/uriel.ssh.pub; + pubkey = readFile ../Zpubkeys/uriel.ssh.pub; mail = "lass@uriel.retiolum"; }; }; @@ -468,6 +469,7 @@ let IN MX 10 mx42 euer IN MX 1 aspmx.l.google.com. io IN NS pigstarter.krebsco.de. + euer IN A ${elemAt nets.internet.addrs4 0} pigstarter IN A ${elemAt nets.internet.addrs4 0} conf IN A ${elemAt nets.internet.addrs4 0} gold IN A ${elemAt nets.internet.addrs4 0} @@ -543,7 +545,7 @@ let users = addNames { makefu = { mail = "makefu@pornocauster.retiolum"; - pubkey = readFile ../../Zpubkeys/makefu_arch.ssh.pub; + pubkey = readFile ../Zpubkeys/makefu_arch.ssh.pub; }; }; }; @@ -714,11 +716,11 @@ let users = addNames { mv = { mail = "mv@cd.retiolum"; - pubkey = readFile ../../Zpubkeys/mv_vod.ssh.pub; + pubkey = readFile ../Zpubkeys/mv_vod.ssh.pub; }; tv = { mail = "tv@wu.retiolum"; - pubkey = readFile ../../Zpubkeys/tv_wu.ssh.pub; + pubkey = readFile ../Zpubkeys/tv_wu.ssh.pub; }; }; }; |