From 08d1ef5c7248e68221c67be54fa12f27809c8e8a Mon Sep 17 00:00:00 2001 From: Jan Beilicke Date: Thu, 16 Apr 2020 22:08:36 +0200 Subject: [PATCH 1/3] Wrap-up of the ONLYOFFICE service which is now fully functional within Nextcloud --- README.md | 4 ++-- group_vars/vagrant.yml | 5 +++++ inventory.ini.sample | 3 +++ onlyoffice-document-server.yml => onlyoffice.yml | 2 +- 4 files changed, 11 insertions(+), 3 deletions(-) rename onlyoffice-document-server.yml => onlyoffice.yml (71%) diff --git a/README.md b/README.md index 1987bd6..0b95971 100644 --- a/README.md +++ b/README.md @@ -20,14 +20,14 @@ The main goals of this project are: ### Working -- [Nextcloud Hub](https://nextcloud.com/) - [Jitsi Meet](https://jitsi.org/jitsi-meet/) +- [Nextcloud Hub](https://nextcloud.com/) +- [ONLYOFFICE Document Server](https://www.onlyoffice.com/) (integrates with Nextcloud) - [Collabora Online Development Edition](https://www.collaboraoffice.com/code/) (integrates with Nextcloud) - [Cryptpad](https://cryptpad.fr/) ### WIP -- [ONLYOFFICE Document Server](https://www.onlyoffice.com/) (integrates with Nextcloud) - [BigBlueButton](https://bigbluebutton.org/) ### Backlog diff --git a/group_vars/vagrant.yml b/group_vars/vagrant.yml index 190be33..56cb64e 100644 --- a/group_vars/vagrant.yml +++ b/group_vars/vagrant.yml @@ -35,6 +35,11 @@ collabora_virtual_host: collabora.satt.local collabora_domain_regex_pattern: nextcloud\.satt\.local collabora_admin_user: admin collabora_admin_password: password +onlyoffice_virtual_host: documentserver.satt.local +onlyoffice_allow_origin_list: "{{ nextcloud_overwrite_cli_url }}" +onlyoffice_jwt_enabled: "true" +onlyoffice_jwt_secret: topsecrettoken +onlyoffice_jwt_header: Authorization jitsi_public_url: https://jitsi.satt.local jitsi_docker_host_address: "{{ ansible_host }}" jitsi_exposed_http_port: 8000 diff --git a/inventory.ini.sample b/inventory.ini.sample index 8537d8e..f4eea77 100644 --- a/inventory.ini.sample +++ b/inventory.ini.sample @@ -22,5 +22,8 @@ satt [collabora] satt +[onlyoffice] +satt + [cryptpad] satt \ No newline at end of file diff --git a/onlyoffice-document-server.yml b/onlyoffice.yml similarity index 71% rename from onlyoffice-document-server.yml rename to onlyoffice.yml index b2e59c5..4c5f06f 100644 --- a/onlyoffice-document-server.yml +++ b/onlyoffice.yml @@ -1,7 +1,7 @@ --- # Nextcloud Hub -- hosts: onlyoffice_document_server +- hosts: onlyoffice become: true roles: - jotbe.onlyoffice-document-server-docker \ No newline at end of file From f62c9673e45ff47f55447e8eb75865119f7f7726 Mon Sep 17 00:00:00 2001 From: Jan Beilicke Date: Sat, 25 Apr 2020 19:27:50 +0200 Subject: [PATCH 2/3] We should use python3-pip by default --- group_vars/docker.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/group_vars/docker.yml b/group_vars/docker.yml index 9065097..4067055 100644 --- a/group_vars/docker.yml +++ b/group_vars/docker.yml @@ -1,3 +1,4 @@ +pip_package: python3-pip pip_install_packages: - name: docker - name: docker-compose From cc75f431094e925c636dd823a3f07dc1a4fb1bde Mon Sep 17 00:00:00 2001 From: Jan Beilicke Date: Fri, 1 May 2020 23:18:24 +0200 Subject: [PATCH 3/3] Updated Vagrant sample --- group_vars/vagrant.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/group_vars/vagrant.yml b/group_vars/vagrant.yml index 56cb64e..0f1a093 100644 --- a/group_vars/vagrant.yml +++ b/group_vars/vagrant.yml @@ -26,9 +26,9 @@ nextcloud_mariadb_password: password nextcloud_admin_user: admin nextcloud_admin_password: password nextcloud_trusted_domains: satt.local -nextcloud_overwrite_cli_url: https://nextcloud.satt.local +nextcloud_overwrite_cli_url: http://nextcloud.satt.local nextcloud_overwrite_host: nextcloud.satt.local -nextcloud_overwrite_protocol: https +nextcloud_overwrite_protocol: http nextcloud_enable_restic_compose_backup: False nextcloud_virtual_host: nextcloud.satt.local collabora_virtual_host: collabora.satt.local @@ -48,6 +48,7 @@ jitsi_timezone: Europe/Amsterdam jitsi_enable_letsencrypt: False jitsi_virtual_host: jitsi.satt.local jitsi_jvb_stun_servers: meet-jit-si-turnrelay.jitsi.net:443 +jitsi_web_channel_last_n: 2 docker_user: deploy traefik: expose_internally: True