diff options
| author | tv <tv@shackspace.de> | 2015-10-09 14:48:58 +0200 |
|---|---|---|
| committer | tv <tv@shackspace.de> | 2015-10-09 14:48:58 +0200 |
| commit | 96f4248b65ff1539eded24572ae1805b27c53d50 (patch) | |
| tree | 31ff450cc4a5166306c62f99fdd2d1caf3219ecb /lass/1systems | |
| parent | 694c79a5bc05014604fa2467f965b370102ff78f (diff) | |
| parent | 4072a32f89b9cc1c1e7c3583ac5b9ce5dcb004af (diff) | |
Merge remote-tracking branch 'cloudkrebs/master'
Diffstat (limited to 'lass/1systems')
| -rw-r--r-- | lass/1systems/echelon.nix | 6 | ||||
| -rw-r--r-- | lass/1systems/mors.nix | 1 |
2 files changed, 6 insertions, 1 deletions
diff --git a/lass/1systems/echelon.nix b/lass/1systems/echelon.nix index 45f7ebd70..1320e0782 100644 --- a/lass/1systems/echelon.nix +++ b/lass/1systems/echelon.nix @@ -13,6 +13,10 @@ in { ../2configs/retiolum.nix ../2configs/realwallpaper-server.nix ../2configs/privoxy-retiolum.nix + ../2configs/git.nix + ../2configs/redis.nix + ../2configs/go.nix + ../2configs/ircd.nix { networking.interfaces.enp2s1.ip4 = [ { @@ -43,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 = { |