Skip to content

Commit

Permalink
Merge pull request #53 from glpatcern/wopi-codimd
Browse files Browse the repository at this point in the history 
Updated config for wopi
  • Loading branch information
@glpatcern
glpatcern authored Apr 19, 2023
2 parents af1e921 + 1de03ed commit f0edfcb
Show file tree
Hide file tree
Showing 4 changed files with 43 additions and 18 deletions.
9 changes: 5 additions & 4 deletions wopiserver/Chart.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ apiVersion: v2
name: wopiserver
description: A Vendor-neutral Web-application Open Platform Interface (WOPI) gateway for EFSS systems
type: application
version: 0.8.0
appVersion: v9.4.2
version: 0.9.0
appVersion: v9.5.3
kubeVersion: '>= 1.19.0-0'
home: https://github.com/cs3org/wopiserver
sources:
Expand All @@ -16,10 +16,11 @@ maintainers:
keywords:
- wopi
- efss
- apps
annotations:
artifacthub.io/changes: |
- "Update the wopiserver to version 9.4.2"
- "Config refresh + update to latest wopiserver tag"
artifacthub.io/images: |
- name: wopiserver
image: cs3org/wopiserver:v9.4.2
image: cs3org/wopiserver:v9.5.3
artifacthub.io/containsSecurityUpdates: 'false'
8 changes: 5 additions & 3 deletions wopiserver/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,17 @@ The following configurations may be set. It is recommended to use `values.yaml`
| Parameter | Description | Default |
| ------------------------------ | ----------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------- |
| `config.cs3.authTokenValidity` | Reva/gRPC authentication token expiration time (seconds). | `3600` |
| `config.cs3.gateway` | The GRPC endpoint of the REVA gateway service. | `revad:19000` |
| `config.cs3.sslVerify` | Enables certificate checking for downloads from the REVA datagateway. | `True` |
| `config.cs3.gateway` | The GRPC endpoint of the Reva gateway service. | `revad:19000` |
| `config.cs3.sslVerify` | Enables certificate checking for downloads from the Reva datagateway. | `True` |
| `config.bridge.sslVerify` | Enables certificate checking for the connected apps. | `True` |
| `config.detectExternalLocks` | Enables detection of external Microsoft Office or LibreOffice locks. | `False` |
| `config.detectExternalMods` | Enables detection of external modifications to opened files on save. | `False` |
| `config.log.level` | Log level. Values, in order of severity: `Critical`, `Error`, `Warning`, `Info` `Debug`. | `Debug` |
| `config.log.handler` | Log handler. Values: `stream` or `file` | `stream` |
| `config.log.destination` | Log destination. Values if `handler` == `stream`: `stdout` or `stderr`. If `handler` == `file`, set to any existing file path in the container. |
| `config.token.validity` | WOPI access token expiration time (seconds). | `86400` |
| `config.wopi.lock.expiration` | WOPI lock expiration time (seconds). | `3600` |
| `config.codimd.enabled` | Enables CodiMD. This flag is used by the [ScienceMesh umbrella charts](https://github.com/sciencemesh/charts). | `False` |
| `config.codimd.inturl` | Internal URL used by CodiMD pod, if deployed in the same cluster. Otherwise, it may be left blank. |
| `extraResources` | Extra resources to be included. | `[]` |
| `image.pullPolicy` | The kubernetes image pull policy. | `IfNotPresent` |
| `image.repository` | Name of the image to run, without the tag. | [`cs3org/wopiserver`](https://hub.docker.com/r/cs3org/wopiserver) |
Expand Down
32 changes: 25 additions & 7 deletions wopiserver/templates/configmap.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,12 @@ data:
# to clients will include the access_token argument
downloadurl = {{ template "wopiserver.url" . }}/wopi/iop/download
# URLs for the user-facing and internal CodiMD service
{{ if .Values.codimd.enabled }}
codimdurl = https://{{ .Values.ingress.hostname }}/codimd
codimdinturl = http://{{ .Values.codimd.inturl }}
{{ end }}
# The internal server engine to use (defaults to flask).
# Set to waitress for production installations.
internalserver = waitress
Expand All @@ -49,8 +55,8 @@ data:
# WOPI access token expiration time [seconds]
tokenvalidity = {{ .Values.config.token.validity }}
# WOPI lock expiration time [seconds]
wopilockexpiration = {{ .Values.config.wopi.lock.expiration }}
# WOPI lock expiration time [seconds]. Microsoft requires this to be 30 minutes.
wopilockexpiration = 1800
# WOPI lock strict check: if True, WOPI locks will be compared according to specs,
# that is their representation must match. False (default) allows for a more relaxed
Expand All @@ -61,7 +67,7 @@ data:
# Enable support of rename operations from WOPI apps. This is currently
# disabled by default as it has been observed that both MS Office and Collabora
# Online do not play well with this feature.
enablerename = {{ .Values.config.enableRename }}
enablerename = False
# Detection of external Microsoft Office or LibreOffice locks. By default, lock files
# compatible with Office for Desktop applications are detected, assuming that the
Expand All @@ -70,14 +76,23 @@ data:
# This feature can be disabled in order to operate a pure WOPI server for online apps.
detectexternallocks = {{ .Values.config.detectExternalLocks }}
# Location of the webconflict files. By default, such files are stored in the same path
# as the original file. If that fails (e.g. because of missing permissions),
# Detection of external modifications to locked files. By default, on PutFile operations
# the system checks against a previously set extended attribute, and if missing or older
# than the current file's mtime, PutFile is failed. This allows to operate on shared
# storage systems that do not honour WOPI locks. Similarly to the above, this
# feature can be disabled for storages where WOPI locking is fully honoured.
detectexternalmodifications = {{ .Values.config.detectExternalMods }}
# Location of the user's personal space, used as a fall back location when storing
# PutRelative targets or webconflict files. Normally, such files are stored in the same
# path as the original file. If that fails (e.g. because of missing permissions),
# an attempt is made to store such files in this path if specified, otherwise
# the system falls back to the recovery space (cf. io|recoverypath).
# the system falls back to the recovery space (cf. io|recoverypath) for web conflicts
# whereas PutRelative operations are just failed.
# The keywords <user_initial> and <username> are replaced with the actual username's
# initial letter and the actual username, respectively, so you can use e.g.
# /your_storage/home/user_initial/username
#conflictpath = /
#homepath = /home/username
# ownCloud's WOPI proxy configuration. Disabled by default.
#wopiproxy = https://external-wopi-proxy.com
Expand Down Expand Up @@ -113,6 +128,9 @@ data:
#disablezip = False
[io]
# path used as buffer to recover unsaved files
recoverypath = {{ .Values.config.io.recoveryPath }}
# Size used for buffered reads [bytes]
chunksize = 4194304
Expand Down
12 changes: 8 additions & 4 deletions wopiserver/values.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,11 @@ secretsRef:
secrets:
wopiSecret:

# Enable this to configure wopiserver for CodiMD
codimd:
enabled: False
inturl: http://codimd-internal-url

config:
log:
# log level: Debug, Info, Warning or Error
Expand All @@ -34,11 +39,10 @@ config:
destination: stdout
token:
validity: 86400
wopi:
lock:
expiration: 3600
enableRename: False
detectExternalLocks: False
detectExternalMods: False
io:
recoveryPath: /var/spool/wopirecovery
cs3:
authTokenValidity: 3600
gateway: revad:19000
Expand Down

0 comments on commit f0edfcb

Please sign in to comment.