make it work... somehow...

deployments/examples/ocis_wopi/config/ocis-appdriver-collabora/entrypoint-override.sh

@@ -1,5 +0,0 @@
-#!/bin/sh
-
-set -e
-
-ocis storage-app-provider server

deployments/examples/ocis_wopi/config/ocis-appdriver-onlyoffice/entrypoint-override.sh

@@ -1,5 +1,6 @@
 #!/bin/sh
-
 set -e
 
+sleep 120 #TODO: app driver should try again until onlyoffice is up...
+
 ocis storage-app-provider server

deployments/examples/ocis_wopi/config/wopiserver/entrypoint-override.sh

@@ -4,7 +4,6 @@ set -e
 echo "${WOPISECRET}" > /etc/wopi/wopisecret
 echo "${IOPSECRET}" > /etc/wopi/iopsecret
 
-
 cp /etc/wopi/wopiserver.conf.dist /etc/wopi/wopiserver.conf
 sed -i 's/ocis.owncloud.test/'${OCIS_DOMAIN}'/g' /etc/wopi/wopiserver.conf
 sed -i 's/collabora.owncloud.test/'${COLLABORA_DOMAIN}'/g' /etc/wopi/wopiserver.conf
@@ -12,9 +11,6 @@ sed -i 's/wopiserver.owncloud.test/'${WOPISERVER_DOMAIN}'/g' /etc/wopi/wopiserve
 
 touch /var/log/wopi/wopiserver.log
 
-# wait for collabora to be up, else file types might be missing at https://wopiserver.owncloud.test/wopi/cbox/endpoints
-while ! curl --output /dev/null --silent --head --fail http://collabora:9980; do sleep 1 && echo -n .; done;
-
 /app/wopiserver.py &
 
 tail -f /var/log/wopi/wopiserver.log

deployments/examples/ocis_wopi/config/wopiserver/wopiserver.conf.dist

@@ -17,10 +17,11 @@ port = 8880
 #oosurl = https://officeonline.owncloud.test
 
 # URL of your Collabora Online service
-codeurl = https://collabora.owncloud.test
+#codeurl = https://collabora.owncloud.test
 
-# URL of your WOPI bridge service (for CodiMD)
-#wopibridgeurl = https://your-wopi-bridge-server.org:8000
+# URL of your CodiMD service
+#codimdurl = https://your-codimd-server.org
+#codimdinturl = https://your-internal-codimd-server:3000
 
 # URL of your WOPI server or your HA proxy in front of it
 wopiurl = https://wopiserver.owncloud.test
@@ -46,6 +47,12 @@ tokenvalidity = 86400
 # WOPI lock expiration time [seconds]
 wopilockexpiration = 7200
 
+# 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
+# comparison, which compensates incorrect lock requests from Microsoft Office Online
+# on-premise setups.
+#wopilockstrictcheck = False
+
 # Logging level. Debug enables the Flask debug mode as well.
 # Valid values are: Debug, Info, Warning, Error.
 loglevel = Info
@@ -73,8 +80,19 @@ wopicert = /etc/grid-security/host.crt
 wopikey = /etc/grid-security/host.key
 
 
+[bridge]
+# SSL certificate check for the connected apps
+#sslverify = True
+
+# Minimal time interval between two consecutive save operations [seconds]
+#saveinterval = 200
+
+# Minimal time interval before a closed file is WOPI-unlocked [seconds]
+#unlockinterval = 90
+
+
 [io]
-# Size used for buffered xroot reads [bytes]
+# Size used for buffered reads [bytes]
 chunksize = 4194304
 
 
@@ -99,12 +117,12 @@ chunksize = 4194304
 revagateway = ocis:9142
 
 # HTTP (WebDAV) endpoint for uploading files
-#datagateway = http://172.17.0.1:9100
+#datagateway = https://your-reva-server.org:port/data
 
 # Reva/gRPC authentication token expiration time [seconds]
 # The default value matches Reva's default
 authtokenvalidity = 3600
 
-# SSL certificate check for reva
- # oCIS uses self signed certificate in this example
-sslverify = false
+# SSL certificate check for Reva
+# oCIS uses self signed certificate in this example
+#sslverify = false

deployments/examples/ocis_wopi/docker-compose.yml

@@ -91,6 +91,7 @@ services:
     entrypoint:
       - /bin/sh
       - /entrypoint-override.sh
+    #command: storage-app-provider server
     environment:
       STORAGE_GATEWAY_ENDPOINT: ocis:9142
       APP_PROVIDER_BASIC_EXTERNAL_ADDR: ocis-appdriver-onlyoffice:9164
@@ -112,9 +113,7 @@ services:
     image: owncloud/ocis:${OCIS_DOCKER_TAG:-latest}
     networks:
       ocis-net:
-    entrypoint:
-      - /bin/sh
-      - /entrypoint-override.sh
+    command: storage-app-provider server
     environment:
       STORAGE_GATEWAY_ENDPOINT: ocis:9142
       APP_PROVIDER_BASIC_EXTERNAL_ADDR: ocis-appdriver-collabora:9164
@@ -126,8 +125,6 @@ services:
       APP_PROVIDER_WOPI_DRIVER_INSECURE: "${INSECURE:-false}"
       APP_PROVIDER_WOPI_DRIVER_IOP_SECRET: ${WOPI_IOP_SECRET:-LoremIpsum123}
       APP_PROVIDER_WOPI_DRIVER_WOPI_URL: https://${WOPISERVER_DOMAIN:-wopiserver.owncloud.test}
-    volumes:
-      - ./config/ocis-appdriver-collabora/entrypoint-override.sh:/entrypoint-override.sh
     logging:
       driver: "local"
     restart: always
@@ -160,6 +157,7 @@ services:
     volumes:
       - ./config/wopiserver/entrypoint-override.sh:/entrypoint-override.sh
       - ./config/wopiserver/wopiserver.conf.dist:/etc/wopi/wopiserver.conf.dist
+      # TODO: remove this hack and add contribution upstream
       - /home/kloucek/Projects/github.com/cs3org/wopiserver/src/core/wopi.py:/app/core/wopi.py
       - wopi-data:/var/wopi_local_storage
       - wopi-logs:/var/log/wopi
@@ -211,7 +209,7 @@ services:
       - "traefik.http.routers.onlyoffice.service=onlyoffice"
       - "traefik.http.services.onlyoffice.loadbalancer.server.port=80"
       # websockets can't be opend when this is ommitted
-      - traefik.http.middlewares.onlyoffice.headers.customrequestheaders.X-Forwarded-Proto=https
+      - "traefik.http.middlewares.onlyoffice.headers.customrequestheaders.X-Forwarded-Proto=https"
       - "traefik.http.routers.onlyoffice.middlewares=onlyoffice"
     logging:
       driver: "local"