From ddfa3b21e66cac47e8848d633e7ca387d20d4560 Mon Sep 17 00:00:00 2001 From: Friedrich Fuhr <96977244+ffuhrnew@users.noreply.github.com> Date: Fri, 23 May 2025 15:41:16 +0200 Subject: [PATCH 1/7] Create README.MD --- caddy/README.MD | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 caddy/README.MD diff --git a/caddy/README.MD b/caddy/README.MD new file mode 100644 index 0000000..d19c294 --- /dev/null +++ b/caddy/README.MD @@ -0,0 +1,7 @@ +Here you find two files: +# docker-compose.caddy.yml +# Caddyfile +After you copied .env.example to .env please add :caddy/docker-compose.caddy.yml as last entry. +This will install a caddy reverse proxy server along with your OpenCloud deployment. +As Caddy needs a config file copy the one from /caddy/Caddyfile to your directory. +Fill your API-Key and ACME Email adress. From a8bb2c6a82d9cbb6f3e927028c5adcfab2828274 Mon Sep 17 00:00:00 2001 From: Friedrich Fuhr <96977244+ffuhrnew@users.noreply.github.com> Date: Fri, 23 May 2025 15:42:44 +0200 Subject: [PATCH 2/7] Add files via upload --- caddy/docker-compose.caddy.yml | 41 ++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 caddy/docker-compose.caddy.yml diff --git a/caddy/docker-compose.caddy.yml b/caddy/docker-compose.caddy.yml new file mode 100644 index 0000000..39b2369 --- /dev/null +++ b/caddy/docker-compose.caddy.yml @@ -0,0 +1,41 @@ +services: + caddy: + labels: # Global options + caddy.log.level: "info" + caddy.log.format: "console" + caddy.log.include: "http.log.access" + caddy.servers.protocols: "h1" + # change email and apikey from cloudflare + caddy.email: EMAIL@here.de # needs for acme CERT registration account + caddy.acme_dns: "cloudflare API KEY" # When set here, you don't need to set it for each service individually + caddy.acme_dns.ca: "https://acme-v02.api.letsencrypt.org/directory" + + image: ffuhrnew/caddylabel:2.9.1 + cap_add: + - NET_ADMIN + container_name: caddy + hostname: caddy + environment: + - CADDY_INGRESS_NETWORKS=opencloud-compose_opencloud-net + restart: unless-stopped + ports: + - "80:80" + - "443:443" + - "443:443/udp" + volumes: + - /mnt/docker/caddy/Caddyfile:/etc/caddy/Caddyfile + - /mnt/docker/caddy/site:/srv + - /mnt/docker/caddy/data:/data + - /mnt/docker/caddy/config:/config + - /var/run/docker.sock:/var/run/docker.sock + + networks: + opencloud-net: null +networks: + opencloud-net: + name: opencloud-compose_opencloud-net + +volumes: + data: + config: + site: From 03dc61e696cc3d9e4465ec3e9f1378bd06e1709e Mon Sep 17 00:00:00 2001 From: Friedrich Fuhr <96977244+ffuhrnew@users.noreply.github.com> Date: Fri, 23 May 2025 15:46:28 +0200 Subject: [PATCH 3/7] Update docker-compose.caddy.yml --- caddy/docker-compose.caddy.yml | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/caddy/docker-compose.caddy.yml b/caddy/docker-compose.caddy.yml index 39b2369..984cc05 100644 --- a/caddy/docker-compose.caddy.yml +++ b/caddy/docker-compose.caddy.yml @@ -1,16 +1,6 @@ services: caddy: - labels: # Global options - caddy.log.level: "info" - caddy.log.format: "console" - caddy.log.include: "http.log.access" - caddy.servers.protocols: "h1" - # change email and apikey from cloudflare - caddy.email: EMAIL@here.de # needs for acme CERT registration account - caddy.acme_dns: "cloudflare API KEY" # When set here, you don't need to set it for each service individually - caddy.acme_dns.ca: "https://acme-v02.api.letsencrypt.org/directory" - - image: ffuhrnew/caddylabel:2.9.1 + image: ghcr.io/caddybuilds/caddy-cloudflare:latest cap_add: - NET_ADMIN container_name: caddy @@ -28,13 +18,11 @@ services: - /mnt/docker/caddy/data:/data - /mnt/docker/caddy/config:/config - /var/run/docker.sock:/var/run/docker.sock - networks: opencloud-net: null networks: opencloud-net: name: opencloud-compose_opencloud-net - volumes: data: config: From 8bb6742df4d537c1ba212ab2e4c0ef050834ca90 Mon Sep 17 00:00:00 2001 From: Friedrich Fuhr <96977244+ffuhrnew@users.noreply.github.com> Date: Fri, 23 May 2025 16:07:32 +0200 Subject: [PATCH 4/7] Create Caddyfile --- caddy/Caddyfile | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 caddy/Caddyfile diff --git a/caddy/Caddyfile b/caddy/Caddyfile new file mode 100644 index 0000000..b963c7a --- /dev/null +++ b/caddy/Caddyfile @@ -0,0 +1,23 @@ +(cloudflare) { + tls { + dns cloudflare APIKEY + resolvers 1.1.1.1 + } +} +*.fqdn.de { + import cloudflare + + @cloud host cloud.fqdn.de + @collabora host collabora.fqdn.de + @wopiserver host wopiserver.fqdn.de + + handle @cloud { + reverse_proxy opencloud:9200 + } + handle @collabora { + reverse_proxy collabora:9980 + } + handle @wopiserver { + reverse_proxy collaboration:9300 + } +} From e7429f4cf84b4d155700f6ab541bb9ae950bc238 Mon Sep 17 00:00:00 2001 From: Friedrich Fuhr <96977244+ffuhrnew@users.noreply.github.com> Date: Fri, 23 May 2025 16:07:52 +0200 Subject: [PATCH 5/7] Update README.MD --- caddy/README.MD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/caddy/README.MD b/caddy/README.MD index d19c294..e136847 100644 --- a/caddy/README.MD +++ b/caddy/README.MD @@ -4,4 +4,4 @@ Here you find two files: After you copied .env.example to .env please add :caddy/docker-compose.caddy.yml as last entry. This will install a caddy reverse proxy server along with your OpenCloud deployment. As Caddy needs a config file copy the one from /caddy/Caddyfile to your directory. -Fill your API-Key and ACME Email adress. +Fill your API-Key. From e2076d2ea75b0c2ef2ad083b876f1dc0c1165385 Mon Sep 17 00:00:00 2001 From: Friedrich Fuhr <96977244+ffuhrnew@users.noreply.github.com> Date: Fri, 23 May 2025 16:08:46 +0200 Subject: [PATCH 6/7] Update collabora.yml --- external-proxy/collabora.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/external-proxy/collabora.yml b/external-proxy/collabora.yml index 3a16c43..3971adf 100644 --- a/external-proxy/collabora.yml +++ b/external-proxy/collabora.yml @@ -1,10 +1,12 @@ --- services: collaboration: + container_name: collaboration ports: # expose the wopi server - "9300:9300" collabora: + container_name: collabora ports: # expose the collabora server - "9980:9980" From 28a7faf9b87d09a2764acf59e2279f7fe628a2d6 Mon Sep 17 00:00:00 2001 From: Friedrich Fuhr <96977244+ffuhrnew@users.noreply.github.com> Date: Fri, 23 May 2025 16:09:12 +0200 Subject: [PATCH 7/7] Update opencloud.yml --- external-proxy/opencloud.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/external-proxy/opencloud.yml b/external-proxy/opencloud.yml index 121c51d..1b959e7 100644 --- a/external-proxy/opencloud.yml +++ b/external-proxy/opencloud.yml @@ -1,6 +1,7 @@ --- services: opencloud: + container_name: opencloud environment: # bind to all interfaces PROXY_HTTP_ADDR: "0.0.0.0:9200"