diff --git a/modules/server/containers/defs/collabora.nix b/modules/server/containers/defs/collabora.nix index dd71f90..9403181 100644 --- a/modules/server/containers/defs/collabora.nix +++ b/modules/server/containers/defs/collabora.nix @@ -11,7 +11,6 @@ in { ip = containerCfg.ip; secret = "collabora"; extraEnv = { - "username" = "COLLABORA_USER"; "aliasgroup1" = "https://${serverCfg.containers.nextcloud.subdomain}.${serverCfg.hostDomain}"; "server_name" = "${containerCfg.subdomain}.${serverCfg.hostDomain}"; "VIRTUAL_HOST" = "${containerCfg.subdomain}.${serverCfg.hostDomain}"; diff --git a/modules/server/sops/default.nix b/modules/server/sops/default.nix index 6e064ae..ce7cfb6 100644 --- a/modules/server/sops/default.nix +++ b/modules/server/sops/default.nix @@ -2,7 +2,7 @@ let listNames = config.syscfg.server.db; containerNames = lib.mapAttrsToList (name: cfg: name) - (lib.filterAttrs (name: cfg: cfg.db or false) config.syscfg.server.containers); + (lib.filterAttrs (name: cfg: cfg.db or cfg.sops or false) config.syscfg.server.containers); allApps = lib.unique (listNames ++ containerNames); in{ config = lib.mkIf (config.syscfg.server.sops) { diff --git a/systems/sandbox/cfg.nix b/systems/sandbox/cfg.nix index 043895e..9f2a580 100644 --- a/systems/sandbox/cfg.nix +++ b/systems/sandbox/cfg.nix @@ -49,7 +49,7 @@ }; collabora = { enable = true; - db = false; + sops = true; subdomain = "office"; ip = "10.88.0.127"; port = 9980;