Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix the collabora in nextcloud #59

Merged
merged 2 commits into from
Nov 14, 2023
Merged

Fix the collabora in nextcloud #59

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
764a57a
api. default value for tls_verify_collabora
stephdl Nov 14, 2023
7eef9c7
api.fix the collabora hostname and certificate validation
stephdl Nov 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions imageroot/actions/configure-module/80configure_collabora
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 4 additions & 0 deletions imageroot/actions/get-configuration/20read
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Loading