From 0147d7faa10613341ea28065725a2ce435685396 Mon Sep 17 00:00:00 2001
From: Markus Hihn <markus.hihn@dcso.de>
Date: Tue, 9 Jan 2018 11:16:43 +0100
Subject: jeschli: meltdown fix

---
 jeschli/2configs/default.nix | 1 +
 1 file changed, 1 insertion(+)

(limited to 'jeschli/2configs')

diff --git a/jeschli/2configs/default.nix b/jeschli/2configs/default.nix
index 7fb2409..77281b3 100644
--- a/jeschli/2configs/default.nix
+++ b/jeschli/2configs/default.nix
@@ -4,6 +4,7 @@ with import <stockholm/lib>;
   imports = [
     ./vim.nix
     ./retiolum.nix
+    <stockholm/lass/2configs/security-workarounds.nix>
     {
       environment.variables = {
         NIX_PATH = mkForce "secrets=/var/src/stockholm/null:/var/src";
-- 
cgit v1.2.3


From e5efb2b0ae0c7dbd36c68d0b340826ef5816d927 Mon Sep 17 00:00:00 2001
From: jeschli <jeschli@gmail.com>
Date: Wed, 10 Jan 2018 15:07:04 +0100
Subject: jeschli: set default hostname

---
 jeschli/2configs/default.nix | 1 +
 1 file changed, 1 insertion(+)

(limited to 'jeschli/2configs')

diff --git a/jeschli/2configs/default.nix b/jeschli/2configs/default.nix
index 77281b3..6d788d2 100644
--- a/jeschli/2configs/default.nix
+++ b/jeschli/2configs/default.nix
@@ -64,4 +64,5 @@ with import <stockholm/lib>;
   ];
 
   krebs.enable = true;
+  networking.hostName = config.krebs.build.host.name;
 }
-- 
cgit v1.2.3


From 99ee8193d7e9f882fbe98f7617dc3e9c7c7a6fe4 Mon Sep 17 00:00:00 2001
From: jeschli <jeschli@gmail.com>
Date: Wed, 10 Jan 2018 15:09:21 +0100
Subject: jeschli: +enklave.r

---
 jeschli/2configs/os-templates/CentOS-7-64bit.nix | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 jeschli/2configs/os-templates/CentOS-7-64bit.nix

(limited to 'jeschli/2configs')

diff --git a/jeschli/2configs/os-templates/CentOS-7-64bit.nix b/jeschli/2configs/os-templates/CentOS-7-64bit.nix
new file mode 100644
index 0000000..fb34e94
--- /dev/null
+++ b/jeschli/2configs/os-templates/CentOS-7-64bit.nix
@@ -0,0 +1,16 @@
+_:
+
+{
+  imports = [ <nixpkgs/nixos/modules/profiles/qemu-guest.nix> ];
+
+  boot.loader.grub = {
+    device = "/dev/sda";
+    splashImage = null;
+  };
+  boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "virtio_pci" "sd_mod" "sr_mod" ];
+
+  fileSystems."/" = {
+    device = "/dev/sda1";
+    fsType = "ext4";
+  };
+}
-- 
cgit v1.2.3


From 80b7637f5f6a8ced75a4021a31fb950fc08f4f2e Mon Sep 17 00:00:00 2001
From: jeschli <jeschli@gmail.com>
Date: Wed, 10 Jan 2018 15:10:13 +0100
Subject: jeschli retiolum: connect to enklave

---
 jeschli/2configs/retiolum.nix | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'jeschli/2configs')

diff --git a/jeschli/2configs/retiolum.nix b/jeschli/2configs/retiolum.nix
index 403300b..b611cbe 100644
--- a/jeschli/2configs/retiolum.nix
+++ b/jeschli/2configs/retiolum.nix
@@ -9,6 +9,7 @@
       "gum"
       "ni"
       "dishfire"
+      "enklave"
     ];
   };
 
@@ -16,6 +17,9 @@
     tinc = pkgs.tinc_pre;
   };
 
+  networking.firewall.allowedTCPPorts = [ 655 ];
+  networking.firewall.allowedUDPPorts = [ 655 ];
+
   environment.systemPackages = [
     pkgs.tinc
   ];
-- 
cgit v1.2.3