cleanup flake and uranus

tlm-solutions · Jan 3, 2025 · 42e7937 · 42e7937
1 parent 99db779
commit 42e7937
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 8 deletions.
diff --git a/hosts/uranus/default.nix b/hosts/uranus/default.nix
@@ -9,7 +9,6 @@ in
 {
   imports = [
     ./stateful-jupyter.nix
-    ./stateless-jupyter.nix
   ];
 
   microvm = {
@@ -84,7 +83,7 @@ in
 
   };
 
-  networking.firewall.allowedTCPPorts = [ 80 443 8080 22 ];
+  networking.firewall.allowedTCPPorts = [ 8080 ];
 
   users.motd = lib.mkForce (builtins.readFile ./motd.txt);
 

diff --git a/hosts/uranus/stateful-jupyter.nix b/hosts/uranus/stateful-jupyter.nix
@@ -51,6 +51,7 @@ in
         let
           packages = lib.concatStringsSep " " [
             # alphabetically `:sort`ed plz
+            "bitstring"
             "geojson"
             "matplotlib"
             "numpy"
@@ -59,7 +60,6 @@ in
             "psycopg"
             "scipy"
             "seaborn"
-            "bitstring"
           ];
         in
         (import ./jupyter-container.nix {

diff --git a/hosts/uranus/stateless-jupyter.nix b/hosts/uranus/stateless-jupyter.nix
diff --git a/modules/TLMS/default.nix b/modules/TLMS/default.nix
@@ -4,8 +4,9 @@
       ./base.nix
       ./binary-cache.nix
       ./general-options.nix
+      ./monitoring.nix
       ./net.nix
+      ./nginx.nix
       ./wg.nix
-      ./monitoring.nix
     ];
 }
diff --git a/modules/data-hoarder/nginx.nix → modules/TLMS/nginx.nix b/modules/data-hoarder/nginx.nix → modules/TLMS/nginx.nix
@@ -22,7 +22,8 @@ let
   '';
 in
 {
-  networking.firewall.allowedTCPPorts = [ 80 443 ];
+  # Open firewall HTTP and HTTPS if nginx is enabled
+  networking.firewall.allowedTCPPorts = if config.services.nginx.enable then [ 80 443 ] else [];
 
   security.acme.acceptTerms = true;
   security.acme.defaults.email = "[email protected]";

diff --git a/modules/data-hoarder/default.nix b/modules/data-hoarder/default.nix
@@ -8,7 +8,6 @@
     ./bureaucrat.nix
     ./file_sharing.nix
     ./map.nix
-    ./nginx.nix
     ./postgres.nix
     ./secrets.nix
     ./socket.nix