-
Notifications
You must be signed in to change notification settings - Fork 188
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.
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
added config for document server setup #10826
base: master
Are you sure you want to change the base?
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change | ||||||||
---|---|---|---|---|---|---|---|---|---|---|
|
@@ -584,3 +584,12 @@ The sample `fontsMap.json` file is located in `tests/config/drone/fontsMap.json` | |||||||||
"defaultFont": "/path/to/ocis/tests/config/drone/NotoSans.ttf" | ||||||||||
} | ||||||||||
``` | ||||||||||
|
||||||||||
|
||||||||||
## Running Test Suite With Document Servers (Collabora, ONLYOFFICE or Microsoft using the WOPI protocol.) with dokcer | ||||||||||
To run the test related to document Servers, go to `tests/acceptance/docker/documentServer` and run the command | ||||||||||
```bash | ||||||||||
docker compose up | ||||||||||
``` | ||||||||||
Latest ocis build is done with local ocis docker image that is build with this docker compose file. | ||||||||||
oCIS will start in `https://ocis.owncloud.test/` along with all other service. | ||||||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. May be you can also add
Comment on lines
+594
to
+595
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
may be need to use only one |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,65 @@ | ||
app_registry: | ||
mimetypes: | ||
- mime_type: application/pdf | ||
extension: pdf | ||
name: PDF | ||
description: PDF document | ||
icon: '' | ||
default_app: '' | ||
allow_creation: false | ||
- mime_type: application/vnd.oasis.opendocument.text | ||
extension: odt | ||
name: OpenDocument | ||
description: OpenDocument text document | ||
icon: '' | ||
default_app: Collabora | ||
allow_creation: true | ||
- mime_type: application/vnd.oasis.opendocument.spreadsheet | ||
extension: ods | ||
name: OpenSpreadsheet | ||
description: OpenDocument spreadsheet document | ||
icon: '' | ||
default_app: Collabora | ||
allow_creation: true | ||
- mime_type: application/vnd.oasis.opendocument.presentation | ||
extension: odp | ||
name: OpenPresentation | ||
description: OpenDocument presentation document | ||
icon: '' | ||
default_app: Collabora | ||
allow_creation: true | ||
- mime_type: application/vnd.openxmlformats-officedocument.wordprocessingml.document | ||
extension: docx | ||
name: Microsoft Word | ||
description: Microsoft Word document | ||
icon: '' | ||
default_app: OnlyOffice | ||
allow_creation: true | ||
- mime_type: application/vnd.openxmlformats-officedocument.wordprocessingml.form | ||
extension: docxf | ||
name: Form Document | ||
description: Form Document | ||
icon: '' | ||
default_app: OnlyOffice | ||
allow_creation: true | ||
- mime_type: application/vnd.openxmlformats-officedocument.spreadsheetml.sheet | ||
extension: xlsx | ||
name: Microsoft Excel | ||
description: Microsoft Excel document | ||
icon: '' | ||
default_app: OnlyOffice | ||
allow_creation: true | ||
- mime_type: application/vnd.openxmlformats-officedocument.presentationml.presentation | ||
extension: pptx | ||
name: Microsoft PowerPoint | ||
description: Microsoft PowerPoint document | ||
icon: '' | ||
default_app: OnlyOffice | ||
allow_creation: true | ||
- mime_type: application/vnd.jupyter | ||
extension: ipynb | ||
name: Jupyter Notebook | ||
description: Jupyter Notebook | ||
icon: '' | ||
default_app: '' | ||
allow_creation: true |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
password | ||
12345678 | ||
123 | ||
ownCloud | ||
ownCloud-1 |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,45 @@ | ||
directives: | ||
child-src: | ||
- '''self''' | ||
connect-src: | ||
- '''self''' | ||
- 'blob:' | ||
- 'https://${COMPANION_DOMAIN|companion.owncloud.test}/' | ||
- 'wss://${COMPANION_DOMAIN|companion.owncloud.test}/' | ||
- 'https://raw.githubusercontent.com/owncloud/awesome-ocis/' | ||
default-src: | ||
- '''none''' | ||
font-src: | ||
- '''self''' | ||
frame-ancestors: | ||
- '''self''' | ||
frame-src: | ||
- '''self''' | ||
- 'blob:' | ||
- 'https://embed.diagrams.net/' | ||
# In contrary to bash and docker the default is given after the | character | ||
- 'https://${ONLYOFFICE_DOMAIN|onlyoffice.owncloud.test}/' | ||
- 'https://${COLLABORA_DOMAIN|collabora.owncloud.test}/' | ||
# This is needed for the external-sites web extension when embedding sites | ||
- 'https://owncloud.dev' | ||
img-src: | ||
- '''self''' | ||
- 'data:' | ||
- 'blob:' | ||
- 'https://raw.githubusercontent.com/owncloud/awesome-ocis/' | ||
# In contrary to bash and docker the default is given after the | character | ||
- 'https://${ONLYOFFICE_DOMAIN|onlyoffice.owncloud.test}/' | ||
- 'https://${COLLABORA_DOMAIN|collabora.owncloud.test}/' | ||
manifest-src: | ||
- '''self''' | ||
media-src: | ||
- '''self''' | ||
object-src: | ||
- '''self''' | ||
- 'blob:' | ||
script-src: | ||
- '''self''' | ||
- '''unsafe-inline''' | ||
style-src: | ||
- '''self''' | ||
- '''unsafe-inline''' |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
#!/bin/sh | ||
set -e | ||
|
||
# we can't mount it directly because the run-document-server.sh script wants to move it | ||
cp /etc/onlyoffice/documentserver/local.dist.json /etc/onlyoffice/documentserver/local.json | ||
|
||
/app/ds/run-document-server.sh | ||
Comment on lines
+1
to
+7
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. instead of an separate file may be add directly this to the |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,71 @@ | ||
{ | ||
"services": { | ||
"CoAuthoring": { | ||
"sql": { | ||
"type": "postgres", | ||
"dbHost": "localhost", | ||
"dbPort": "5432", | ||
"dbName": "onlyoffice", | ||
"dbUser": "onlyoffice", | ||
"dbPass": "onlyoffice" | ||
}, | ||
"token": { | ||
"enable": { | ||
"request": { | ||
"inbox": true, | ||
"outbox": true | ||
}, | ||
"browser": true | ||
}, | ||
"inbox": { | ||
"header": "Authorization" | ||
}, | ||
"outbox": { | ||
"header": "Authorization" | ||
} | ||
}, | ||
"secret": { | ||
"inbox": { | ||
"string": "B8LjkNqGxn6gf8bkuBUiMwyuCFwFddnu" | ||
}, | ||
"outbox": { | ||
"string": "B8LjkNqGxn6gf8bkuBUiMwyuCFwFddnu" | ||
}, | ||
"session": { | ||
"string": "B8LjkNqGxn6gf8bkuBUiMwyuCFwFddnu" | ||
} | ||
} | ||
} | ||
}, | ||
"rabbitmq": { | ||
"url": "amqp://guest:guest@localhost" | ||
}, | ||
"FileConverter": { | ||
"converter": { | ||
"inputLimits": [ | ||
{ | ||
"type": "docx;dotx;docm;dotm", | ||
"zip": { | ||
"uncompressed": "1GB", | ||
"template": "*.xml" | ||
} | ||
}, | ||
{ | ||
"type": "xlsx;xltx;xlsm;xltm", | ||
"zip": { | ||
"uncompressed": "1GB", | ||
"template": "*.xml" | ||
} | ||
}, | ||
{ | ||
"type": "pptx;ppsx;potx;pptm;ppsm;potm", | ||
"zip": { | ||
"uncompressed": "1GB", | ||
"template": "*.xml" | ||
} | ||
} | ||
] | ||
} | ||
} | ||
|
||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.