diff options
| author | makefu <github@syntax-fehler.de> | 2015-10-14 00:17:15 +0200 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2015-10-14 00:17:15 +0200 |
| commit | df3dc3dac1f6c1cc36dbbea506e3d610aa1b417d (patch) | |
| tree | 038a837b20d267d0ba5aad837884b6a5a9087613 /lass/1systems | |
| parent | f73fe104d84b2f0d2fc3b4f0342c36735b3fb220 (diff) | |
| parent | 96f4248b65ff1539eded24572ae1805b27c53d50 (diff) | |
Merge remote-tracking branch 'cd/master'
Diffstat (limited to 'lass/1systems')
| -rw-r--r-- | lass/1systems/echelon.nix | 5 | ||||
| -rw-r--r-- | lass/1systems/mors.nix | 1 |
2 files changed, 5 insertions, 1 deletions
diff --git a/lass/1systems/echelon.nix b/lass/1systems/echelon.nix index b301b504a..1320e0782 100644 --- a/lass/1systems/echelon.nix +++ b/lass/1systems/echelon.nix @@ -14,6 +14,9 @@ in { ../2configs/realwallpaper-server.nix ../2configs/privoxy-retiolum.nix ../2configs/git.nix + ../2configs/redis.nix + ../2configs/go.nix + ../2configs/ircd.nix { networking.interfaces.enp2s1.ip4 = [ { @@ -44,6 +47,6 @@ in { }; }; - networking.hostName = "echelon"; + networking.hostName = config.krebs.build.host.name; } diff --git a/lass/1systems/mors.nix b/lass/1systems/mors.nix index 5cc03501f..c0c33828b 100644 --- a/lass/1systems/mors.nix +++ b/lass/1systems/mors.nix @@ -24,6 +24,7 @@ ../2configs/bitlbee.nix ../2configs/firefoxPatched.nix ../2configs/realwallpaper.nix + ../2configs/skype.nix ]; krebs.build = { |