Merge pull request 'Upgrade nextcloud to 31' (#105 ) from nextcloud_upgrade_31 into master

Reviewed-on: #105 Reviewed-by: kalipso <kalipso@c3d2.de>
[zineshop] shop.malobeo -> zines.malobeo
2025-04-15 01:10:19 +02:00 · 2025-04-15 01:08:28 +02:00 · 2025-04-15 01:07:52 +02:00 · 2025-04-15 00:48:46 +02:00 · 2025-04-15 00:33:49 +02:00 · 2025-04-14 22:32:32 +02:00
17 changed files with 5064 additions and 39 deletions
--- a/doc/src/anleitung/updates.md
+++ b/doc/src/anleitung/updates.md
@@ -1 +1,11 @@
 # Updates
+## Nextcloud
+Update nextcloud to a new major version:
+- create state directories: `mkdir /tmp/var /tmp/data`
+- run vm state dirs to initialize state `sudo run-vm nextcloud --dummy-secrets --networking --var /tmp/var --data /tmp/data`
+- Update lock file `nix flake update --commit-lock-file`
+- Change services.nextcloud.package to the next version (do not skip major version upgrades)
+- change custom `extraApps` to the new version
+- TEST!
+- run vm again, it should successfully upgrade nextcloud from old to new version
+- run vm state dirs to initialize state `sudo run-vm nextcloud --dummy-secrets --networking --var /tmp/var --data /tmp/data`
--- a/flake.lock
+++ b/flake.lock
@@ -67,11 +67,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1736373539,
-        "narHash": "sha256-dinzAqCjenWDxuy+MqUQq0I4zUSfaCvN9rzuCmgMZJY=",
+        "lastModified": 1744117652,
+        "narHash": "sha256-t7dFCDl4vIOOUMhEZnJF15aAzkpaup9x4ZRGToDFYWI=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "bd65bc3cde04c16755955630b344bc9e35272c56",
+        "rev": "b4e98224ad1336751a2ac7493967a4c9f6d9cb3f",
        "type": "github"
      },
      "original": {
@@ -109,11 +109,11 @@
        "spectrum": "spectrum"
      },
      "locked": {
-        "lastModified": 1739104176,
-        "narHash": "sha256-bNvtud2PUcbYM0i5Uq1v01Dcgq7RuhVKfjaSKkW2KRI=",
+        "lastModified": 1743083165,
+        "narHash": "sha256-Fz7AiCJWtoWZ2guJwO3B1h3RuJxYWaCzFIqY0Kmkyrs=",
        "owner": "astro",
        "repo": "microvm.nix",
-        "rev": "d3a9b7504d420a1ffd7c83c1bb8fe57deaf939d2",
+        "rev": "773d5a04e2e10ca7b412270dea11276a496e1b61",
        "type": "github"
      },
      "original": {
@@ -145,11 +145,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1737057290,
-        "narHash": "sha256-3Pe0yKlCc7EOeq1X/aJVDH0CtNL+tIBm49vpepwL1MQ=",
+        "lastModified": 1742568034,
+        "narHash": "sha256-QaMEhcnscfF2MqB7flZr+sLJMMYZPnvqO4NYf9B4G38=",
        "owner": "nix-community",
        "repo": "nixos-generators",
-        "rev": "d002ce9b6e7eb467cd1c6bb9aef9c35d191b5453",
+        "rev": "42ee229088490e3777ed7d1162cb9e9d8c3dbb11",
        "type": "github"
      },
      "original": {
@@ -160,11 +160,11 @@
    },
    "nixos-hardware": {
      "locked": {
-        "lastModified": 1738816619,
-        "narHash": "sha256-5yRlg48XmpcX5b5HesdGMOte+YuCy9rzQkJz+imcu6I=",
+        "lastModified": 1744366945,
+        "narHash": "sha256-OuLhysErPHl53BBifhesrRumJNhrlSgQDfYOTXfgIMg=",
        "owner": "NixOS",
        "repo": "nixos-hardware",
-        "rev": "2eccff41bab80839b1d25b303b53d339fbb07087",
+        "rev": "1fe3cc2bc5d2dc9c81cb4e63d2f67c1543340df1",
        "type": "github"
      },
      "original": {
@@ -192,11 +192,11 @@
    },
    "nixpkgs-unstable": {
      "locked": {
-        "lastModified": 1739020877,
-        "narHash": "sha256-mIvECo/NNdJJ/bXjNqIh8yeoSjVLAuDuTUzAo7dzs8Y=",
+        "lastModified": 1744232761,
+        "narHash": "sha256-gbl9hE39nQRpZaLjhWKmEu5ejtQsgI5TWYrIVVJn30U=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "a79cfe0ebd24952b580b1cf08cd906354996d547",
+        "rev": "f675531bc7e6657c10a18b565cfebd8aa9e24c14",
        "type": "github"
      },
      "original": {
@@ -208,11 +208,11 @@
    },
    "nixpkgs_2": {
      "locked": {
-        "lastModified": 1739206421,
-        "narHash": "sha256-PwQASeL2cGVmrtQYlrBur0U20Xy07uSWVnFup2PHnDs=",
+        "lastModified": 1744309437,
+        "narHash": "sha256-QZnNHM823am8apCqKSPdtnzPGTy2ZB4zIXOVoBp5+W0=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "44534bc021b85c8d78e465021e21f33b856e2540",
+        "rev": "f9ebe33a928b5d529c895202263a5ce46bdf12f7",
        "type": "github"
      },
      "original": {
@@ -235,7 +235,8 @@
        "nixpkgs-unstable": "nixpkgs-unstable",
        "sops-nix": "sops-nix",
        "tasklist": "tasklist",
-        "utils": "utils_3"
+        "utils": "utils_3",
+        "zineshop": "zineshop"
      }
    },
    "sops-nix": {
@@ -245,11 +246,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1739262228,
-        "narHash": "sha256-7JAGezJ0Dn5qIyA2+T4Dt/xQgAbhCglh6lzCekTVMeU=",
+        "lastModified": 1744103455,
+        "narHash": "sha256-SR6+qjkPjGQG+8eM4dCcVtss8r9bre/LAxFMPJpaZeU=",
        "owner": "Mic92",
        "repo": "sops-nix",
-        "rev": "07af005bb7d60c7f118d9d9f5530485da5d1e975",
+        "rev": "69d5a5a4635c27dae5a742f36108beccc506c1ba",
        "type": "github"
      },
      "original": {
@@ -334,6 +335,21 @@
        "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": [
@@ -341,11 +357,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1737548421,
-        "narHash": "sha256-gmlqJdC+v86vXc2yMhiza1mvsqh3vMfrEsiw+tV5MXg=",
+        "lastModified": 1743458889,
+        "narHash": "sha256-eVTtsCPio3Wj/g/gvKTsyjh90vrNsmgjzXK9jMfcboM=",
        "ref": "refs/heads/master",
-        "rev": "c5fff78c83959841ac724980a13597dcfa6dc26d",
-        "revCount": 29,
+        "rev": "b61466549e2687628516aa1f9ba73f251935773a",
+        "revCount": 30,
        "type": "git",
        "url": "https://git.dynamicdiscord.de/kalipso/tasklist"
      },
@@ -407,6 +423,45 @@
        "repo": "flake-utils",
        "type": "github"
      }
+    },
+    "utils_4": {
+      "inputs": {
+        "systems": "systems_5"
+      },
+      "locked": {
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "zineshop": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "utils": "utils_4"
+      },
+      "locked": {
+        "lastModified": 1744671971,
+        "narHash": "sha256-fMqRwtaEd7gIQRVqjpcRXxxxP3pDTFxfIJFtnLbqivY=",
+        "ref": "refs/heads/master",
+        "rev": "c55cf4480b1d4aa7914c32e4d6322fd10c2404bd",
+        "revCount": 114,
+        "type": "git",
+        "url": "https://git.dynamicdiscord.de/kalipso/zineshop"
+      },
+      "original": {
+        "type": "git",
+        "url": "https://git.dynamicdiscord.de/kalipso/zineshop"
+      }
    }
  },
  "root": "root",
--- a/flake.nix
+++ b/flake.nix
@@ -22,6 +22,11 @@
      inputs.nixpkgs.follows = "nixpkgs";
    };

+    zineshop = {
+      url = "git+https://git.dynamicdiscord.de/kalipso/zineshop";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
    ep3-bs = {
      url = "git+https://git.dynamicdiscord.de/kalipso/ep3-bs.nix";
      inputs.nixpkgs.follows = "nixpkgs";
--- a/machines/durruti/host_config.nix
+++ b/machines/durruti/host_config.nix
@@ -73,6 +73,17 @@ in
      };
    };

+
+    services.nginx.virtualHosts."zines.malobeo.org" = {
+      forceSSL = true;
+      enableACME= true;
+      locations."/" = {
+        proxyPass = "http://10.0.0.10";
+        extraConfig = ''
+        '';
+      };
+    };
+
    services.nginx.virtualHosts."status.malobeo.org" = {
      forceSSL = true;
      enableACME= true;
--- a/machines/fanny/configuration.nix
+++ b/machines/fanny/configuration.nix
@@ -5,6 +5,7 @@ in
 {
  sops.defaultSopsFile = ./secrets.yaml;
  sops.secrets.wg_private = {};
+  sops.secrets.shop_auth = {};

  imports =
    [ # Include the results of the hardware scan.
@@ -93,7 +94,13 @@ in
  };

  services.malobeo.microvm.enableHostBridge = true;
-  services.malobeo.microvm.deployHosts = [ "overwatch" "infradocs" "nextcloud" "durruti" ];
+  services.malobeo.microvm.deployHosts = [ 
+    "overwatch" 
+    "infradocs" 
+    "nextcloud" 
+    "durruti" 
+    "zineshop"
+  ];

  networking = {
    nat = {
@@ -144,6 +151,18 @@ in
        '';
      };
    };
+
+    virtualHosts."zines.malobeo.org" = {
+      # created with: nix-shell --packages apacheHttpd --run 'htpasswd -B -c foo.txt malobeo'
+      # then content of foo.txt put into sops
+      basicAuthFile = config.sops.secrets.shop_auth.path;
+      locations."/" = {
+        proxyPass = "http://10.0.0.15:8080";
+        extraConfig = ''
+          proxy_set_header Host $host;
+        '';
+      };
+    };
  };

  services.tor = {
@@ -163,5 +182,10 @@ in

  time.timeZone = "Europe/Berlin";
  system.stateVersion = "23.05"; # Do.. Not.. Change..
+
+  sops.secrets.shop_auth = {
+    owner = config.services.nginx.user;
+    group = config.services.nginx.group;
+  };
 }

--- a/machines/fanny/secrets.yaml
+++ b/machines/fanny/secrets.yaml
@@ -1,4 +1,6 @@
 wg_private: ENC[AES256_GCM,data:kFuLzZz9lmtUccQUIYiXvJRf7WBg5iCq1xxCiI76J3TaIBELqgbEmUtPR4g=,iv:0S0uzX4OVxQCKDOl1zB6nDo8152oE7ymBWdVkPkKlro=,tag:gg1n1BsnjNPikMBNB60F5Q==,type:str]
+shop_cleartext: ENC[AES256_GCM,data:sifpX/R6JCcNKgwN2M4Dbflgnfs5CqB8ez5fULPohuFS6k36BLemWzEk,iv:1lRYausj7V/53sfSO9UnJ2OC/Si94JXgIo81Ld74BE8=,tag:5osQU/67bvFeUGA90BSiIA==,type:str]
+shop_auth: ENC[AES256_GCM,data:0NDIRjmGwlSFls12sCb5OlgyGTCHpPQIjycEJGhYlZsWKhEYXV2u3g1RHMkF8Ny913jarjf0BgwSq5pBD9rgPL9t8X8=,iv:3jgCv/Gg93Mhdm4eYzwF9QrK14QL2bcC4wwSajCA88o=,tag:h8dhMK46hABv9gYW4johkA==,type:str]
 sops:
    kms: []
    gcp_kms: []
@@ -23,8 +25,8 @@ sops:
            QVZyNWVOMTh3ejBha21Qb2xCRkFERGMKH9nMQUoS5bGcLUx2T1dOmKd9jshttTrP
            SKFx7MXcjFRLKS2Ij12V8ftjL3Uod6be5zoMibkxK19KmXY/514Jww==
            -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2025-01-14T12:41:07Z"
-    mac: ENC[AES256_GCM,data:RJ4Fa8MmX8u8S3zrD/SaywTC3d2IfHQPBDy3C9u4GuXJ/ruEChAB1kN8rqMPvkmET8UUgHIEp7RpbzMtg/FOmKYKYTTx5t//3/VozvAEZurhG/4mnN3r6uaZ0R9+wSjym8IyOKsJ7p4XrfE5tRdzNyU4EqfkEiyf+jO751uSnYI=,iv:eiTdmbcrpUvyDPFmGawxJs/ehmD7KqulaoB+nfpC6ko=,tag:+TKr53cFS3wbLXNgcbZfJQ==,type:str]
+    lastmodified: "2025-04-14T10:34:55Z"
+    mac: ENC[AES256_GCM,data:vcDXtTi0bpqhHnL6XanJo+6a8f5LAE628HazDVaNO34Ll3eRyhi95eYGXQDDkVk2WUn9NJ5oCMPltnU82bpLtskzTfQDuXHaPZJq5gtOuMH/bAKrY0dfShrdyx71LkA4AFlcI1P5hchpbyY1FK3iqe4D0miBv+Q8lCMgQMVrfxI=,iv:1lMzH899K0CnEtm16nyq8FL/aCkSYJVoj7HSKCyUnPg=,tag:mEbkmFNg5VZtSKqq80NrCw==,type:str]
    pgp:
        - created_at: "2025-02-11T18:32:49Z"
          enc: |-
@@ -65,4 +67,4 @@ sops:
            -----END PGP MESSAGE-----
          fp: aef8d6c7e4761fc297cda833df13aebb1011b5d4
    unencrypted_suffix: _unencrypted
-    version: 3.9.2
+    version: 3.9.4
--- a/machines/hosts.nix
+++ b/machines/hosts.nix
@@ -67,6 +67,14 @@
        };
      };

+      zineshop = {
+        type = "microvm";
+        network = {
+          address = "10.0.0.15";
+          mac = "D0:E5:CA:F0:D7:F1";
+        };
+      };
+
      testvm = {
        type = "host";
      };
--- a/machines/louise/configuration.nix
+++ b/machines/louise/configuration.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ config, pkgs, inputs, ... }:

 {
  imports =
@@ -9,6 +9,7 @@
      ../modules/sshd.nix
      ../modules/minimal_tools.nix
      ../modules/autoupdate.nix
+      inputs.self.nixosModules.malobeo.printing
    ];

  malobeo.autoUpdate = {
@@ -50,6 +51,8 @@
  };

  services.printing.enable = true;
+  services.malobeo.printing.enable = true;
+
  services.printing.drivers = [
    (pkgs.writeTextDir "share/cups/model/brother5350.ppd" (builtins.readFile ../modules/BR5350_2_GPL.ppd))
    pkgs.gutenprint
--- a/machines/modules/KOC658UX.ppd
+++ b/machines/modules/KOC658UX.ppd
--- a/machines/modules/host_builder.nix
+++ b/machines/modules/host_builder.nix
@@ -133,6 +133,13 @@ rec {
          mountPoint = "/var";
          tag = "var";
        }
+      ] ++ pkgs.lib.optionals (options.dataPath != "") [
+        {
+          source = "${options.dataPath}";
+          securityModel = "mapped";
+          mountPoint = "/data";
+          tag = "data";
+        }
      ]);

      interfaces = pkgs.lib.mkIf (!options.withNetworking) (pkgs.lib.mkForce [{
@@ -209,6 +216,7 @@ rec {
            (vmMicroVMOverwrites name { 
              withNetworking = true; 
              varPath = ""; 
+              dataPath = "";
              writableStore = false; })
            (if sopsDummy then (vmSopsOverwrites name) else {})
          ]);
@@ -218,11 +226,12 @@ rec {
    builtins.listToAttrs (map mapperFunc self.nixosConfigurations.${host}.config.services.malobeo.microvm.deployHosts));
  };

-  buildVM = host: networking: sopsDummy: disableDisko: varPath: writableStore: fwdPort: (self.nixosConfigurations.${host}.extendModules {
+  buildVM = host: networking: sopsDummy: disableDisko: varPath: dataPath: writableStore: fwdPort: (self.nixosConfigurations.${host}.extendModules {
      modules = [
          (vmMicroVMOverwrites host { 
            withNetworking = networking; 
            varPath = "${varPath}"; 
+            dataPath = "${dataPath}"; 
            writableStore = writableStore;
            fwdPort = fwdPort; })
          (if sopsDummy then (vmSopsOverwrites host) else {})
--- a/machines/modules/malobeo/printing.nix
+++ b/machines/modules/malobeo/printing.nix
@@ -0,0 +1,51 @@
+{ config, lib, pkgs, ... }:
+with lib;
+let 
+  cfg = config.services.malobeo.printing;
+  driverFile = pkgs.writeTextDir "share/cups/model/konicaminoltac258.ppd" (builtins.readFile ../KOC658UX.ppd);
+
+  defaultPpdOptions = {
+    PageSize = "A4";
+    SelectColor = "Grayscale";
+    Finisher = "FS534";
+    SaddleUnit = "SD511";
+    Model = "C258";
+    InputSlot = "Tray1";
+  };
+
+in
+{
+  options.services.malobeo.printing = {
+    enable = mkOption {
+      type = types.bool;
+      default = false;
+      description = "Setup malobeo printers";
+    };
+  };
+  
+  config = mkIf (cfg.enable) {
+    services.printing.enable = true;
+    services.printing.drivers = [
+      driverFile
+    ];
+
+    hardware.printers.ensurePrinters = [ {
+      name = "KonicaDefault";
+      model = "konicaminoltac258.ppd";
+      location = "Zine Workshop";
+      deviceUri = "ipp://192.168.1.42/ipp";
+      ppdOptions = defaultPpdOptions;
+    }
+    {
+      name = "KonicaBooklet";
+      model = "konicaminoltac258.ppd";
+      location = "Zine Workshop";
+      deviceUri = "ipp://192.168.1.42/ipp";
+      ppdOptions = defaultPpdOptions // {
+        Fold = "Stitch";
+        Staple = "None";
+      };
+    }
+  ];
+  };
+}
--- a/machines/nextcloud/configuration.nix
+++ b/machines/nextcloud/configuration.nix
@@ -33,7 +33,7 @@ with lib;

  services.nextcloud = {
    enable = true;
-    package = pkgs.nextcloud30;
+    package = pkgs.nextcloud31;
    hostName = "cloud.malobeo.org";
    config.adminpassFile = config.sops.secrets.nextcloudAdminPass.path;
    #https = true; #disable for testing
@@ -47,10 +47,10 @@ with lib;
    };
    extraAppsEnable = true;
    extraApps = {
-      inherit (config.services.nextcloud.package.packages.apps) contacts calendar deck polls registration;
-      collectives = pkgs.fetchNextcloudApp {
-        sha256 = "sha256-cj/8FhzxOACJaUEu0eG9r7iAQmnOG62yFHeyUICalFY=";
-        url = "https://github.com/nextcloud/collectives/releases/download/v2.15.2/collectives-2.15.2.tar.gz";
+      inherit (config.services.nextcloud.package.packages.apps) contacts calendar deck polls registration collectives forms;
+      appointments = pkgs.fetchNextcloudApp {
+        sha256 = "sha256-ls1rLnsX7U9wo2WkEtzhrvliTcWUl6LWXolE/9etJ78=";
+        url = "https://github.com/SergeyMosin/Appointments/raw/refs/tags/v2.4.3/build/artifacts/appstore/appointments.tar.gz";
        license = "agpl3Plus";
      };
    };
@@ -62,7 +62,7 @@ with lib;
    };
    phpOptions = {
      "realpath_cache_size" = "0";
-      "opcache.interned_strings_buffer" = "23";
+      "opcache.interned_strings_buffer" = "32";
    };
  };

--- a/machines/overwatch/configuration.nix
+++ b/machines/overwatch/configuration.nix
@@ -107,6 +107,12 @@ with lib;
          targets = [ "10.0.0.13:9002" ];
        }];
      }
+      {
+        job_name = "zineshop";
+        static_configs = [{
+          targets = [ "10.0.0.15:9002" ];
+        }];
+      }
      {
        job_name = "fanny";
        static_configs = [{
--- a/machines/vpn/configuration.nix
+++ b/machines/vpn/configuration.nix
@@ -66,6 +66,20 @@ with lib;
        '';
      };
    };
+
+    virtualHosts."zines.malobeo.org" = {
+      locations."/" = {
+        proxyPass = "http://10.100.0.101";
+        extraConfig = ''
+          proxy_set_header Host $host;
+          proxy_set_header X-Real-IP $remote_addr;
+          proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+          proxy_set_header X-Forwarded-Proto $scheme;
+          proxy_set_header Authorization $http_authorization;  # Pass the Authorization header
+          proxy_pass_header Authorization;
+        '';
+      };
+    };
  };

  system.stateVersion = "22.11"; # Did you read the comment?
--- a/machines/zineshop/configuration.nix
+++ b/machines/zineshop/configuration.nix
@@ -0,0 +1,34 @@
+{ self, config, lib, pkgs, inputs, ... }:
+
+with lib;
+
+{
+  networking = {
+    hostName = mkDefault "zineshop";
+    useDHCP = false;
+  };
+
+  imports = [
+    inputs.malobeo.nixosModules.malobeo.metrics
+    inputs.malobeo.nixosModules.malobeo.printing
+    inputs.zineshop.nixosModules.zineshop
+    ../modules/malobeo_user.nix
+    ../modules/sshd.nix
+  ];
+
+  malobeo.metrics = {
+    enable = true;
+    enablePromtail = true;
+    logNginx = true;
+    lokiHost = "10.0.0.14";
+  };
+
+  services.printing.enable = true;
+  services.malobeo.printing.enable = true;
+
+  services.zineshop.enable = true;
+  networking.firewall.allowedTCPPorts = [ 8080 ];
+
+  system.stateVersion = "22.11"; # Did you read the comment?
+}
+
--- a/outputs.nix
+++ b/outputs.nix
@@ -117,6 +117,7 @@ in (utils.lib.eachSystem (builtins.filter filter_system utils.lib.defaultSystems
      disko.imports = [ ./machines/modules/disko ];
      users.imports = [ ./machines/modules/malobeo/users.nix ];
      backup.imports = [ ./machines/modules/malobeo/backup.nix ];
+      printing.imports = [ ./machines/modules/malobeo/printing.nix ];
    };

    hydraJobs = nixpkgs.lib.mapAttrs (_: nixpkgs.lib.hydraJob) (
--- a/scripts/run-vm.sh
+++ b/scripts/run-vm.sh
@@ -6,6 +6,7 @@ usage() {
    echo "--no-disko disable disko and initrd secrets. needed for real hosts like fanny"
    echo "--writable-store enables writable store. necessary for host with nested imperative microvms like fanny"
    echo "--var path to directory that should be shared as /var. may require root otherwise some systemd units fail within vm. if dir is empty vm will populate"
+    echo "--data path to directory that should be shared as /data"
    echo "--fwd-port forwards the given port to port 80 on vm"
    exit 1
 }
@@ -23,6 +24,7 @@ DUMMY_SECRETS=false
 NO_DISKO=false
 RW_STORE=false
 VAR_PATH=""
+DATA_PATH=""
 FWD_PORT=0

 # check argws
@@ -42,6 +44,15 @@ while [[ "$#" -gt 0 ]]; do
              usage
          fi
          ;;
+        --data) 
+          if [[ -n "$2" && ! "$2" =~ ^- ]]; then
+              DATA_PATH="$2"
+              shift
+          else
+              echo "Error: --data requires a non-empty string argument."
+              usage
+          fi
+          ;;
        --fwd-port) 
          if [[ -n "$2" && ! "$2" =~ ^- ]]; then
              FWD_PORT="$2"
@@ -64,4 +75,8 @@ if [ -n "$VAR_PATH" ]; then
  echo "sharing var directory: $VAR_PATH"
 fi

-nix run --show-trace --impure --expr "((builtins.getFlake \"$(pwd)\").vmBuilder.x86_64-linux \"$HOSTNAME\" $NETWORK $DUMMY_SECRETS $NO_DISKO \"$VAR_PATH\" $RW_STORE $FWD_PORT).config.microvm.declaredRunner"
+if [ -n "$DATA_PATH" ]; then
+  echo "sharing data directory: $DATA_PATH"
+fi
+
+nix run --show-trace --impure --expr "((builtins.getFlake \"$(pwd)\").vmBuilder.x86_64-linux \"$HOSTNAME\" $NETWORK $DUMMY_SECRETS $NO_DISKO \"$VAR_PATH\" \"$DATA_PATH\" $RW_STORE $FWD_PORT).config.microvm.declaredRunner"
Author	SHA1	Message	Date
kalipso	c7cf9cc1ff	Merge pull request 'Upgrade nextcloud to 31' (#105 ) from nextcloud_upgrade_31 into master All checks were successful Check flake syntax / flake-check (push) Successful in 6m12s Details Reviewed-on: #105 Reviewed-by: kalipso <kalipso@c3d2.de>	2025-04-15 01:10:19 +02:00
kalipso	1eb6104be9	[zineshop] shop.malobeo -> zines.malobeo Some checks are pending Check flake syntax / flake-check (push) Waiting to run Details	2025-04-15 01:08:28 +02:00
kalipso	bc1ea7aa2c	[flake] update zineshop	2025-04-15 01:07:52 +02:00
kalipso	8ee697b67c	[fanny] fix auth secret permission All checks were successful Check flake syntax / flake-check (push) Successful in 4m17s Details	2025-04-15 00:48:46 +02:00
kalipso	48cdd2283a	[zineshop] ... All checks were successful Check flake syntax / flake-check (push) Successful in 4m25s Details	2025-04-15 00:33:49 +02:00
kalipso	b3d7be6786	[zineshop] do not set auth header... All checks were successful Check flake syntax / flake-check (push) Successful in 4m24s Details slowly getting mad	2025-04-14 22:32:32 +02:00
kalipso	51d97ed9ba	[zineshop] pass host on fanny All checks were successful Check flake syntax / flake-check (push) Successful in 4m30s Details	2025-04-14 22:11:09 +02:00
kalipso	a29339bc29	[zineshop] set auth header at vpn All checks were successful Check flake syntax / flake-check (push) Successful in 4m31s Details	2025-04-14 22:01:19 +02:00
kalipso	3991435cf3	[zineshop] acutally remove header pass All checks were successful Check flake syntax / flake-check (push) Successful in 4m29s Details	2025-04-14 21:28:16 +02:00
kalipso	94e05d99a4	[zineshop] fiddle with proxy_pass_header Authorization All checks were successful Check flake syntax / flake-check (push) Successful in 4m33s Details	2025-04-14 21:12:12 +02:00
kalipso	b1de5a1f71	[zineshop] update proxy pass directives All checks were successful Check flake syntax / flake-check (push) Successful in 8m3s Details	2025-04-14 20:54:13 +02:00
kalipso	6946cf9c51	[host_config] fix typo All checks were successful Check flake syntax / flake-check (push) Successful in 8m14s Details	2025-04-14 15:35:05 +02:00
kalipso	2e11dac1db	[zineshop] proxy_pass_header Authorization Some checks failed Check flake syntax / flake-check (push) Failing after 2m44s Details	2025-04-14 15:30:17 +02:00
kalipso	46849ff517	[zineshop] update proxypass All checks were successful Check flake syntax / flake-check (push) Successful in 6m16s Details	2025-04-14 15:15:41 +02:00
kalipso	9c69f663ee	[zineshop] proxypass auth header All checks were successful Check flake syntax / flake-check (push) Successful in 6m42s Details	2025-04-14 13:26:00 +02:00
kalipso	a07f7b22f0	Merge pull request 'add zineshop' (#103 ) from zineshop into master All checks were successful Check flake syntax / flake-check (push) Successful in 6m42s Details Reviewed-on: #103	2025-04-14 12:46:54 +02:00
kalipso	ce6b83f52f	[fanny] add zineshop vm All checks were successful Check flake syntax / flake-check (push) Successful in 4m29s Details	2025-04-14 12:39:56 +02:00
kalipso	5a87c7f0dc	[flake] update zineshop Some checks failed Check flake syntax / flake-check (push) Has been cancelled Details	2025-04-14 12:36:50 +02:00
kalipso	38b2fd0bcc	[zineshop] proxyforward with auth	2025-04-14 12:35:48 +02:00
kalipso	ae31ad99bb	[flake] update zineshop All checks were successful Check flake syntax / flake-check (push) Successful in 4m27s Details	2025-04-14 11:00:02 +02:00
kalipso	fd51fc97fc	[flake] update zineshop Some checks failed Check flake syntax / flake-check (push) Has been cancelled Details	2025-04-14 10:57:45 +02:00
kalipso	e171178a93	[docs] updates fix linebreaks All checks were successful Check flake syntax / flake-check (push) Successful in 4m26s Details	2025-04-13 15:30:53 +02:00
kalipso	7732abfd68	[docs] update updates Some checks failed Check flake syntax / flake-check (push) Has been cancelled Details	2025-04-13 15:29:28 +02:00
kalipso	da12a73334	[run-vim] allow setting data share All checks were successful Check flake syntax / flake-check (push) Successful in 4m27s Details	2025-04-13 15:24:06 +02:00
kalipso	c6b6720c42	[flake] update zineshop All checks were successful Check flake syntax / flake-check (push) Successful in 6m2s Details	2025-04-12 02:39:29 +02:00
kalipso	01fb1bdaa8	[zineshop] enable printing	2025-04-12 02:39:28 +02:00
kalipso	783ec0da20	[louise] fix missing inputs	2025-04-12 02:39:28 +02:00
kalipso	c02f4cdfb3	[louise] enable printing module	2025-04-12 02:39:28 +02:00
kalipso	de054fbb2e	[printing] init module	2025-04-12 02:39:28 +02:00
kalipso	ee709ee36e	[flake] update zineshop All checks were successful Check flake syntax / flake-check (push) Successful in 4m27s Details	2025-04-12 02:27:04 +02:00
ahtlon	00f4b7c2b1	[docs] Add nextcloud upgrade docs All checks were successful Check flake syntax / flake-check (push) Successful in 4m25s Details	2025-04-11 21:16:49 +02:00
ahtlon	6b25292815	[nextcloud] update to 31, add forms, appointments app	2025-04-11 21:07:04 +02:00
ahtlon	f6719d3218	flake.lock: Update Flake lock file updates: • Updated input 'home-manager': 'github:nix-community/home-manager/bd65bc3cde04c16755955630b344bc9e35272c56?narHash=sha256-dinzAqCjenWDxuy%2BMqUQq0I4zUSfaCvN9rzuCmgMZJY%3D' (2025-01-08) → 'github:nix-community/home-manager/b4e98224ad1336751a2ac7493967a4c9f6d9cb3f?narHash=sha256-t7dFCDl4vIOOUMhEZnJF15aAzkpaup9x4ZRGToDFYWI%3D' (2025-04-08) • Updated input 'microvm': 'github:astro/microvm.nix/d3a9b7504d420a1ffd7c83c1bb8fe57deaf939d2?narHash=sha256-bNvtud2PUcbYM0i5Uq1v01Dcgq7RuhVKfjaSKkW2KRI%3D' (2025-02-09) → 'github:astro/microvm.nix/773d5a04e2e10ca7b412270dea11276a496e1b61?narHash=sha256-Fz7AiCJWtoWZ2guJwO3B1h3RuJxYWaCzFIqY0Kmkyrs%3D' (2025-03-27) • Updated input 'nixos-generators': 'github:nix-community/nixos-generators/d002ce9b6e7eb467cd1c6bb9aef9c35d191b5453?narHash=sha256-3Pe0yKlCc7EOeq1X/aJVDH0CtNL%2BtIBm49vpepwL1MQ%3D' (2025-01-16) → 'github:nix-community/nixos-generators/42ee229088490e3777ed7d1162cb9e9d8c3dbb11?narHash=sha256-QaMEhcnscfF2MqB7flZr%2BsLJMMYZPnvqO4NYf9B4G38%3D' (2025-03-21) • Updated input 'nixos-hardware': 'github:NixOS/nixos-hardware/2eccff41bab80839b1d25b303b53d339fbb07087?narHash=sha256-5yRlg48XmpcX5b5HesdGMOte%2BYuCy9rzQkJz%2Bimcu6I%3D' (2025-02-06) → 'github:NixOS/nixos-hardware/1fe3cc2bc5d2dc9c81cb4e63d2f67c1543340df1?narHash=sha256-OuLhysErPHl53BBifhesrRumJNhrlSgQDfYOTXfgIMg%3D' (2025-04-11) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/44534bc021b85c8d78e465021e21f33b856e2540?narHash=sha256-PwQASeL2cGVmrtQYlrBur0U20Xy07uSWVnFup2PHnDs%3D' (2025-02-10) → 'github:NixOS/nixpkgs/f9ebe33a928b5d529c895202263a5ce46bdf12f7?narHash=sha256-QZnNHM823am8apCqKSPdtnzPGTy2ZB4zIXOVoBp5%2BW0%3D' (2025-04-10) • Updated input 'nixpkgs-unstable': 'github:NixOS/nixpkgs/a79cfe0ebd24952b580b1cf08cd906354996d547?narHash=sha256-mIvECo/NNdJJ/bXjNqIh8yeoSjVLAuDuTUzAo7dzs8Y%3D' (2025-02-08) → 'github:NixOS/nixpkgs/f675531bc7e6657c10a18b565cfebd8aa9e24c14?narHash=sha256-gbl9hE39nQRpZaLjhWKmEu5ejtQsgI5TWYrIVVJn30U%3D' (2025-04-09) • Updated input 'sops-nix': 'github:Mic92/sops-nix/07af005bb7d60c7f118d9d9f5530485da5d1e975?narHash=sha256-7JAGezJ0Dn5qIyA2%2BT4Dt/xQgAbhCglh6lzCekTVMeU%3D' (2025-02-11) → 'github:Mic92/sops-nix/69d5a5a4635c27dae5a742f36108beccc506c1ba?narHash=sha256-SR6%2BqjkPjGQG%2B8eM4dCcVtss8r9bre/LAxFMPJpaZeU%3D' (2025-04-08)	2025-04-11 20:15:52 +02:00
kalipso	686ef89e76	[flake] update zineshop	2025-04-11 19:32:50 +02:00
kalipso	e294fecf7e	[zineshop] init Some checks failed Check flake syntax / flake-check (push) Failing after 1m2s Details	2025-04-11 18:18:30 +02:00
kalipso	71eef69889	Merge pull request 'module for konica printer' (#102 ) from printer-module into master All checks were successful Check flake syntax / flake-check (push) Successful in 6m16s Details Reviewed-on: #102	2025-04-11 17:33:19 +02:00
kalipso	80fc4cc528	[louise] fix missing inputs All checks were successful Check flake syntax / flake-check (push) Successful in 4m20s Details	2025-04-11 17:24:31 +02:00
kalipso	8b37082844	[louise] enable printing module Some checks failed Check flake syntax / flake-check (push) Failing after 6m18s Details	2025-04-11 17:07:49 +02:00
kalipso	6c3a7be483	[printing] init module	2025-04-11 17:03:10 +02:00
kalipso	568cce0d48	[louise] add c258 printer driver All checks were successful Check flake syntax / flake-check (push) Successful in 4m43s Details	2025-04-08 18:53:56 +02:00
kalipso	46e9bae193	[flake] update tasklist All checks were successful Check flake syntax / flake-check (push) Successful in 6m23s Details	2025-04-01 00:10:18 +02:00
kalipso	4949719307	Merge pull request 'Initialize microvm directories' (#93 ) from microvm-dirs into master All checks were successful Check flake syntax / flake-check (push) Successful in 4m34s Details Reviewed-on: #93	2025-03-20 20:05:42 +01:00