From e54ec1312c33459cc4bfe7025efe8b3dd839cc8d Mon Sep 17 00:00:00 2001 From: Jake Howard Date: Sun, 7 Jun 2020 21:09:02 +0100 Subject: [PATCH] Replace onlyoffice with collabora --- .../files/nextcloud/docker-compose.yml | 18 +++++++++--------- .../roles/intersect-docker/vars/nextcloud.yml | 8 -------- terraform/jakehoward.tech.tf | 4 ++-- 3 files changed, 11 insertions(+), 19 deletions(-) diff --git a/ansible/roles/intersect-docker/files/nextcloud/docker-compose.yml b/ansible/roles/intersect-docker/files/nextcloud/docker-compose.yml index 609a50b..08849bb 100644 --- a/ansible/roles/intersect-docker/files/nextcloud/docker-compose.yml +++ b/ansible/roles/intersect-docker/files/nextcloud/docker-compose.yml @@ -54,16 +54,16 @@ services: volumes: - ./redis:/data - onlyoffice: - image: onlyoffice/documentserver - container_name: onlyoffice + collabora: + image: collabora/code:latest + container_name: collabora restart: unless-stopped + cap_add: + - MKNOD environment: - - JWT_ENABLED=true - - JWT_SECRET={{ nextcloud.onlyoffice_jwt_secret }} + - "domain=intersect\\.jakehoward\\.tech" labels: - "traefik.enable=true" - - "traefik.http.routers.onlyoffice.rule=Host(`onlyoffice.jakehoward.tech`)" - - "traefik.http.routers.onlyoffice.tls.certresolver=le" - - "traefik.http.routers.onlyoffice.middlewares=oo-header" - - "traefik.http.middlewares.oo-header.headers.customRequestHeaders.X-Forwarded-Proto=https" + - "traefik.http.routers.collabora.rule=Host(`collabora.jakehoward.tech`)" + - "traefik.http.routers.collabora.tls.certresolver=le" + - "traefik.http.services.collabora-nextcloud.loadbalancer.server.scheme=https" diff --git a/ansible/roles/intersect-docker/vars/nextcloud.yml b/ansible/roles/intersect-docker/vars/nextcloud.yml index 71f32f4..bcb31b1 100644 --- a/ansible/roles/intersect-docker/vars/nextcloud.yml +++ b/ansible/roles/intersect-docker/vars/nextcloud.yml @@ -1,12 +1,4 @@ nextcloud: - onlyoffice_jwt_secret: !vault | - $ANSIBLE_VAULT;1.1;AES256 - 62303266376363626466323834663133366565393165373435636663663665306334666434313233 - 6539396130326335653663646430613939323535616536340a363766386361616431353665636531 - 30303930373864333836363565303165613663613938356133616363396231376463623839383765 - 6563363263363039320a386134373931363733393636343539393133376463643962396231646565 - 32366533633564376561373534363662393361656563633230646439653361663836653339666439 - 3463633137313030363130636663373931623038616365333931 instance_id: !vault | $ANSIBLE_VAULT;1.1;AES256 30343838333336366638343832633063343135393262336238633632333962656236656666343930 diff --git a/terraform/jakehoward.tech.tf b/terraform/jakehoward.tech.tf index f259eae..349d36e 100644 --- a/terraform/jakehoward.tech.tf +++ b/terraform/jakehoward.tech.tf @@ -92,9 +92,9 @@ resource "cloudflare_record" "jakehowardtech_pihole" { ttl = 1 } -resource "cloudflare_record" "jakehowardtech_onlyoffice" { +resource "cloudflare_record" "jakehowardtech_collabora" { zone_id = cloudflare_zone.jakehowardtech.id - name = "onlyoffice" + name = "collabora" value = vultr_server.casey.main_ip type = "A" ttl = 1