From 99f9615ef20a3fa1bc1a06505b2c63e4ab8b3f56 Mon Sep 17 00:00:00 2001 From: reynir Date: Tue, 13 Dec 2022 15:24:32 +0000 Subject: [PATCH] Use http git.data.coop endpoints for websites (#139) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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. Co-authored-by: Reynir Björnsson Reviewed-on: https://git.data.coop/data.coop/ansible/pulls/139 Co-authored-by: reynir Co-committed-by: reynir --- 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 ba96d4db..36cf17dd 100644 --- a/roles/docker/tasks/services/websites/2022.slides.data.coop.yml +++ b/roles/docker/tasks/services/websites/2022.slides.data.coop.yml @@ -11,8 +11,7 @@ VIRTUAL_HOST: "{{ services.slides_2022_website.domain }}" LETSENCRYPT_HOST: "{{ services.slides_2022_website.domain }}" 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 d17af7b0..e793f562 100644 --- a/roles/docker/tasks/services/websites/new-new.data.coop.yml +++ b/roles/docker/tasks/services/websites/new-new.data.coop.yml @@ -11,8 +11,7 @@ VIRTUAL_HOST: "{{ services.new_new_data_coop_website.domain }}" LETSENCRYPT_HOST: "{{ services.new_new_data_coop_website.domain }}" 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: