diff options
| author | jeschli <jeschli@gmail.com> | 2018-02-28 20:10:42 +0000 |
|---|---|---|
| committer | jeschli <jeschli@gmail.com> | 2018-02-28 20:10:42 +0000 |
| commit | a7e49dd5fc590ba2ccb26d559d672767c87a7692 (patch) | |
| tree | 3d0fb66d17085f1288037da1b4d9987fa402e40e /lass/1systems/prism | |
| parent | 4a2af184e6846f80b139357c6230558cd8785b10 (diff) | |
| parent | 4c0d0f64ed21d3d7292bb5e8900d973e649375c1 (diff) | |
Merge branch 'staging/jeschli' of prism.i:stockholm into staging/jeschli
Diffstat (limited to 'lass/1systems/prism')
| -rw-r--r-- | lass/1systems/prism/config.nix | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/lass/1systems/prism/config.nix b/lass/1systems/prism/config.nix index 087aaab06..c0e4620cc 100644 --- a/lass/1systems/prism/config.nix +++ b/lass/1systems/prism/config.nix @@ -292,11 +292,22 @@ in { <stockholm/krebs/2configs/reaktor-krebs.nix> <stockholm/lass/2configs/dcso-dev.nix> { + users.users.jeschli = { + uid = genid "jeschli"; + isNormalUser = true; + openssh.authorizedKeys.keys = with config.krebs.users; [ + jeschli.pubkey + jeschli-bln.pubkey + jeschli-bolide.pubkey + jeschli-brauerei.pubkey + ]; + }; krebs.git.rules = [ { user = with config.krebs.users; [ jeschli jeschli-bln + jeschli-bolide jeschli-brauerei ]; repo = [ config.krebs.git.repos.stockholm ]; @@ -313,6 +324,18 @@ in { } <stockholm/lass/2configs/downloading.nix> <stockholm/lass/2configs/minecraft.nix> + { + services.taskserver = { + enable = true; + fqdn = "lassul.us"; + listenHost = "::"; + listenPort = 53589; + organisations.lass.users = [ "lass" "android" ]; + }; + krebs.iptables.tables.filter.INPUT.rules = [ + { predicate = "-p tcp --dport 53589"; target = "ACCEPT"; } + ]; + } ]; krebs.build.host = config.krebs.hosts.prism; |