config

commit fbfbfbcd17aca9452781a9f81ce76ebcb55ef99f (tree)
parent 23d79c56bdb43bd70efec89a97b227bb2bb0074b
Author: Motiejus Jakštys <motiejus@jakstys.lt>
Date:   Mon,  4 May 2026 18:12:37 +0300

fix/split ipxe

Diffstat:
M
hosts/hpmine/configuration.nix
 | 
5
-----
M
hosts/mtworx/configuration.nix
 | 
5
-----
M
hosts/vno1-gdrx/configuration.nix
 | 
7
+++++++
M
modules/services/ipxe/default.nix
 | 
40
+++++++++++++++++-----------------------

4 files changed, 24 insertions(+), 33 deletions(-)
diff --git a/hosts/hpmine/configuration.nix b/hosts/hpmine/configuration.nix
@@ -75,11 +75,6 @@ in
         extraSubnets = [ myData.subnets.vno1.cidr ];
       };
 
-      ipxe = {
-        enable = true;
-        ifWan = "wlp1s0";
-      };
-
       ssh8022.client = {
         enable = true;
         keyfile = config.age.secrets.ssh8022-client.path;
diff --git a/hosts/mtworx/configuration.nix b/hosts/mtworx/configuration.nix
@@ -145,11 +145,6 @@ in
     };
   };
 
-  systemd.services = {
-    nginx.serviceConfig.BindPaths = [ "/home/motiejus/www:/var/run/nginx/motiejus" ];
-
-  };
-
   services = {
     tlp = {
       enable = true;
diff --git a/hosts/vno1-gdrx/configuration.nix b/hosts/vno1-gdrx/configuration.nix
@@ -49,6 +49,8 @@ in
   hardware.cpu.intel.updateMicrocode = true;
   nixpkgs.hostPlatform = "x86_64-linux";
 
+  systemd.services.nginx.serviceConfig.BindPaths = [ "/home/motiejus/www:/var/run/nginx/motiejus" ];
+
   mj = {
     profiles.desktop.enableUserServices = true;
 
@@ -65,6 +67,11 @@ in
     services = {
       ping_exporter.enable = true;
 
+      ipxe = {
+        enable = true;
+        ifWan = "wlp1s0";
+      };
+
       node_exporter = {
         enable = true;
         extraSubnets = [ myData.subnets.vno1.cidr ];
diff --git a/modules/services/ipxe/default.nix b/modules/services/ipxe/default.nix
@@ -118,7 +118,7 @@ in
 {
   options.mj.services.ipxe = with lib.types; {
     enable = lib.mkEnableOption "enable ipxe boot stuff";
-    ifWan = lib.mkOption { type = string; };
+    ifWan = lib.mkOption { type = str; };
   };
 
   config = lib.mkIf cfg.enable {
@@ -169,32 +169,26 @@ in
               '';
             };
           };
-          "go" = {
-            addSSL = true;
-            sslCertificate = "${../../shared/certs/go.pem}";
-            sslCertificateKey = "${../../shared/certs/go.key}";
-            locations."/".extraConfig = ''
-              return 301 https://golinks.io$request_uri;
-            '';
-          };
         };
       };
     };
 
-    systemd.services.unfs3 = {
-      description = "Userspace NFSv3 server";
-      after = [
-        "network.target"
-        "rpcbind.service"
-      ];
-      requires = [ "rpcbind.service" ];
-      wantedBy = [ "multi-user.target" ];
-      serviceConfig = {
-        ExecStart = "${pkgs.unfs3}/bin/unfsd -e ${exportsFile} -s -d -n 2049 -m 20048";
-        BindReadOnlyPaths = [ "${tftp-root}:/boot" ];
-        DynamicUser = true;
-        ProtectHome = true;
-        ProtectSystem = "strict";
+    systemd.services = {
+      unfs3 = {
+        description = "Userspace NFSv3 server";
+        after = [
+          "network.target"
+          "rpcbind.service"
+        ];
+        requires = [ "rpcbind.service" ];
+        wantedBy = [ "multi-user.target" ];
+        serviceConfig = {
+          ExecStart = "${pkgs.unfs3}/bin/unfsd -e ${exportsFile} -s -d -n 2049 -m 20048";
+          BindReadOnlyPaths = [ "${tftp-root}:/boot" ];
+          DynamicUser = true;
+          ProtectHome = true;
+          ProtectSystem = "strict";
+        };
       };
     };