[initssh] document new option

Reviewed-on: #205

doc/src/module/initssh.md

@@ -26,4 +26,14 @@ Run ` lspci -k | grep -iA4 ethernet `
 ` [ ] `
 
 *Example:*
-`[ "r8169" ]`
+`[ "r8169" ]`
+
+## cfg.ip
+
+I hate DHCP! Set static ip or ip = hosts.malobeo.hosts.${hostname}.network.address;
+
+*Default:*
+`Null` - Will error when not set
+
+*Example:*
+`hosts.malobeo.hosts.fanny.network.address;`

machines/albert/configuration.nix

@@ -72,6 +72,7 @@ in
     enable = true;
     authorizedKeys = sshKeys.admins;
     ethernetDrivers = ["e1000e"];
+    ip = hosts.malobeo.hosts.albert.network.address;
   };
 
   services.malobeo.vpn = {

machines/bakunin/configuration.nix

@@ -2,6 +2,8 @@
 
 let
   sshKeys = import ../ssh_keys.nix;
+  hosts = import ../hosts.nix {};
+
 in
 {
   imports =
@@ -35,6 +37,7 @@ in
     enable = true;
     authorizedKeys = sshKeys.admins;
     ethernetDrivers = ["r8169"];
+    ip = hosts.malobeo.hosts.bakunin.network.address;
   };
 
   malobeo.users.malobeo = true;

machines/fanny/configuration.nix

@@ -90,6 +90,7 @@ in
     authorizedKeys = sshKeys.admins;
     ethernetDrivers = ["r8169"];
     zfsExtraPools = [ "storage" ];
+    ip = hosts.malobeo.hosts.fanny.network.address;
   };
 
   boot.initrd = {

machines/modules/malobeo/initssh.nix

@@ -27,6 +27,10 @@ in
       default = [ ];
       description = "Name or GUID of extra ZFS pools that you wish to import during boot.";
     };
+    ip = lib.mkOption {
+      type = lib.types.str;
+      description = "The requested static ip for the machine";
+    };
   };
   
   config = lib.mkIf (cfg.enable && config.malobeo.disks.encryption) {
@@ -73,7 +77,7 @@ in
           "/etc/ssh/initrd" = "/etc/ssh/initrd";
         };
       };
-      kernelParams = [ "ip=::::${hostName}-initrd::dhcp" ];
+      kernelParams = [ "ip=${cfg.ip}::::${hostName}::" ];
     };
   };
 }

machines/nextcloud/configuration.nix

@@ -39,7 +39,7 @@ in
 
   services.nextcloud = {
     enable = true;
-    package = pkgs.nextcloud33;
+    package = pkgs.nextcloud34;
     hostName = "cloud.malobeo.org";
     config.adminpassFile = config.sops.secrets.nextcloudAdminPass.path;
     maxUploadSize = "10G";
@@ -49,16 +49,10 @@ in
     configureRedis = true;
     caching = {
       redis = true;
-      apcu = true;
     };
     extraAppsEnable = true;
     extraApps = {
-      inherit (config.services.nextcloud.package.packages.apps) contacts calendar polls registration collectives forms;
-      deck = pkgs.fetchNextcloudApp {
-        sha256 = "sha256-Oc/J0Ey7f9aHhLBWoAXaDMe2t0eeEQKvpwY510qNpiI=";
-        url = "https://s3.g.megas4.com/ya5mczgkbk6bw7tcy2yr4bl2vdryfe76ok2dj/malo/deck33.tar.gz";
-        license = "agpl3Plus";
-      };
+      inherit (config.services.nextcloud.package.packages.apps) contacts calendar polls registration collectives forms deck;
     };
     settings = {
       trusted_domains = [ "cloud.malobeo.org" "cloud.hq.malobeo.org" ];
@@ -68,7 +62,6 @@ in
       "default_phone_region" = "DE";
     };
     phpOptions = {
-      "realpath_cache_size" = "0";
       "opcache.interned_strings_buffer" = "32";
     };
   };

machines/nextcloud/secrets.yaml

@@ -1,12 +1,7 @@
-nextcloudAdminPass: ENC[AES256_GCM,data:es9hhtCcqBqPbV2L,iv:Kyq5kqao0uaMPs0GeRkJT9OWYSZfImBXngg51k0uQ0M=,tag:zN/u90/j4rmdo0HtY+cF9w==,type:str]
+nextcloudAdminPass: ENC[AES256_GCM,data:RsP8Q1FqS9qgYTNe+H/nDHwQwr0fvlQawCOJWZVoF2U=,iv:AqJ79m3GAUd6sczDByJlb+K3XxxEt3HS4fURd7kn0bY=,tag:n/GyRKrIwOcksDtewnnXZw==,type:str]
 sops:
-    kms: []
-    gcp_kms: []
-    azure_kv: []
-    hc_vault: []
     age:
-        - recipient: age1ljpdczmg5ctqyeezn739hv589fwhssjjnuqf7276fqun6kc62v3qmhkd0c
-          enc: |
+        - enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
             YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBPT3ZxNEpRVktDWG9BR0Rv
             ZUZQTkJwQ0pSblNvTkFOT3BBdjVaSzJhVzBvCnVWc2xRUjBnRFFXSDgxczRMSFMy
@@ -14,8 +9,8 @@ sops:
             aDd0UlpMR3RNd3BDMmhqNmxhTFRoUlkK6Pni+cswKIU94WkP/fg5fzSmx/fhXjjl
             mRG2o4ALCqcOxAxHBrKJppUCLjUgKG53wPF/jlIzkvbwHwnqVMfYsQ==
             -----END AGE ENCRYPTED FILE-----
-        - recipient: age1g084sl230x94mkd2wq92s03mw0e8mnpjdjfx9uzaxw6psm8neyzqqwpnqe
-          enc: |
+          recipient: age1ljpdczmg5ctqyeezn739hv589fwhssjjnuqf7276fqun6kc62v3qmhkd0c
+        - enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
             YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBRK2o2K2tPTFcvbXRkZ0lq
             bS9ZOUc3dG1JeERZYVNsc3k3RjcxQ0RsdkRJCkx1VFhBQXRDOElqakJ0eTd3NEJX
@@ -23,8 +18,9 @@ sops:
             VjBFeldXS1p0Zk1uSk02aHpJd3BPOHcKvCmnK/KttB4RgnID/fj2KOdjvNnV3EWU
             B9mW4yxbEqhoxtu+GFD3eR/8SvMPEsHl9xorT/ZygMG7hAzedSukWw==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2024-11-26T20:00:50Z"
-    mac: ENC[AES256_GCM,data:qoY9SfpoU+8HfvD5v/1S6BOkbnZUmHIbtwr0tTSuPETjnFNgr1VVw9mnRatJKPYYFb9/rMZQWIqTY+iUIEkcTVyVXhd6ki5CHW+uxCeBIyMzq33rtEa/btkEUoii4iPieamBCIY21W0znE+edxfR04yRJtLxMICEbuW4Hjf6bwk=,iv:nG42fRgjpuIjPMYnn/6egEdzYolcUBsspaZ8zMv4888=,tag:C6apGoAvVLsWdLWSCwrx6w==,type:str]
+          recipient: age1g084sl230x94mkd2wq92s03mw0e8mnpjdjfx9uzaxw6psm8neyzqqwpnqe
+    lastmodified: "2026-10-22T19:07:13Z"
+    mac: ENC[AES256_GCM,data:HD1uqrxxfLrHGQfu7HFpuunpj/npPe35AvvFrhGFRUTtXLGRPDn5xeOiuHyT+qSs51lukE+hYhv/+u4xolb0SInOJtPTZ6suRcZ4maJ+9P0mgjs7OmI4e68CpGo0xuOg378WvlF15VQH2KCcVskEkO9UBTfOUmyNku1g4F6PeWw=,iv:cJaz6dYkspBlBY9aCaK2/zBDiVg7J7nCE+fnwNHz1Tw=,tag:5sKITZ8uD7JnRtwhaOPoGw==,type:str]
     pgp:
         - created_at: "2025-03-05T08:24:30Z"
           enc: |-
@@ -65,4 +61,4 @@ sops:
             -----END PGP MESSAGE-----
           fp: aef8d6c7e4761fc297cda833df13aebb1011b5d4
     unencrypted_suffix: _unencrypted
-    version: 3.8.1
+    version: 3.13.3