[scripts] init malobeo ssh commands

they are not yet working, its just placeholders

doc/src/module/initssh.md

@@ -26,14 +26,4 @@ Run ` lspci -k | grep -iA4 ethernet `
 ` [ ] `
 
 *Example:*
-`[ "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;`
+`[ "r8169" ]`

flake.lock

@@ -264,11 +264,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1792615934,
-        "narHash": "sha256-MlvRfa1O5Cqc2/a+gG+l9TSuowEoCKCmrJ1d9oAVm0I=",
+        "lastModified": 1788187754,
+        "narHash": "sha256-bu1QxmXKmPuvBLN7bHP355OV9Qo13x9WCiRDH62CqRM=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "da6dc0e7b26060f2f71ce3ef7088fb56ee44fa36",
+        "rev": "5dfba6236110080a54247d6460bc2ff5dda939cc",
         "type": "github"
       },
       "original": {

machines/albert/configuration.nix

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

machines/bakunin/configuration.nix

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

machines/fanny/configuration.nix

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

machines/modules/malobeo/initssh.nix

@@ -27,10 +27,6 @@ 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) {
@@ -77,7 +73,7 @@ in
           "/etc/ssh/initrd" = "/etc/ssh/initrd";
         };
       };
-      kernelParams = [ "ip=${cfg.ip}::::${hostName}::" ];
+      kernelParams = [ "ip=::::${hostName}-initrd::dhcp" ];
     };
   };
 }

machines/nextcloud/configuration.nix

@@ -39,7 +39,7 @@ in
 
   services.nextcloud = {
     enable = true;
-    package = pkgs.nextcloud34;
+    package = pkgs.nextcloud33;
     hostName = "cloud.malobeo.org";
     config.adminpassFile = config.sops.secrets.nextcloudAdminPass.path;
     maxUploadSize = "10G";
@@ -49,10 +49,16 @@ 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;
+      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";
+      };
     };
     settings = {
       trusted_domains = [ "cloud.malobeo.org" "cloud.hq.malobeo.org" ];
@@ -62,6 +68,7 @@ in
       "default_phone_region" = "DE";
     };
     phpOptions = {
+      "realpath_cache_size" = "0";
       "opcache.interned_strings_buffer" = "32";
     };
   };

machines/nextcloud/secrets.yaml

@@ -1,7 +1,12 @@
-nextcloudAdminPass: ENC[AES256_GCM,data:RsP8Q1FqS9qgYTNe+H/nDHwQwr0fvlQawCOJWZVoF2U=,iv:AqJ79m3GAUd6sczDByJlb+K3XxxEt3HS4fURd7kn0bY=,tag:n/GyRKrIwOcksDtewnnXZw==,type:str]
+nextcloudAdminPass: ENC[AES256_GCM,data:es9hhtCcqBqPbV2L,iv:Kyq5kqao0uaMPs0GeRkJT9OWYSZfImBXngg51k0uQ0M=,tag:zN/u90/j4rmdo0HtY+cF9w==,type:str]
 sops:
+    kms: []
+    gcp_kms: []
+    azure_kv: []
+    hc_vault: []
     age:
-        - enc: |
+        - recipient: age1ljpdczmg5ctqyeezn739hv589fwhssjjnuqf7276fqun6kc62v3qmhkd0c
+          enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
             YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBPT3ZxNEpRVktDWG9BR0Rv
             ZUZQTkJwQ0pSblNvTkFOT3BBdjVaSzJhVzBvCnVWc2xRUjBnRFFXSDgxczRMSFMy
@@ -9,8 +14,8 @@ sops:
             aDd0UlpMR3RNd3BDMmhqNmxhTFRoUlkK6Pni+cswKIU94WkP/fg5fzSmx/fhXjjl
             mRG2o4ALCqcOxAxHBrKJppUCLjUgKG53wPF/jlIzkvbwHwnqVMfYsQ==
             -----END AGE ENCRYPTED FILE-----
-          recipient: age1ljpdczmg5ctqyeezn739hv589fwhssjjnuqf7276fqun6kc62v3qmhkd0c
-        - enc: |
+        - recipient: age1g084sl230x94mkd2wq92s03mw0e8mnpjdjfx9uzaxw6psm8neyzqqwpnqe
+          enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
             YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBRK2o2K2tPTFcvbXRkZ0lq
             bS9ZOUc3dG1JeERZYVNsc3k3RjcxQ0RsdkRJCkx1VFhBQXRDOElqakJ0eTd3NEJX
@@ -18,9 +23,8 @@ sops:
             VjBFeldXS1p0Zk1uSk02aHpJd3BPOHcKvCmnK/KttB4RgnID/fj2KOdjvNnV3EWU
             B9mW4yxbEqhoxtu+GFD3eR/8SvMPEsHl9xorT/ZygMG7hAzedSukWw==
             -----END AGE ENCRYPTED FILE-----
-          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]
+    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]
     pgp:
         - created_at: "2025-03-05T08:24:30Z"
           enc: |-
@@ -61,4 +65,4 @@ sops:
             -----END PGP MESSAGE-----
           fp: aef8d6c7e4761fc297cda833df13aebb1011b5d4
     unencrypted_suffix: _unencrypted
-    version: 3.13.3
+    version: 3.8.1

outputs.nix

@@ -47,12 +47,18 @@ in (utils.lib.eachSystem (builtins.filter filter_system utils.lib.defaultSystems
       shellHook = ''echo "Available scripts: ${builtins.concatStringsSep " " installed}"'';
     };
 
-    legacyPackages = {
-      scripts.remote-install = pkgs.writeShellScriptBin "remote-install" (builtins.readFile ./scripts/remote-install-encrypt.sh);
-      scripts.boot-unlock = pkgs.writeShellScriptBin "boot-unlock" (builtins.readFile ./scripts/unlock-boot.sh);
-      scripts.add-host-keys = pkgs.writeShellScriptBin "add-host-keys" (builtins.readFile ./scripts/add_new_host_keys.sh);
-      scripts.run-vm = self.packages.${system}.run-vm;
-    };
+    legacyPackages.scripts = {
+      malobeo-remote-install = pkgs.writeShellScriptBin "malobeo-remote-install" (builtins.readFile ./scripts/remote-install-encrypt.sh);
+      malobeo-boot-unlock = pkgs.writeShellScriptBin "malobeo-boot-unlock" (builtins.readFile ./scripts/unlock-boot.sh);
+      malobeo-add-host-keys = pkgs.writeShellScriptBin "malobeo-add-host-keys" (builtins.readFile ./scripts/add_new_host_keys.sh);
+      malobeo-run-vm = self.packages.${system}.run-vm;
+    } // (import ./packages/ssh_to_hosts.nix) {
+           malobeo = (import ./machines/hosts.nix {}).malobeo;
+           peers = import ./machines/modules/malobeo/peers.nix;
+           pkgs = pkgs;
+           lib = nixpkgs.lib;
+         };
+
 
     vmBuilder = utils.buildVM;
 
@@ -75,6 +81,11 @@ in (utils.lib.eachSystem (builtins.filter filter_system utils.lib.defaultSystems
       };
 
       run-vm = pkgs.writeShellScriptBin "run-vm"  (builtins.readFile ./scripts/run-vm.sh);
+    } // (import ./packages/ssh_to_hosts.nix) {
+      malobeo = (import ./machines/hosts.nix {}).malobeo;
+      peers = import ./machines/modules/malobeo/peers.nix;
+      pkgs = pkgs;
+      lib = nixpkgs.lib;
     };
 
     apps = {

packages/ssh_to_hosts.nix

@@ -0,0 +1,35 @@
+{ malobeo, peers, pkgs, lib, ... }:
+#mapAttrs' (name: value: nameValuePair ("foo_" + name) ("bar-" + value))
+let
+  get_ip = hostname: malobeo.hosts.${hostname}.network.address;
+  generate_ssh_command = hostname: hostConfig: (
+    if hostConfig.network.local == true then
+      if hostname == "fanny" then
+        "ssh admin@${malobeo.hosts."fanny".network.address}"
+      else
+        "ssh -J admin@${malobeo.hosts."fanny".network.address} admin@${get_ip hostname}"
+    else
+      "offsite"
+  );
+in
+(lib.attrsets.mapAttrs' (hostname: hostConfig: lib.nameValuePair 
+  ("malobeo-ssh-${hostname}")
+  (pkgs.writeShellScriptBin "malobeo-ssh-${hostname}"
+  ''
+  #!/bin/sh 
+  echo "${hostname} ${generate_ssh_command hostname hostConfig}"
+  '')) malobeo.hosts )
+#{
+#  test-pkg = pkgs.writeShellScriptBin "run-vm"  (builtins.readFile ../scripts/run-vm.sh);
+#}
+
+
+# microvm
+# - local:
+#   - yes: ssh through fanny  
+#   - no: if in peers.nix -> ssh through vpn, else not possible
+# not microvm:
+# - local:
+#   - yes: ssh through fanny (except for fanny)
+#   - no: not supported
+