From e2a8aab44294584d185b6501cede7857c0529d36 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Fri, 29 Sep 2017 21:37:24 +0200
Subject: ma: enable remote-build on gum,omo - x is master

---
 makefu/1systems/gum/config.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'makefu/1systems/gum/config.nix')

diff --git a/makefu/1systems/gum/config.nix b/makefu/1systems/gum/config.nix
index 2f288e70..e1357ff0 100644
--- a/makefu/1systems/gum/config.nix
+++ b/makefu/1systems/gum/config.nix
@@ -40,10 +40,11 @@ in {
       # services
       <stockholm/makefu/2configs/share/gum.nix>
       <stockholm/makefu/2configs/sabnzbd.nix>
-      # <stockholm/makefu/2configs/torrent.nix>
+      <stockholm/makefu/2configs/torrent.nix>
       <stockholm/makefu/2configs/iodined.nix>
       <stockholm/makefu/2configs/vpn/openvpn-server.nix>
       <stockholm/makefu/2configs/dnscrypt/server.nix>
+      <stockholm/makefu/2configs/remote-build/slave.nix>
 
       ## Web
       <stockholm/makefu/2configs/nginx/share-download.nix>
@@ -74,6 +75,9 @@ in {
       <stockholm/makefu/2configs/stats/client.nix>
       # <stockholm/makefu/2configs/logging/client.nix>
 
+      # Temporary:
+      <stockholm/makefu/2configs/temp/rst-issue.nix>
+
   ];
   makefu.dl-dir = "/var/download";
 
@@ -143,6 +147,8 @@ in {
           53589
           # temp vnc
           18001
+          # temp reverseshell
+          31337
         ];
         allowedUDPPorts = [
           # tinc
-- 
cgit v1.2.3


From 903a1182b5c27cf0c07d267f136a0f2e5be3d89b Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Sun, 8 Oct 2017 23:14:14 +0200
Subject: gum.r: disable privkey setting via krebs

manually configure the secrets instead
---
 makefu/1systems/gum/config.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'makefu/1systems/gum/config.nix')

diff --git a/makefu/1systems/gum/config.nix b/makefu/1systems/gum/config.nix
index e1357ff0..e769b1e2 100644
--- a/makefu/1systems/gum/config.nix
+++ b/makefu/1systems/gum/config.nix
@@ -81,7 +81,9 @@ in {
   ];
   makefu.dl-dir = "/var/download";
 
-
+  services.openssh.hostKeys = [
+    { bits = 4096; path = <secrets/ssh_host_rsa_key>; type = "rsa"; }
+    { path = <secrets/ssh_host_ed25519_key>; type = "ed25519"; } ];
   ###### stable
   services.nginx.virtualHosts.cgit.serverAliases = [ "cgit.euer.krebsco.de" ];
   krebs.build.host = config.krebs.hosts.gum;
-- 
cgit v1.2.3