diff options
| author | makefu <github@syntax-fehler.de> | 2017-12-08 13:33:48 +0100 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2017-12-08 13:33:48 +0100 |
| commit | 3faa41106961e7a52e9400be23cdf10b64f4932c (patch) | |
| tree | ccd6b4f1fea4b58484440da6f613ddbf55b3fe92 /lass/1systems/prism | |
| parent | 04e6eeb7c8e2e3141293a84bc147265725208999 (diff) | |
| parent | a9b72bd2901ca232eb7b6523c535c593a36521ef (diff) | |
Merge remote-tracking branch 'lass/master'
Diffstat (limited to 'lass/1systems/prism')
| -rw-r--r-- | lass/1systems/prism/config.nix | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lass/1systems/prism/config.nix b/lass/1systems/prism/config.nix index b7f0ea554..b18abf509 100644 --- a/lass/1systems/prism/config.nix +++ b/lass/1systems/prism/config.nix @@ -285,6 +285,8 @@ in { { predicate = "-p udp --dport 25565"; target = "ACCEPT"; } ]; } + <stockholm/krebs/2configs/reaktor-krebs.nix> + <stockholm/lass/2configs/dcso-dev.nix> ]; krebs.build.host = config.krebs.hosts.prism; |