From b0875c1858f081de624e9d15ab441534f4715537 Mon Sep 17 00:00:00 2001 From: decentral1se Date: Tue, 30 Mar 2021 22:17:50 +0200 Subject: [PATCH 1/4] Drop healthcheck for now --- compose.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/compose.yml b/compose.yml index 7f7e3f8..d4e30d6 100644 --- a/compose.yml +++ b/compose.yml @@ -6,12 +6,6 @@ services: image: "decentral1se/cloud.autonomic.zone:latest" networks: - proxy - healthcheck: - test: ["CMD", "curl", "-f", "http://localhost:8000"] - interval: 10s - timeout: 10s - retries: 10 - start_period: 15s deploy: update_config: failure_action: rollback From 02c0ed43bade8c6911ec8b1375ffe16ab8c801df Mon Sep 17 00:00:00 2001 From: decentral1se Date: Tue, 30 Mar 2021 22:18:07 +0200 Subject: [PATCH 2/4] Strip whitespace --- data/faq.json | 2 +- data/who_is_involved.json | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/data/faq.json b/data/faq.json index 7fc7839..1277ff3 100644 --- a/data/faq.json +++ b/data/faq.json @@ -15,4 +15,4 @@ "left": "How do I do the setup correctly?", "right": "I’m baby pug normcore pabst, irony 8-bit cronut cray direct trade fingerstache. Flannel taxidermy yr health goth hell of chicharrones fixie. Leggings pop-up fashion axe you probably haven’t heard of them, brunch pabst mixtape actually cray chambray umami thundercats iceland deep." } -] \ No newline at end of file +] diff --git a/data/who_is_involved.json b/data/who_is_involved.json index 6bea117..f878708 100644 --- a/data/who_is_involved.json +++ b/data/who_is_involved.json @@ -1,5 +1,3 @@ { - "text" : "Autonomic is a worker‑owned co‑operative, dedicated to using technology to empower people making a positive difference in the world. We offer service hosting using Co‑op Cloud and other platforms, and custom development and infrastructure set‑up." + "text": "Autonomic is a worker‑owned co‑operative, dedicated to using technology to empower people making a positive difference in the world. We offer service hosting using Co‑op Cloud and other platforms, and custom development and infrastructure set‑up." } - - From adb393529acb1192855134adf160181ed3158f6d Mon Sep 17 00:00:00 2001 From: decentral1se Date: Tue, 30 Mar 2021 22:22:45 +0200 Subject: [PATCH 3/4] Hard code it all --- compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/compose.yml b/compose.yml index d4e30d6..d3e27d9 100644 --- a/compose.yml +++ b/compose.yml @@ -12,10 +12,10 @@ services: order: start-first labels: - "traefik.enable=true" - - "traefik.http.routers.cloud-autonomic-zone.rule=Host(`${DOMAIN}`)" + - "traefik.http.routers.cloud-autonomic-zone.rule=Host(`cloud.autonomic.zone`)" - "traefik.http.routers.cloud-autonomic-zone.entrypoints=web-secure" - "traefik.http.services.cloud-autonomic-zone.loadbalancer.server.port=8000" - - "traefik.http.routers.cloud-autonomic-zone.tls.certresolver=${LETS_ENCRYPT_ENV}" + - "traefik.http.routers.cloud-autonomic-zone.tls.certresolver=production" networks: proxy: From e20a39b9460b913802e83b48bce40132f3cd0074 Mon Sep 17 00:00:00 2001 From: decentral1se Date: Tue, 30 Mar 2021 22:23:19 +0200 Subject: [PATCH 4/4] Revert "Drop healthcheck for now" This reverts commit b0875c1858f081de624e9d15ab441534f4715537. --- compose.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/compose.yml b/compose.yml index d3e27d9..193fd0f 100644 --- a/compose.yml +++ b/compose.yml @@ -6,6 +6,12 @@ services: image: "decentral1se/cloud.autonomic.zone:latest" networks: - proxy + healthcheck: + test: ["CMD", "curl", "-f", "http://localhost:8000"] + interval: 10s + timeout: 10s + retries: 10 + start_period: 15s deploy: update_config: failure_action: rollback