refactorings

nixos/components/network/nginx.nix

@@ -6,7 +6,13 @@ with lib;
     default = config.components.network.enable;
   };
 
-  config = mkIf (config.components.network.nginx.enable) {
+  options.components.network.nginx.landingpage.enable = mkOption {
+    type = lib.types.bool;
+    default = config.components.network.nginx.enable;
+  };
+
+  config = mkMerge [
+    (mkIf (config.components.network.nginx.enable) {
 
       environment.systemPackages = [
         pkgs.nginx-config-formatter
@@ -49,6 +55,11 @@ with lib;
       };
 
       services.nginx.package = pkgs.nginxMainline;
+
+    })
+
+    (mkIf (config.components.network.nginx.landingpage.enable) {
+
       services.nginx.virtualHosts."${config.networking.hostName}.private" = {
         default = lib.mkDefault true;
         locations."/" = {
@@ -249,5 +260,6 @@ with lib;
           };
         };
       };
-  };
+    })
+  ];
 }

nixos/homes/common/packages.nix

@@ -29,6 +29,11 @@ with lib;
         tree
         killall
         nix-tree
+
+        unstable.vulnix
+        (writers.writeBashBin "vulnix-system" ''
+          ${unstable.vulnix}/bin/vulnix --profile /nix/var/nix/profiles/system
+        '')
       ];
 
       programs.btop.enable = true;

nixos/machines/orbi/configuration.nix

@@ -13,11 +13,11 @@
     #./borg.nix
     #./codimd.nix
     #./gitea.nix
-    #./packages.nix
     #./taskserver.nix
     #./vaultwarden.nix
-    #./nginx.nix
+
-    #./nginx-wkd.nix
+    ./nginx-ingolf-wagner-de.nix
+    ./nginx-wkd.nix
 
     ./network-tinc.nix
     ./network-wireguard.nix
@@ -53,6 +53,7 @@
   components.mainUser.enable = true;
   components.gui.enable = false;
   components.network.enable = true;
+  components.network.nginx.landingpage.enable = false;
   components.network.wifi.enable = false;
 
   security.acme.acceptTerms = true;

nixos/machines/orbi/hardware-configuration/default.nix

@@ -55,6 +55,9 @@ in
 
   services.openssh.enable = true;
   services.sshguard.enable = true;
+  environment.systemPackages = [
+    pkgs.ipset # for sshguard
+  ];
 
   boot.tmp.useTmpfs = true; # make /tmp a tmpfs (performance!)
 

nixos/machines/orbi/nginx-ingolf-wagner-de.nix

@@ -107,7 +107,6 @@ in
           };
         };
       };
-
       "travel.ingolf-wagner.de" = {
         forceSSL = true;
         enableACME = true;
@@ -138,21 +137,6 @@ in
           };
         } // error.locations;
       };
-      "terranix.org" = {
-        forceSSL = true;
-        enableACME = true;
-        extraConfig = error.extraConfig;
-        locations = {
-          "/" = {
-            root = "/srv/www/terranix";
-            extraConfig = ''
-              if (-d $request_filename) {
-                rewrite [^/]$ $scheme://$http_host$request_uri/ permanent;
-              }
-            '';
-          };
-        } // error.locations;
-      };
     };
   };
 }

nixos/machines/orbi/packages.nix

@@ -1,14 +0,0 @@
-{ config, pkgs, ... }: {
-  environment.systemPackages = with pkgs; [
-    mosh
-    mediainfo
-    youtube-dl
-    ipset # for sshguard
-
-    unstable.vulnix
-    (pkgs.writers.writeBashBin "vulnix-system" ''
-      ${pkgs.unstable.vulnix}/bin/vulnix --profile /nix/var/nix/profiles/system
-    '')
-
-  ];
-}

nixos/machines/robi/configuration.nix

@@ -1,7 +1,7 @@
 { lib, config, pkgs, ... }: {
   imports = [
 
-    # ../../system/all/nginx.nix
+    # ../../system/all/nginx-ingolf-wagner-de.nix
     ../../system/all/defaults.nix
 
     ../../components
@@ -16,8 +16,8 @@
     ./packages.nix
     ./taskserver.nix
     ./vaultwarden.nix
-    ./nginx.nix
+    #./nginx.nix
-    ./nginx-wkd.nix
+    #./nginx-wkd.nix
 
     ./network-tinc.nix
     #./network-wireguard.nix