From 9eff022e421307723084159cb93b020cff7bc139 Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Sat, 5 Sep 2015 12:14:16 +0200
Subject: move pubkey imports to krebs/Zpubkeys

---
 lass/1systems/uriel.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lass/1systems')

diff --git a/lass/1systems/uriel.nix b/lass/1systems/uriel.nix
index 7c3d08123..bb98975e4 100644
--- a/lass/1systems/uriel.nix
+++ b/lass/1systems/uriel.nix
@@ -16,7 +16,7 @@ with builtins;
       users.extraUsers = {
         root = {
           openssh.authorizedKeys.keys = map readFile [
-            ../../Zpubkeys/uriel.ssh.pub
+            ../../krebs/Zpubkeys/uriel.ssh.pub
           ];
         };
       };
-- 
cgit v1.2.3


From f3c1727659c59ff638b1adead8e30ee2f79f39de Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Sat, 5 Sep 2015 12:15:31 +0200
Subject: lass: add echelon

---
 lass/1systems/echelon.nix | 42 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)
 create mode 100644 lass/1systems/echelon.nix

(limited to 'lass/1systems')

diff --git a/lass/1systems/echelon.nix b/lass/1systems/echelon.nix
new file mode 100644
index 000000000..12765a101
--- /dev/null
+++ b/lass/1systems/echelon.nix
@@ -0,0 +1,42 @@
+{ config, pkgs, ... }:
+
+{
+  imports = [
+    ../../tv/2configs/CAC-Developer-2.nix
+    ../../tv/2configs/CAC-CentOS-7-64bit.nix
+    ../2configs/base.nix
+    ../2configs/retiolum.nix
+    ../2configs/fastpoke-pages.nix
+    ../2configs/new-repos.nix
+    {
+      networking.interfaces.enp2s1.ip4 = [
+        {
+          address = "162.248.167.198";
+          prefixLength = 24;
+        }
+      ];
+      networking.defaultGateway = "162.248.167.1";
+      networking.nameservers = [
+        "8.8.8.8"
+      ];
+
+    }
+  ];
+
+  krebs.build = {
+    user = config.krebs.users.lass;
+    target = "root@162.248.167.198";
+    host = config.krebs.hosts.echelon;
+    deps = {
+      secrets = {
+        url = "/home/lass/secrets/${config.krebs.build.host.name}";
+      };
+      stockholm = {
+        url = toString ../..;
+      };
+    };
+  };
+
+  networking.hostName = "cloudkrebs";
+
+}
-- 
cgit v1.2.3


From 5182561a19f0e1b4852a08d5b377de959af8421d Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Fri, 18 Sep 2015 03:01:52 +0200
Subject: lass 1 echelon: get ip from krebs

---
 lass/1systems/echelon.nix | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

(limited to 'lass/1systems')

diff --git a/lass/1systems/echelon.nix b/lass/1systems/echelon.nix
index 12765a101..31a5ed068 100644
--- a/lass/1systems/echelon.nix
+++ b/lass/1systems/echelon.nix
@@ -1,21 +1,24 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
-{
+let
+  inherit (import ../4lib { inherit pkgs lib; }) getDefaultGateway;
+  inherit (lib) head;
+
+  ip = (head config.krebs.hosts.echelon.nets.internet.addrs4);
+in {
   imports = [
     ../../tv/2configs/CAC-Developer-2.nix
     ../../tv/2configs/CAC-CentOS-7-64bit.nix
     ../2configs/base.nix
     ../2configs/retiolum.nix
-    ../2configs/fastpoke-pages.nix
-    ../2configs/new-repos.nix
     {
       networking.interfaces.enp2s1.ip4 = [
         {
-          address = "162.248.167.198";
+          address = ip;
           prefixLength = 24;
         }
       ];
-      networking.defaultGateway = "162.248.167.1";
+      networking.defaultGateway = getDefaultGateway ip;
       networking.nameservers = [
         "8.8.8.8"
       ];
@@ -25,7 +28,7 @@
 
   krebs.build = {
     user = config.krebs.users.lass;
-    target = "root@162.248.167.198";
+    target = "root@${ip}";
     host = config.krebs.hosts.echelon;
     deps = {
       secrets = {
-- 
cgit v1.2.3


From 317d756c59b2b95d5e48cda4a27f8effdbb67095 Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Fri, 18 Sep 2015 03:02:22 +0200
Subject: lass 1 echelon: use correct hostname

---
 lass/1systems/echelon.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lass/1systems')

diff --git a/lass/1systems/echelon.nix b/lass/1systems/echelon.nix
index 31a5ed068..92976366f 100644
--- a/lass/1systems/echelon.nix
+++ b/lass/1systems/echelon.nix
@@ -40,6 +40,6 @@ in {
     };
   };
 
-  networking.hostName = "cloudkrebs";
+  networking.hostName = "echelon";
 
 }
-- 
cgit v1.2.3


From a43004cbd8584d6ad92963691583a1c59ab9e0fb Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Fri, 18 Sep 2015 03:03:16 +0200
Subject: lass 1 mors: install cac pkg

---
 lass/1systems/mors.nix | 1 +
 1 file changed, 1 insertion(+)

(limited to 'lass/1systems')

diff --git a/lass/1systems/mors.nix b/lass/1systems/mors.nix
index d07fe14d9..4724fd3e3 100644
--- a/lass/1systems/mors.nix
+++ b/lass/1systems/mors.nix
@@ -171,6 +171,7 @@
   };
 
   environment.systemPackages = with pkgs; [
+    cac
   ];
 
   #TODO: fix this shit
-- 
cgit v1.2.3