diff --git a/README.md b/README.md index 0b95971..1987bd6 100644 --- a/README.md +++ b/README.md @@ -20,14 +20,14 @@ The main goals of this project are: ### Working -- [Jitsi Meet](https://jitsi.org/jitsi-meet/) - [Nextcloud Hub](https://nextcloud.com/) -- [ONLYOFFICE Document Server](https://www.onlyoffice.com/) (integrates with Nextcloud) +- [Jitsi Meet](https://jitsi.org/jitsi-meet/) - [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/docker.yml b/group_vars/docker.yml index 4067055..9065097 100644 --- a/group_vars/docker.yml +++ b/group_vars/docker.yml @@ -1,4 +1,3 @@ -pip_package: python3-pip pip_install_packages: - name: docker - name: docker-compose diff --git a/group_vars/vagrant.yml b/group_vars/vagrant.yml index 0f1a093..190be33 100644 --- a/group_vars/vagrant.yml +++ b/group_vars/vagrant.yml @@ -26,20 +26,15 @@ nextcloud_mariadb_password: password nextcloud_admin_user: admin nextcloud_admin_password: password nextcloud_trusted_domains: satt.local -nextcloud_overwrite_cli_url: http://nextcloud.satt.local +nextcloud_overwrite_cli_url: https://nextcloud.satt.local nextcloud_overwrite_host: nextcloud.satt.local -nextcloud_overwrite_protocol: http +nextcloud_overwrite_protocol: https nextcloud_enable_restic_compose_backup: False nextcloud_virtual_host: nextcloud.satt.local 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 @@ -48,7 +43,6 @@ 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 diff --git a/inventory.ini.sample b/inventory.ini.sample index f4eea77..8537d8e 100644 --- a/inventory.ini.sample +++ b/inventory.ini.sample @@ -22,8 +22,5 @@ satt [collabora] satt -[onlyoffice] -satt - [cryptpad] satt \ No newline at end of file diff --git a/onlyoffice.yml b/onlyoffice-document-server.yml similarity index 71% rename from onlyoffice.yml rename to onlyoffice-document-server.yml index 4c5f06f..b2e59c5 100644 --- a/onlyoffice.yml +++ b/onlyoffice-document-server.yml @@ -1,7 +1,7 @@ --- # Nextcloud Hub -- hosts: onlyoffice +- hosts: onlyoffice_document_server become: true roles: - jotbe.onlyoffice-document-server-docker \ No newline at end of file