Merge pull request #59 from NethServer/fixCollabora

Fix the collabora in nextcloud
NethServer · Nov 14, 2023 · dfd8cb8 · dfd8cb8
2 parents ddaab39 + 7eef9c7
commit dfd8cb8
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/imageroot/actions/configure-module/80configure_collabora b/imageroot/actions/configure-module/80configure_collabora
@@ -10,11 +10,11 @@ tls_verify=$(cat config.json | jq -r '.tls_verify_collabora // empty')
 
 if  [[ "$collabora_host" != "" ]]; then
     occ app:install richdocuments
-    occ config:app:set richdocuments wopi_url --value=https://$COLLABORA_HOST
-    if [[ "$tls_verify" == 'True' ]]; then
-        occ config:app:set richdocuments disable_certificate_verification --value=yes
-    else
+    occ config:app:set richdocuments wopi_url --value=https://$collabora_host
+    if [[ "$tls_verify" == 'true' ]]; then
         occ config:app:set richdocuments disable_certificate_verification --value=no
+    else
+        occ config:app:set richdocuments disable_certificate_verification --value=yes
     fi
     occ app:enable richdocuments
 fi
diff --git a/imageroot/actions/get-configuration/20read b/imageroot/actions/get-configuration/20read
@@ -70,6 +70,10 @@ for c in rdb.scan_iter('module/collabora*/environment'):
     if url:
         array_collabora.append({"name": name, "label": name+' ('+ url+')', "value": url})
 config["array_collabora"] = array_collabora
+# The first load of nextcloud json is empty of tls_verify_collabora
+# let's do a default value
+if "tls_verify_collabora" not in config:
+    config["tls_verify_collabora"] = False
 
 # Dump the configuratio to stdou
 json.dump(config, fp=sys.stdout)