From 989e717e4ea44f0e62c0899fdb9671e146313add Mon Sep 17 00:00:00 2001 From: mjallen18 Date: Tue, 9 Dec 2025 17:15:49 -0600 Subject: [PATCH] opencloud fucked still lmao --- modules/nixos/services/opencloud/default.nix | 23 +++++++++++--------- systems/x86_64-linux/jallen-nas/apps.nix | 4 ++++ systems/x86_64-linux/jallen-nas/default.nix | 3 ++- 3 files changed, 19 insertions(+), 11 deletions(-) diff --git a/modules/nixos/services/opencloud/default.nix b/modules/nixos/services/opencloud/default.nix index fe5d135..6d242d5 100644 --- a/modules/nixos/services/opencloud/default.nix +++ b/modules/nixos/services/opencloud/default.nix @@ -13,14 +13,17 @@ let services.opencloud = { enable = true; port = cfg.port; - environment = { - OC_OIDC_ISSUER = ""; - OC_EXCLUDE_RUN_SERVICES = "idp"; - PROXY_OIDC_REWRITE_WELLKNOWN = true; - PROXY_USER_OIDC_CLAIM = "preferred_username"; - PROXY_AUTOPROVISION_ACCOUNTS = true; - PROXY_ROLE_ASSIGNMENT_DRIVER = "oidc"; - }; + stateDir = cfg.dataDir; + address = "0.0.0.0"; + url = "https://10.0.1.3:${toString cfg.port}"; + # environment = { + # OC_OIDC_ISSUER = ""; + # OC_EXCLUDE_RUN_SERVICES = "idp"; + # PROXY_OIDC_REWRITE_WELLKNOWN = "true"; + # PROXY_USER_OIDC_CLAIM = "preferred_username"; + # PROXY_AUTOPROVISION_ACCOUNTS = "true"; + # PROXY_ROLE_ASSIGNMENT_DRIVER = "oidc"; + # }; }; }; @@ -43,11 +46,11 @@ in options.${namespace}.services.opencloud = { enable = mkEnableOption "opencloud service"; - port = mkOpt types.int 4000 "Port for opencloud to be hosted on"; + port = mkOpt types.int 8400 "Port for opencloud to be hosted on"; localAddress = mkOpt types.str "127.0.0.1" "local address of the service"; - dataDir = mkOpt types.str "" "Path to the data dir"; + dataDir = mkOpt types.str "/media/nas/main/nix-app-data/opencloud" "Path to the data dir"; reverseProxy = mkReverseProxyOpt; }; diff --git a/systems/x86_64-linux/jallen-nas/apps.nix b/systems/x86_64-linux/jallen-nas/apps.nix index 2543b8c..581eb8a 100755 --- a/systems/x86_64-linux/jallen-nas/apps.nix +++ b/systems/x86_64-linux/jallen-nas/apps.nix @@ -11,6 +11,10 @@ }; lubelogger.enable = true; nextcloud.enable = true; + opencloud = { + enable = false; + port = 9200; + }; onlyoffice.enable = true; ai.enable = true; paperless.enable = true; diff --git a/systems/x86_64-linux/jallen-nas/default.nix b/systems/x86_64-linux/jallen-nas/default.nix index 703f47e..bd419ba 100755 --- a/systems/x86_64-linux/jallen-nas/default.nix +++ b/systems/x86_64-linux/jallen-nas/default.nix @@ -157,7 +157,8 @@ in 3001 3333 5201 # iperf - 8448 + 8400 + 9200 ]; allowedUDPPorts = config.${namespace}.network.firewall.allowedTCPPorts; };