diff options
author | nin <nineinchnade@gmail.com> | 2017-12-14 21:13:46 +0100 |
---|---|---|
committer | nin <nineinchnade@gmail.com> | 2017-12-14 21:13:46 +0100 |
commit | 37771ad34e18e0657636c8d0eb5b7392e3b89ba6 (patch) | |
tree | 8abda683b425494d2a273fc42d7573499b97a657 /lass/1systems/prism | |
parent | 7ed6fd18bb99884889a76ad9f597193861f44dc9 (diff) | |
parent | 04f7ae22d6d0720d06f78c712eb9cd245cefce82 (diff) |
Merge remote-tracking branch 'prism/master'
Diffstat (limited to 'lass/1systems/prism')
-rw-r--r-- | lass/1systems/prism/config.nix | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/lass/1systems/prism/config.nix b/lass/1systems/prism/config.nix index a0bc1b90..87270b8b 100644 --- a/lass/1systems/prism/config.nix +++ b/lass/1systems/prism/config.nix @@ -67,6 +67,11 @@ in { fsType = "ext4"; }; + fileSystems."/bku" = { + device = "/dev/pool/bku"; + fsType = "ext4"; + }; + swapDevices = [ { label = "swap1"; } { label = "swap2"; } @@ -220,8 +225,8 @@ in { }; enableTun = true; privateNetwork = true; - hostAddress = "10.233.2.4"; - localAddress = "10.233.2.5"; + hostAddress = "10.233.2.5"; + localAddress = "10.233.2.6"; }; } <stockholm/lass/2configs/exim-smarthost.nix> @@ -280,6 +285,17 @@ in { { predicate = "-p udp --dport 25565"; target = "ACCEPT"; } ]; } + <stockholm/krebs/2configs/reaktor-krebs.nix> + <stockholm/lass/2configs/dcso-dev.nix> + { + krebs.git.rules = [ + { + user = [ config.krebs.users.jeschli ]; + repo = [ config.krebs.git.repos.stockholm ]; + perm = with git; push "refs/heads/staging/jeschli" [ fast-forward non-fast-forward create delete merge ]; + } + ]; + } ]; krebs.build.host = config.krebs.hosts.prism; |