Reviewed-on: data.coop/ansible#172
This commit is contained in:
Sam A. 2023-07-26 15:05:11 +00:00
commit 2a74df91f1
3 changed files with 23 additions and 27 deletions

View file

@ -126,14 +126,11 @@ services:
data_coop_website: data_coop_website:
file: websites/data.coop.yml file: websites/data.coop.yml
domains: domain: "{{ base_domain }}"
- "{{ base_domain }}" www_domain: "www.{{ base_domain }}"
- "www.{{ base_domain }}" version: stable
staging_domain: "staging.{{ base_domain }}"
new_data_coop_website: staging_version: staging
file: websites/new.data.coop.yml
domain: "new.{{ base_domain }}"
version: hugo
slides_2022_website: slides_2022_website:
file: websites/2022.slides.data.coop.yml file: websites/2022.slides.data.coop.yml

View file

@ -3,21 +3,33 @@
- name: Upload vhost config for root domain - name: Upload vhost config for root domain
copy: copy:
src: files/configs/matrix/vhost-root src: files/configs/matrix/vhost-root
dest: "{{ services.nginx_proxy.volume_folder }}/vhost/{{ base_domain }}" dest: "{{ services.nginx_proxy.volume_folder }}/vhost/{{ services.data_coop_website.domain }}"
- name: Upload vhost config for WWW domain - name: Upload vhost config for WWW domain
copy: copy:
src: files/configs/vhost-www src: files/configs/vhost-www
dest: "{{ services.nginx_proxy.volume_folder }}/vhost/www.{{ base_domain }}" dest: "{{ services.nginx_proxy.volume_folder }}/vhost/{{ services.data_coop_website.www_domain }}"
- name: setup data.coop website docker container - name: setup data.coop website docker container
docker_container: docker_container:
name: data.coop_website name: "{{ services.data_coop_website.domain }}_website"
image: docker.data.coop/data-coop-website image: docker.data.coop/data-coop-website:{{ services.data_coop_website.version }}
restart_policy: unless-stopped restart_policy: unless-stopped
networks: networks:
- name: external_services - name: external_services
env: env:
VIRTUAL_HOST : "{{ services.data_coop_website.domains|join(',') }}" VIRTUAL_HOST: "{{ services.data_coop_website.domain }},{{ services.data_coop_website.www_domain }}"
LETSENCRYPT_HOST: "{{ services.data_coop_website.domains|join(',') }}" LETSENCRYPT_HOST: "{{ services.data_coop_website.domain }},{{ services.data_coop_website.www_domain }}"
LETSENCRYPT_EMAIL: "{{ letsencrypt_email }}"
- name: setup staging data.coop website using hugo
docker_container:
name: "{{ services.data_coop_website.staging_domain }}_website"
image: docker.data.coop/data-coop-website:{{ services.data_coop_website.staging_version }}
restart_policy: unless-stopped
networks:
- name: external_services
env:
VIRTUAL_HOST: "{{ services.data_coop_website.staging_domain }}"
LETSENCRYPT_HOST: "{{ services.data_coop_website.staging_domain }}"
LETSENCRYPT_EMAIL: "{{ letsencrypt_email }}" LETSENCRYPT_EMAIL: "{{ letsencrypt_email }}"

View file

@ -1,13 +0,0 @@
# vim: ft=yaml.ansible
---
- name: setup new data.coop website using hugo
docker_container:
name: new.data.coop_website
image: docker.data.coop/data-coop-website:{{ services.new_data_coop_website.version }}
restart_policy: unless-stopped
networks:
- name: external_services
env:
VIRTUAL_HOST : "{{ services.new_data_coop_website.domain }}"
LETSENCRYPT_HOST: "{{ services.new_data_coop_website.domain }}"
LETSENCRYPT_EMAIL: "{{ letsencrypt_email }}"