fix collabora online variable missing

small-hack · Dec 15, 2024 · 7fa572d · 7fa572d
1 parent 2d8d8c3
commit 7fa572d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git 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 <[email protected]>",
                  "Max Roby <[email protected]>"]

diff --git 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...")