diff --git a/roles/docker/defaults/main.yml b/roles/docker/defaults/main.yml index 5be8b75..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 }}" @@ -182,7 +177,7 @@ services: pinafore: file: pinafore.yml domain: "pinafore.{{ base_domain }}" - version: v2.4.0 + version: v2.5.0 membersystem: file: membersystem.yml 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 deleted file mode 100644 index d17af7b..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: - 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 }}" - # 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" - capabilities: - - NET_ADMIN - devices: - - "/dev/net/tun" - labels: - com.centurylinklabs.watchtower.enable: "true" -