From 2c25fbcbd0bb8554bee8e3458cb9864093b63d0b Mon Sep 17 00:00:00 2001
From: Julien Malka <julien.malka@me.com>
Date: Sat, 25 Dec 2021 15:56:30 +0100
Subject: [PATCH] Moved drone to lisa

---
 machines/lisa/default.nix   |  7 +++++++
 machines/newton/default.nix | 16 ++--------------
 2 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/machines/lisa/default.nix b/machines/lisa/default.nix
index 9f58aec..d01c31c 100644
--- a/machines/lisa/default.nix
+++ b/machines/lisa/default.nix
@@ -13,6 +13,13 @@
 
   luj.mediaserver.enable = true;
   luj.homepage.enable = true;
+  luj.drone = {
+    enable = true;
+    nginx = {
+      enable = true;
+      subdomain = "ci";
+    };
+  };
  
   nix.maxJobs = lib.mkDefault 8;
 
diff --git a/machines/newton/default.nix b/machines/newton/default.nix
index 5dd49e4..b73df2f 100644
--- a/machines/newton/default.nix
+++ b/machines/newton/default.nix
@@ -13,19 +13,7 @@ in
 
   luj = {
     filerun.enable = true;
-    drone.enable = true;
-    drone.nginx = {
-      enable = true;
-      subdomain = "ci";
-    };
     zfs-mails.enable = true;
-    hydra = {
-      enable = false;
-      nginx = {
-        enable = true;
-        subdomain = "hydra";
-      };
-    };
   };
 
   programs.gnupg.agent.enable = true;
@@ -35,8 +23,8 @@ in
   networking.interfaces.enp2s0f0.useDHCP = true;
   networking.interfaces.enp2s0f1.useDHCP = true;
   networking.firewall.enable = true;
-  networking.firewall.allowedTCPPorts = [ 22 80 8080 443 ];
-  networking.firewall.allowedUDPPorts = [ 22 80 8080 443 ];
+  networking.firewall.allowedTCPPorts = [ 22 80 443 ];
+  networking.firewall.allowedUDPPorts = [ 22 80 443 ];
   networking.firewall.allowedUDPPortRanges = [{ from = 60000; to = 61000; }];