From 9e11b055f64018921d6319d9cd072a03793c9187 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Reynir=20Bj=C3=B6rnsson?= Date: Tue, 13 Dec 2022 09:48:17 +0100 Subject: [PATCH] Use http git.data.coop endpoints for websites Gitea is notoriously strict with its http smart git implementation. This required a few fixes in upstream ocaml-git. They are now released, and we don't have to use github or ssh-keys. --- roles/docker/tasks/services/websites/2022.slides.data.coop.yml | 3 +-- roles/docker/tasks/services/websites/new-new.data.coop.yml | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/roles/docker/tasks/services/websites/2022.slides.data.coop.yml b/roles/docker/tasks/services/websites/2022.slides.data.coop.yml index 260af82..20374db 100644 --- a/roles/docker/tasks/services/websites/2022.slides.data.coop.yml +++ b/roles/docker/tasks/services/websites/2022.slides.data.coop.yml @@ -12,8 +12,7 @@ VIRTUAL_HOST: "2022.slides.{{ services.data_coop_website.domains|join(',') }}" LETSENCRYPT_HOST: "2022.slides.{{ services.data_coop_website.domains|join(',') }}" LETSENCRYPT_EMAIL: "{{ letsencrypt_email }}" - # Temporarily hosting on github - command: "--remote=https://github.com/sorbusursina/datacoop-slides.git#slides2022" + command: "--remote=https://git.data.coop/data.coop/slides.git#slides2022" capabilities: - NET_ADMIN devices: diff --git a/roles/docker/tasks/services/websites/new-new.data.coop.yml b/roles/docker/tasks/services/websites/new-new.data.coop.yml index 05ff1f3..56582ca 100644 --- a/roles/docker/tasks/services/websites/new-new.data.coop.yml +++ b/roles/docker/tasks/services/websites/new-new.data.coop.yml @@ -10,8 +10,7 @@ VIRTUAL_HOST: "new-new.{{ services.data_coop_website.domains|join(',') }}" LETSENCRYPT_HOST: "new-new.{{ services.data_coop_website.domains|join(',') }}" LETSENCRYPT_EMAIL: "{{ letsencrypt_email }}" - # The ssh-key is for read-only only - command: "--remote=git@git.data.coop:halfd/new-website.git#main --ssh-key ed25519:Ag9RekCyC2eow4P/e5crVvSTQ7dTK46WkG0wqEPVJbU= --ssh-authenticator SHA256:l9kdLkb0kJm46pOJ4tCHCtFUaqV1ImbZWMA5oje10fI" + command: "--remote=https://git.data.coop:halfd/new-website.git#main" capabilities: - NET_ADMIN devices: -- 2.43.4