diff options
| author | nin <nineinchnade@gmail.com> | 2017-09-14 22:57:46 +0200 |
|---|---|---|
| committer | nin <nineinchnade@gmail.com> | 2017-09-14 22:57:46 +0200 |
| commit | 56054fe431aca35119df307f2098f823fc03d1e9 (patch) | |
| tree | 052c12e402d95ea2bf9b4a8c466480e7d59bf3ce /krebs/1systems | |
| parent | 036bd54f3142ba05409b742a809c3082176e4596 (diff) | |
| parent | de16ae2a12145901c3d9e2efef062b161b9448e3 (diff) | |
Merge remote-tracking branch 'prism/master'
Diffstat (limited to 'krebs/1systems')
| -rw-r--r-- | krebs/1systems/hotdog/config.nix | 1 | ||||
| -rw-r--r-- | krebs/1systems/puyak/config.nix | 9 |
2 files changed, 10 insertions, 0 deletions
diff --git a/krebs/1systems/hotdog/config.nix b/krebs/1systems/hotdog/config.nix index 4807307ff..2ad22f49c 100644 --- a/krebs/1systems/hotdog/config.nix +++ b/krebs/1systems/hotdog/config.nix @@ -10,6 +10,7 @@ <stockholm/krebs/2configs> <stockholm/krebs/2configs/buildbot-all.nix> + <stockholm/krebs/2configs/gitlab-runner-shackspace.nix> <stockholm/krebs/2configs/binary-cache/nixos.nix> ]; diff --git a/krebs/1systems/puyak/config.nix b/krebs/1systems/puyak/config.nix index 31cc024af..978bd18e0 100644 --- a/krebs/1systems/puyak/config.nix +++ b/krebs/1systems/puyak/config.nix @@ -14,6 +14,7 @@ <stockholm/krebs/2configs/go.nix> <stockholm/krebs/2configs/ircd.nix> <stockholm/krebs/2configs/news.nix> + <stockholm/krebs/2configs/news-spam.nix> ]; krebs.build.host = config.krebs.hosts.puyak; @@ -63,4 +64,12 @@ SUBSYSTEM=="net", ATTR{address}=="3c:97:0e:07:b9:14", NAME="et0" ''; + environment.systemPackages = [ pkgs.zsh ]; + boot.kernelModules = [ "kvm-intel" ]; + users.users.joerg = { + openssh.authorizedKeys.keys = [ config.krebs.users.Mic92.pubkey ]; + isNormalUser = true; + shell = "/run/current-system/sw/bin/zsh"; + }; + networking.firewall.allowedTCPPorts = [ 5901 ]; } |