[scripts] init malobeo ssh commands

they are not yet working, its just placeholders
2026-11-03 18:16:06 +01:00
14 changed files with 99 additions and 227 deletions
@@ -88,11 +88,11 @@
        "uv2nix": "uv2nix"
      },
      "locked": {
-        "lastModified": 1793952308,
-        "narHash": "sha256-4NNLnvolKzJ7aNOzf85q6x5RtLWwhcLcsFssdGiBcHA=",
+        "lastModified": 1786138873,
+        "narHash": "sha256-+G/hTquaK4AjYxNSJTpcZXUEKxFDv9lOn3x+lHHTWJw=",
        "ref": "refs/heads/master",
-        "rev": "8ca4da2e1a9f56babd14a862a2ac770d81de046a",
-        "revCount": 145,
+        "rev": "c5934d05c6f01c94c36221deb7ed4de03aa91ca1",
+        "revCount": 127,
        "type": "git",
        "url": "https://git.dynamicdiscord.de/malobeo/gatekeeper"
      },
@@ -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": {
@@ -278,27 +278,6 @@
        "type": "github"
      }
    },
-    "portal": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ],
-        "utils": "utils_3"
-      },
-      "locked": {
-        "lastModified": 1793962157,
-        "narHash": "sha256-syLIoDUWY5g2ubyNZNqgR+R6R5wLgSD8/XWnIazjhYc=",
-        "ref": "refs/heads/master",
-        "rev": "5a5b043354b88f024b53fce39b60a563fd895063",
-        "revCount": 33,
-        "type": "git",
-        "url": "https://git.dynamicdiscord.de/malobeo/portal"
-      },
-      "original": {
-        "type": "git",
-        "url": "https://git.dynamicdiscord.de/malobeo/portal"
-      }
-    },
    "pyproject-build-systems": {
      "inputs": {
        "nixpkgs": [
@@ -362,10 +341,9 @@
        "nixos-hardware": "nixos-hardware",
        "nixpkgs": "nixpkgs_3",
        "nixpkgs-unstable": "nixpkgs-unstable",
-        "portal": "portal",
        "sops-nix": "sops-nix",
        "tasklist": "tasklist",
-        "utils": "utils_4",
+        "utils": "utils_3",
        "zineshop": "zineshop"
      }
    },
@@ -465,21 +443,6 @@
        "type": "github"
      }
    },
-    "systems_5": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
    "tasklist": {
      "inputs": {
        "nixpkgs": [
@@ -540,24 +503,6 @@
      "inputs": {
        "systems": "systems_3"
      },
-      "locked": {
-        "lastModified": 1791914995,
-        "narHash": "sha256-Zf/xfQEAasnwnmEfHqW/4hjDE/s44yn2hD4RuVIZRjA=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "b7a79d3fea1e214f6d668d521cecec0c01e26544",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "utils_4": {
-      "inputs": {
-        "systems": "systems_4"
-      },
      "locked": {
        "lastModified": 1731533236,
        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
@@ -572,9 +517,9 @@
        "type": "github"
      }
    },
-    "utils_5": {
+    "utils_4": {
      "inputs": {
-        "systems": "systems_5"
+        "systems": "systems_4"
      },
      "locked": {
        "lastModified": 1731533236,
@@ -620,7 +565,7 @@
        "nixpkgs": [
          "nixpkgs"
        ],
-        "utils": "utils_5"
+        "utils": "utils_4"
      },
      "locked": {
        "lastModified": 1792488750,
@@ -32,11 +32,6 @@
      inputs.nixpkgs.follows = "nixpkgs";
    };

-    portal = {
-      url = "git+https://git.dynamicdiscord.de/malobeo/portal";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-
    ep3-bs = {
      url = "git+https://git.dynamicdiscord.de/kalipso/ep3-bs.nix";
      inputs.nixpkgs.follows = "nixpkgs";
@@ -18,7 +18,6 @@ keys:
  - &machine_pretalx age1y04q8n7mgk82c87rfddm0u72h0ny6sfzktjsk0cc3gu93kezudfqdp9v9g
  - &machine_albert age1mfarz0n7qfa7vg8zz355qf8eregm6myl38lld0h767nuvhgjqd4qruxuhn
  - &machine_ns1 age1mam7y7x4my6g8yt8leze3pvlq0fr48hdsqz62gs7l9rstf9hh3fs03xf7n
-  - &machine_goldman age10gk6kydhljjk99vmaj6z0sz5d9x7pwp458gpr3hzqpl5hh04z5xqgley7j
  #this dummy key is used for testing.
  - &machine_dummy age18jn5mrfs4gqrnv0e2sxsgh3kq4sgxx39hwr8z7mz9kt7wlgaasjqlr88ng
 creation_rules:
@@ -133,14 +132,6 @@ creation_rules:
      age:
      - *machine_ns1
      - *admin_atlan
-  - path_regex: goldman/gatekeeper.env$
-    key_groups:
-    - pgp:
-      - *admin_kalipso
-      - *admin_kalipso_dsktp
-      age:
-      - *machine_goldman
-      - *admin_atlan
  - path_regex: .*/secrets/.*
    key_groups:
    - pgp:
@@ -149,7 +149,6 @@ in
    "antamap" 
    "ns1"
    "wordpress"
-    "portal"
  ];

  networking = {
@@ -185,22 +184,6 @@ in
      };
    };

-    virtualHosts."portal.hq.malobeo.org" = {
-      forceSSL = true;
-      enableACME = true;
-      acmeRoot = null;
-      locations."/" = {
-        proxyPass = "http://${hosts.malobeo.hosts.portal.network.address}:8080";
-        extraConfig = ''
-          proxy_set_header Host $host;
-          client_max_body_size ${inputs.self.nixosConfigurations.nextcloud.config.services.nextcloud.maxUploadSize};
-          client_body_timeout 3600s;
-          send_timeout 3600s;
-          fastcgi_buffers 64 4K;
-        '';
-      };
-    };
-
    virtualHosts."cloud.hq.malobeo.org" = {
      forceSSL = true;
      enableACME = true;
@@ -10,33 +10,17 @@ in
  imports =
    [ 
      inputs.gatekeeper.nixosModules.gatekeeper
-      inputs.self.nixosModules.malobeo.users
+      ../modules/malobeo_user.nix
      #inputs.nixos-hardware.nixosModules.raspberry-pi-3
      (modulesPath + "/profiles/minimal.nix")
      #(modulesPath + "/installer/sd-card/sd-image.nix")
-      ../modules/autoupdate.nix
    ];

-  malobeo.users = {
-    malobeo = false;
-    admin = true;
-    backup = false;
-    hostKeyLocation = "/etc/ssh/ssh_host_ed25519_key";
-  };
-
  fileSystems."/" =
    { device = "/dev/disk/by-label/NIXOS_SD";
      fsType = "ext4";
    };

-  malobeo.autoUpdate = {
-    enable = true;
-    url = "https://hydra.malobeo.org";
-    project = "malobeo";
-    jobset = "master";
-    cacheurl = "https://cache.malobeo.org";
-  };
-
  #Try to reduce size
  documentation.man.enable = false;
  documentation.nixos.enable = false;
@@ -66,14 +50,18 @@ in
      settings.allow_anonymous = true;
    }];
  };
-  sops.secrets.gatekeeperEnv = {
-    sopsFile = ./gatekeeper.env;
-    key = "";
-  };
+
  services = {
    gatekeeper = {
      enable = true;
-      envFile = config.sops.secrets.gatekeeperEnv.path;
+      envFile = pkgs.writeText "env" ''
+        MIFARE_APP_MASTER_KEY="7b195adb892073c9e34ebe7e0ca28b2b"
+        MIFARE_ACL_READ_BASE_KEY="741a50f2b189cc9f151e0600f50a6e1a"
+        MIFARE_ACL_WRITE_BASE_KEY="f1aa99f81cca268de98d422ee0ccb65c"
+        SECRET_KEY="8b14d0b447bff7efa24d5019cc59a999786e31f6f865173bbd642bf18de5ad85"
+        MQTT_HOST = "localhost"
+        MQTT_PORT = "1883"
+      '';
      mock = "False";
    };
  };
@@ -98,7 +86,7 @@ in
    };
  };

-  networking.firewall.allowedTCPPorts = [ 80 443 1883 8000 ];
+  networking.firewall.allowedTCPPorts = [ 80 443 1883];

  system.stateVersion = "23.05";
 }
@@ -1,27 +0,0 @@
-MIFARE_APP_MASTER_KEY=ENC[AES256_GCM,data:I1YgnEjcMOnUtp5W2etsJgYyLr7lonzNg8gsUwZJcslfAw==,iv:oZknXxh5KcVzX6vdtyUH69kKjYAckmHL56QaMF1MOH0=,tag:GfR7AVn6IXCfI3mGBN9Dsw==,type:str]
-MIFARE_ACL_READ_BASE_KEY=ENC[AES256_GCM,data:A5cnHzlEW38YrQpoAL20+YMtx+PbaidM5Q2n9b4fWngQUg==,iv:eNhI23L2GVzpPEa0QyEU97iBQVDuhqsOwWPezzuS8+Y=,tag:9CuZSpqYsV/y0mvaAO3S/w==,type:str]
-MIFARE_ACL_WRITE_BASE_KEY=ENC[AES256_GCM,data:V4q0PuQJxcDXsix6XQsBamq1V/V+K+N4noRGgpJjjTB13g==,iv:4OJN8HzWQtaoJlh01uFmUvgXRwFY0jorkTgZjljJsRc=,tag:1H648/Jy7KANtRNDSkyTSA==,type:str]
-SECRET_KEY=ENC[AES256_GCM,data:K2FYP/4vk9maohnSQF735zGbkeV5HGcCJFSzyrifGPS3YA==,iv:oAxz/gAn76ch/UliCDlXzVNTRzuIDgdhD/k92vXqmok=,tag:NuoXXPdhLpxDuDh78qTF1A==,type:str]
-MQTT_HOST =ENC[AES256_GCM,data:6YTmAljhE9w/pnXo,iv:08FNf3xopciUPLeGMnSIkehaM/Gjfvwi2RHb4t7TzJI=,tag:UYyFxbkugBULoQ6hS1aqWw==,type:str]
-MQTT_PORT =ENC[AES256_GCM,data:sGh+xyaVwQ==,iv:YuY1prObChjS0Urwe6M90hMMeBDkpG8sAou/uP2jXq4=,tag:Sqp92fwgGTRgHe9zk+D6Tw==,type:str]
-DISABLE_CALDAV =ENC[AES256_GCM,data:3iAINTq/Htc=,iv:GWcnwG607jbMxVpl0jKRFBJ+tCRHM9SLUbj7ChVwh1k=,tag:sQUdgiGqlROtSH4/cfvoCg==,type:str]
-DISABLE_CARDS =ENC[AES256_GCM,data:4IFbzoLNdYU=,iv:So2jIQ6bBvKbh9aki0H/yJ4cvdeqYxMj0gtS7C/Snhs=,tag:G21lbZ6DpMwBjIzERXBjZw==,type:str]
-CALDAV_URL =ENC[AES256_GCM,data:hgObeMHReiqCXXQ2N8Y1rLKPydz1bY1ae4YBt1X1BIsnpU0S7EB1XFifhpcx9X12szibtQ59YA==,iv:jxsDZnSX78UF8Hrtjng8/JThg/MweBUYvqdVLptYWXI=,tag:YfFgxQehpYIuZQ7MHq0WkA==,type:str]
-CALDAV_USER =ENC[AES256_GCM,data:+BSTNCi7mULdWhM1oa06,iv:UlpkZTEmvuktC0daH4nBm0kaJiIaWt8DVL+wMLBjuxo=,tag:RfX5dbLBtJ0FfSXVxlW99w==,type:str]
-CALDAV_PASSWORD =ENC[AES256_GCM,data:TXUBlhjge6b3Uu0BH/IJ53zqGAAVF8/XhvXVHuhgmi8=,iv:oSDpRWTP/jP06ZS4diwcUdAAnI+GSIomY+IbIERki4E=,tag:RKNW99kkZd5WmOe2poFM1A==,type:str]
-CALDAV_CALENDARS =ENC[AES256_GCM,data:0T42oZqIDFgUegGBzw==,iv:LFYzH4Ej+Aavugg3lRaR+rP4ZGjDUPyTbxwTc9DChgc=,tag:IPx04P8KFW6vfN6UTKJPIA==,type:str]
-CALDAV_REFRESH_INTERVAL =ENC[AES256_GCM,data:/tHX+A==,iv:I7JNh30TMyT5L8cLPGINTxZVUXzk94nix4tMHfIHKlI=,tag:flZqije+8tsQXL68nEewnQ==,type:str]
-sops_age__list_0__map_enc=-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBxQTNNN0dpbWR2OFJtalIz\nOGFQaHlzRGEyVlZTUUpBRGI0Q3NpbnZVeWlRClYrTlAvZmNMUVg5MnhETlEvTU8x\nSzdlU0syT3FjdmZqOWY5eGprYkxPeHMKLS0tIENNOXZZc2hkTXhyUkgxN3I1TE8y\nU2h5d0ZaWS9QdTVsZGJjVlZuL3kwK28K6ATJuMyMSKAbbz0DVC/Yuz0g7F0DgNd5\nEo1L86EefttFwUuvz+hpNqllU3f6kGa19sFBcQc5cpQF6G6MTCJxOA==\n-----END AGE ENCRYPTED FILE-----\n
-sops_age__list_0__map_recipient=age10gk6kydhljjk99vmaj6z0sz5d9x7pwp458gpr3hzqpl5hh04z5xqgley7j
-sops_age__list_1__map_enc=-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB5aGgxWmovR2gzVnZaT1Uw\nd2VtUis1SEM5OXZYVENjWURrNUJscnQ0TUhjCmZ2dURBL2NESUJFd3RYNGdWWmNM\nSmpRdURMK0xJVzFhUkwrMHd3ZDkwbm8KLS0tIDRjemJEN1lJSXBvN2prRVFEQ25N\ncXBqeXF4dzNIak8vTUd1Rmt1ZkhTclEKRSoxGpRmrejYTx/KnbG6IxRSzrRXNyHP\nTQpY5OD6/nmajrxIymvEFdsMMw2DiWevypCAJZQK3/+OqIlgKnfiaQ==\n-----END AGE ENCRYPTED FILE-----\n
-sops_age__list_1__map_recipient=age1ljpdczmg5ctqyeezn739hv589fwhssjjnuqf7276fqun6kc62v3qmhkd0c
-sops_lastmodified=2026-11-07T23:23:15Z
-sops_mac=ENC[AES256_GCM,data:VT1hKDEC2QUwEz6E+qAbUBVJi0sF6yNBfdkYIccb4+5EYWr1dKIiwOxwkqvvHKi1S5Kw501CH/oB3nswgDV1/fJsXlrgvCrF9AeX8W5IFMyTYe/aEtsWBS2lnyL2do5YFGss9XX0RJOXmqvsyGDRpnMi0wTvths/f7tmVv8m3Es=,iv:UZDX5rF0sl2nGwbR16IQcQJq/W+QYjeTwSE1CkjHHC0=,tag:kJIpwvmYThnjoS09XSEmtQ==,type:str]
-sops_pgp__list_0__map_created_at=2026-11-07T23:23:15Z
-sops_pgp__list_0__map_enc=-----BEGIN PGP MESSAGE-----\n\nhQGMA5HdvEwzh/H7AQv/R4//v0z5OOfd+OB52bTcA8Cl1s5vkPg7Xkjzn4yhc47e\nWdMHW3i2y18I1WJyoNTQGqoZNXAIyvZleq8q8e/iibfr+ZefP/UaCKOPiLJ6fUN+\nD+bqYn3LBR0whzEBI7GWr+/xwyJX6L7qk16NhR2zTFku+PGRaHo2YhfKxqw9GqbL\niNSVs3MGRvinLlLYZbAAKtfQ7IZJ/JIvWLAU4ZGvfNBh8XQ9xirVnl32A5/2dSPV\nOv1gg1gmxGAkOFbShw4k6nmCCM+HB95goHbriWk/3oCsToNuhQyVVGz3m+E4ZXFP\n6GDHh2zuRENe+UZHQStle1fS/4v/mHrkXfH771pDy6DPWGbOz/abmRYD+CtOxhRP\niD0w0jbrvma5+kn53/CN/WTJa3aBzyr1T+5fVamczriC7cnZgR+u1zp2gS+th1WE\nFtsh7WrNkHRYWBXsj1YnH/x62cO9t/29i6i0qXuCILxP/39wdcljyNIUzFBZ04TI\naY3Nc3+uoSp42RTeYfIm0lYBs8uuPhELVlFblaI8dZ4hTDLzr7lRYs07nvOkWvfS\nWnnY23oYRvmj66qujLaxYrvhrOe9l+xe1qGj0Kzolb9xgDsSdb/HjUysLNGU3CuL\nBbquv+RcSA==\n=k+7t\n-----END PGP MESSAGE-----
-sops_pgp__list_0__map_fp=c4639370c41133a738f643a591ddbc4c3387f1fb
-sops_pgp__list_1__map_created_at=2026-11-07T23:23:15Z
-sops_pgp__list_1__map_enc=-----BEGIN PGP MESSAGE-----\n\nhQIMA98TrrsQEbXUAQ/7BPsXeKJ4NwpHMonr0l5nfWrbXwtBCwE6YrMWsYFVnleZ\nxZe/w8vsAfe2fcVyXsmPsHnskh7Mqjnxk+M6oc9OWxCS35NQ2BROxqPDXVqOuTNJ\nQTNuHNMMornysa28TCnO+zr90K7s3WUc0g53VcWxEZndPhiSdA/KftAmJJaFV+kd\nbUQW7Yc0WkO64S2DMpFI9GCfgqNll53nnXt6KgbRrNcE7bD08kOBVCHyZ1hXJKai\nQ0LLQ4+odv1mSn5UP48dOKYZcFlIQ0QCKdCJ96zApaPajOF24f+0Yi4f6wMEVxfs\nAWQbBOFot78zOQJH8mZO0WlOf1Cw6v18tE74dGPPsFInCqMYth9oDJ4lTP+wMyl2\nskXJRuK3wzmmWL8h9qL4yym1vVW9V0NHZLlTip8SKlnujrmE+rjgKAmFvcezygDG\nKIQuOUQsuiWiRE7XCMMQX+2bwjUjerM3yhoLQixX6fDzhWTX5f70nq+OBnLR0SD9\n1uq5Nkb5N01qyhAtYyTcsxJvTy0YJ6NE6CDoGmIOS4hUq1Lf4nMRx7vfemsrvcca\nNj7nkMWcLeOUcBSVBR84nRVlTN96qjAeOycl4TmAw3H9sciBWs6MNdPgD6XR7D0r\nboHxhXApCiPj6YGTdCGEtqs5ha0yFJVljyWR63+EM9iKVV4lMZL4excHSCBlmojS\nVgEufYXXDTuWonGAsLyciMGokCvxCIKuIxC/3FcdHT0Ijg97h1vZ9K3qY8VQ1NeI\n92fAnC7edWJ3W7zbbxZqhXKx6NOF1EideBdy8xOP2nk6RZkS82i0\n=LofN\n-----END PGP MESSAGE-----
-sops_pgp__list_1__map_fp=aef8d6c7e4761fc297cda833df13aebb1011b5d4
-sops_unencrypted_suffix=_unencrypted
-sops_version=3.13.3
@@ -146,15 +146,10 @@ in

      wordpress = {
        type = "microvm";
-        network = createMaloNet "21" "52:DA:0D:F9:EF:F7";
+        network = createMaloNet "21" "52:DA:0D:F9:EF:F6";
      };

-      portal = {
-        type = "microvm";
-        network = createMaloNet "22" "52:DA:0D:F9:EF:F8";
-      };
-
-      # last host id: 22
+      # last host id: 21
    };
  };
 }
@@ -21,11 +21,6 @@ in
      default = false;
      description = "enable backup user, ";
    };
-    hostKeyLocation = lib.mkOption {
-      type = lib.types.path;
-      default = "/etc/ssh/${hostName}";
-      description = "path to the hostkey used for sops. Defaults to '/etc/ssh/${hostName}'. Change to '/etc/ssh/ssh_host_ed25519_key' for migrating other machines.";
-    };
  };
  config = lib.mkMerge [
    (lib.mkIf cfg.malobeo {
@@ -86,14 +81,13 @@ in
    })
    {
      users.mutableUsers = false;
-
      services.openssh.hostKeys = [
        {
-          path = cfg.hostKeyLocation;
+          path = "/etc/ssh/${hostName}";
          type = "ssh-ed25519"; 
        }
      ];
-      sops.age.sshKeyPaths = [ cfg.hostKeyLocation ];
+      sops.age.sshKeyPaths = [ "/etc/ssh/${hostName}" ];
      environment.systemPackages = with pkgs; [
        nix-output-monitor
        vim
@@ -6,7 +6,6 @@ let
  hosts = import ../hosts.nix {};
 in
 {
-  microvm.vcpu = 2;
  sops.defaultSopsFile = ./secrets.yaml;
  sops.secrets = {
    nextcloudAdminPass = {
@@ -40,7 +39,7 @@ in

  services.nextcloud = {
    enable = true;
-    package = pkgs.nextcloud35;
+    package = pkgs.nextcloud33;
    hostName = "cloud.malobeo.org";
    config.adminpassFile = config.sops.secrets.nextcloudAdminPass.path;
    maxUploadSize = "10G";
@@ -50,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" ];
@@ -63,6 +68,7 @@ in
      "default_phone_region" = "DE";
    };
    phpOptions = {
+      "realpath_cache_size" = "0";
      "opcache.interned_strings_buffer" = "32";
    };
  };
@@ -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
@@ -270,12 +270,6 @@ in
          targets = [ "${hosts.malobeo.hosts.wordpress.network.address}:9002" ];
        }];
      }
-      {
-        job_name = "portal";
-        static_configs = [{
-          targets = [ "${hosts.malobeo.hosts.zineshop.network.address}:9002" ];
-        }];
-      }
      # add vpn - check how to reach it first. most probably 10.100.0.1
    ];
  };
@@ -1,42 +0,0 @@
-{ self, config, lib, pkgs, inputs, ... }:
-
-with lib;
-
-let
-  hosts = import ../hosts.nix {};
-in
-{
-  networking = {
-    hostName = mkDefault "portal";
-    useDHCP = false;
-  };
-
-  imports = [
-    inputs.malobeo.nixosModules.malobeo.metrics
-    inputs.portal.nixosModules.portal
-    inputs.self.nixosModules.malobeo.users
-    ../modules/sshd.nix
-  ];
-
-  malobeo.metrics = {
-    enable = true;
-    enablePromtail = true;
-    logNginx = true;
-  };
-
-  malobeo.users = {
-    admin = true;
-  };
-
-  services.portal = {
-    enable = true;
-    #TODO: we should use FQDN like gatekeeper.hq.malobeo.org
-    gatekeeperHost = "${hosts.malobeo.hosts.goldman.network.address}:8000";
-    gatekeeperScheme = "http";
-  };
-
-  networking.firewall.allowedTCPPorts = [ 8080 ];
-
-  system.stateVersion = "22.11"; # Did you read the comment?
-}
-
@@ -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 = {
@@ -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
+