From 99f9615ef20a3fa1bc1a06505b2c63e4ab8b3f56 Mon Sep 17 00:00:00 2001 From: reynir Date: Tue, 13 Dec 2022 15:24:32 +0000 Subject: [PATCH 1/5] 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 ba96d4d..36cf17d 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 d17af7b..e793f56 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: From 76df6320a49d705aab767720e4c3c970ce73bcc8 Mon Sep 17 00:00:00 2001 From: Sam Al-Sapti Date: Tue, 13 Dec 2022 16:30:43 +0100 Subject: [PATCH 2/5] Upgrade Pinafore to v2.5.0 --- roles/docker/defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/docker/defaults/main.yml b/roles/docker/defaults/main.yml index 5be8b75..ee86a05 100644 --- a/roles/docker/defaults/main.yml +++ b/roles/docker/defaults/main.yml @@ -182,7 +182,7 @@ services: pinafore: file: pinafore.yml domain: "pinafore.{{ base_domain }}" - version: v2.4.0 + version: v2.5.0 membersystem: file: membersystem.yml From b1c9113cb7f81f3ba05ccfc61a94b136e244b499 Mon Sep 17 00:00:00 2001 From: Sam Al-Sapti Date: Tue, 13 Dec 2022 16:32:33 +0100 Subject: [PATCH 3/5] Fix git URL --- roles/docker/tasks/services/websites/new-new.data.coop.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 e793f56..d6bafe7 100644 --- a/roles/docker/tasks/services/websites/new-new.data.coop.yml +++ b/roles/docker/tasks/services/websites/new-new.data.coop.yml @@ -11,7 +11,7 @@ VIRTUAL_HOST: "{{ services.new_new_data_coop_website.domain }}" LETSENCRYPT_HOST: "{{ services.new_new_data_coop_website.domain }}" LETSENCRYPT_EMAIL: "{{ letsencrypt_email }}" - command: "--remote=https://git.data.coop:halfd/new-website.git#main" + command: "--remote=https://git.data.coop/halfd/new-website.git#main" capabilities: - NET_ADMIN devices: From 64ec448fc096dbf8ce701658c0ca6f28e51b5b56 Mon Sep 17 00:00:00 2001 From: Sam Al-Sapti Date: Wed, 14 Dec 2022 18:43:49 +0100 Subject: [PATCH 4/5] Remove new-new.data.coop container --- roles/docker/tasks/services/websites/new-new.data.coop.yml | 1 + 1 file changed, 1 insertion(+) 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 d6bafe7..36ff636 100644 --- a/roles/docker/tasks/services/websites/new-new.data.coop.yml +++ b/roles/docker/tasks/services/websites/new-new.data.coop.yml @@ -1,6 +1,7 @@ --- - name: setup new-new data.coop website using unipi docker_container: + state: absent name: new-new.data.coop_website image: docker.data.coop/unipi:{{ services.new_new_data_coop_website.version }} restart_policy: unless-stopped From 8fc0a97d232bba9382a1e2ad0f620c7637bff24b Mon Sep 17 00:00:00 2001 From: Sam Al-Sapti Date: Wed, 14 Dec 2022 18:46:03 +0100 Subject: [PATCH 5/5] Remove new-new.data.coop from Ansible --- roles/docker/defaults/main.yml | 5 ----- .../services/websites/new-new.data.coop.yml | 22 ------------------- 2 files changed, 27 deletions(-) delete mode 100644 roles/docker/tasks/services/websites/new-new.data.coop.yml diff --git a/roles/docker/defaults/main.yml b/roles/docker/defaults/main.yml index ee86a05..67078c3 100644 --- a/roles/docker/defaults/main.yml +++ b/roles/docker/defaults/main.yml @@ -122,11 +122,6 @@ services: domain: "new.{{ base_domain }}" version: hugo - new_new_data_coop_website: - file: websites/new-new.data.coop.yml - domain: "new-new.{{ base_domain }}" - version: latest - slides_2022_website: file: websites/2022.slides.data.coop.yml domain: "2022.slides.{{ base_domain }}" diff --git a/roles/docker/tasks/services/websites/new-new.data.coop.yml b/roles/docker/tasks/services/websites/new-new.data.coop.yml deleted file mode 100644 index 36ff636..0000000 --- a/roles/docker/tasks/services/websites/new-new.data.coop.yml +++ /dev/null @@ -1,22 +0,0 @@ ---- -- name: setup new-new data.coop website using unipi - docker_container: - state: absent - name: new-new.data.coop_website - image: docker.data.coop/unipi:{{ services.new_new_data_coop_website.version }} - restart_policy: unless-stopped - purge_networks: yes - networks: - - name: external_services - env: - VIRTUAL_HOST: "{{ services.new_new_data_coop_website.domain }}" - LETSENCRYPT_HOST: "{{ services.new_new_data_coop_website.domain }}" - LETSENCRYPT_EMAIL: "{{ letsencrypt_email }}" - command: "--remote=https://git.data.coop/halfd/new-website.git#main" - capabilities: - - NET_ADMIN - devices: - - "/dev/net/tun" - labels: - com.centurylinklabs.watchtower.enable: "true" -