diff options
author | Markus Hihn <markus.hihn@dcso.de> | 2018-01-16 14:46:23 +0100 |
---|---|---|
committer | Markus Hihn <markus.hihn@dcso.de> | 2018-01-16 14:46:23 +0100 |
commit | 1062100c78b2710493869b41bdb80c91b0bf024f (patch) | |
tree | eb273130855884aaa5cc28bba0b70b9e2dc7540d /lass/1systems | |
parent | 05b3e4b0cb4e83dcc84939919ca0a83e694606bf (diff) | |
parent | 74d1531be988057ccadd3de5184d915dcf84c92d (diff) |
Merge branch 'master' of prism.r:stockholm
Diffstat (limited to 'lass/1systems')
-rw-r--r-- | lass/1systems/daedalus/config.nix | 3 | ||||
-rw-r--r-- | lass/1systems/prism/config.nix | 11 |
2 files changed, 6 insertions, 8 deletions
diff --git a/lass/1systems/daedalus/config.nix b/lass/1systems/daedalus/config.nix index 8ec74458..609fae3c 100644 --- a/lass/1systems/daedalus/config.nix +++ b/lass/1systems/daedalus/config.nix @@ -40,6 +40,9 @@ with import <stockholm/lib>; zathura skype wine + geeqie + vlc + minecraft ]; nixpkgs.config.firefox.enableAdobeFlash = true; services.xserver.enable = true; diff --git a/lass/1systems/prism/config.nix b/lass/1systems/prism/config.nix index 03e9f6ee..087aaab0 100644 --- a/lass/1systems/prism/config.nix +++ b/lass/1systems/prism/config.nix @@ -289,13 +289,6 @@ in { alias /var/realwallpaper/realwallpaper.png; ''; } - { - services.minecraft-server.enable = true; - krebs.iptables.tables.filter.INPUT.rules = [ - { predicate = "-p tcp --dport 25565"; target = "ACCEPT"; } - { predicate = "-p udp --dport 25565"; target = "ACCEPT"; } - ]; - } <stockholm/krebs/2configs/reaktor-krebs.nix> <stockholm/lass/2configs/dcso-dev.nix> { @@ -307,7 +300,7 @@ in { jeschli-brauerei ]; repo = [ config.krebs.git.repos.stockholm ]; - perm = with git; push "refs/heads/staging/jeschli" [ fast-forward non-fast-forward create delete merge ]; + perm = with git; push "refs/heads/staging/jeschli*" [ fast-forward non-fast-forward create delete merge ]; } ]; } @@ -318,6 +311,8 @@ in { RandomizedDelaySec = "2min"; }; } + <stockholm/lass/2configs/downloading.nix> + <stockholm/lass/2configs/minecraft.nix> ]; krebs.build.host = config.krebs.hosts.prism; |