From 27c1859aced23e9150ec1dcd8f233a91bd6ef54f Mon Sep 17 00:00:00 2001 From: Nick Date: Sun, 30 Nov 2025 14:57:21 -0600 Subject: [PATCH] test: trying to fix opencloud --- .../opencloud/ceresOpenCloud/default.nix | 20 +++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/modules/nixos/guests/opencloud/ceresOpenCloud/default.nix b/modules/nixos/guests/opencloud/ceresOpenCloud/default.nix index fe4cc78..f79373a 100755 --- a/modules/nixos/guests/opencloud/ceresOpenCloud/default.nix +++ b/modules/nixos/guests/opencloud/ceresOpenCloud/default.nix @@ -75,7 +75,9 @@ in }; tmpfiles.rules = [ - "Z ${serviceCfg.varPaths.path0} 0755 ${serviceCfg.name} ${serviceCfg.name} -" + "d ${serviceCfg.varPaths.path0} 0755 ${serviceCfg.name} ${serviceCfg.name} -" + "L+ /etc/opencloud/proxy.yaml - - - - /etc/static/opencloud/proxy.yaml" + "z /etc/opencloud 0700 opencloud opencloud -" ]; }; @@ -83,8 +85,8 @@ in systemd.services.systemd-networkd.wantedBy = [ "multi-user.target" ]; microvm = { - vcpu = 2; - mem = 1024 * 3; + vcpu = 1; + mem = 1024 * 1; hypervisor = "qemu"; interfaces = [ { @@ -115,9 +117,16 @@ in { mountPoint = "/var/lib/${serviceCfg.name}"; proto = "virtiofs"; - source = serviceCfg.mntPaths.path0; + source = "${serviceCfg.mntPaths.path0}/data"; tag = "${serviceCfg.name}_data"; } + { + mountPoint = "/etc/opencloud"; + proto = "virtiofs"; + source = "${serviceCfg.mntPaths.path0}/config"; + tag = "${serviceCfg.name}_config"; + } + { mountPoint = "/run/secrets"; proto = "virtiofs"; @@ -132,6 +141,7 @@ in bottom trashy fastfetch + opencloud ; }; @@ -165,8 +175,6 @@ in systemd = { tmpfiles.rules = [ "d ${serviceCfg.mntPaths.path0} 0751 microvm wheel - -" - "d ${serviceCfg.mntPaths.path0}/storage 0755 opencloud opencloud - -" - "d ${serviceCfg.mntPaths.path0}/storage/users 2775 opencloud wheel - -" ]; };