Merge remote-tracking branch 'lass/master'

This commit is contained in:
makefu 2017-10-08 21:25:00 +02:00
commit 32e6aed36a
No known key found for this signature in database
GPG Key ID: 36F7711F3FC0F225
4 changed files with 2 additions and 2 deletions

View File

@ -13,6 +13,8 @@
<stockholm/krebs/2configs/gitlab-runner-shackspace.nix>
<stockholm/krebs/2configs/binary-cache/nixos.nix>
<stockholm/krebs/2configs/ircd.nix>
<stockholm/krebs/2configs/reaktor-krebs.nix>
<stockholm/krebs/2configs/reaktor-retiolum.nix>
];
krebs.build.host = config.krebs.hosts.hotdog;

View File

@ -230,8 +230,6 @@ in {
<stockholm/lass/2configs/paste.nix>
<stockholm/lass/2configs/syncthing.nix>
<stockholm/lass/2configs/reaktor-coders.nix>
<stockholm/lass/2configs/reaktor-krebs.nix>
<stockholm/lass/2configs/reaktor-retiolum.nix>
<stockholm/lass/2configs/ciko.nix>
<stockholm/lass/2configs/container-networking.nix>
{ # quasi bepasty.nix