From 7fa572d76feeeaab981eb5d0cdf4fcbc6a401b05 Mon Sep 17 00:00:00 2001 From: jessebot Date: Sun, 15 Dec 2024 23:07:10 +0100 Subject: [PATCH] fix collabora online variable missing --- pyproject.toml | 2 +- smol_k8s_lab/k8s_apps/social/nextcloud.py | 15 ++++++++------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 077ad4b5d..412507241 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "smol_k8s_lab" -version = "5.20.3" +version = "5.20.4" description = "CLI and TUI to quickly install slimmer Kubernetes distros and then manage apps declaratively using Argo CD" authors = ["Jesse Hitch ", "Max Roby "] diff --git a/smol_k8s_lab/k8s_apps/social/nextcloud.py b/smol_k8s_lab/k8s_apps/social/nextcloud.py index 5ceee5307..7699bb504 100644 --- a/smol_k8s_lab/k8s_apps/social/nextcloud.py +++ b/smol_k8s_lab/k8s_apps/social/nextcloud.py @@ -79,14 +79,19 @@ def configure_nextcloud(argocd: ArgoCD, # backups are their own config.yaml section backup_vals = process_backup_vals(cfg.get('backups', {}), 'nextcloud', argocd) + # grab all possile init values + init_values = init.get('values', None) + + # collabora config values + collabora_user = init_values.get('collabora_user', None) + collabora_pass = extract_secret(init_values.get('collabora_password', + create_password)) + # if the user has chosen to use smol-k8s-lab initialization if not app_installed and init_enabled: nextcloud_namespace = cfg['argo']['namespace'] argocd.k8s.create_namespace(nextcloud_namespace) - - # grab all possile init values - init_values = init.get('values', None) if init_values: admin_user = init_values.get('admin_user', 'admin') @@ -95,10 +100,6 @@ def configure_nextcloud(argocd: ArgoCD, mail_user = init_values.get('smtp_user', None) mail_pass = extract_secret(init_values.get('smtp_password', "")) - # collabora config values - collabora_user = init_values.get('collabora_user', None) - collabora_pass = extract_secret(init_values.get('collabora_password', - create_password)) else: log.warn("Strange, there's no nextcloud init values...")