From 88f210e0848830604a70a4fb1a22925a86108160 Mon Sep 17 00:00:00 2001 From: Anson Shie Date: Sun, 8 Jun 2025 16:48:06 +0800 Subject: [PATCH 1/5] Fix typo --- ansible_yaml/a11yvillage-fe-playbook.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible_yaml/a11yvillage-fe-playbook.yml b/ansible_yaml/a11yvillage-fe-playbook.yml index 984f2ef..ffc8cdf 100644 --- a/ansible_yaml/a11yvillage-fe-playbook.yml +++ b/ansible_yaml/a11yvillage-fe-playbook.yml @@ -116,7 +116,7 @@ memory: 1G labels: - "traefik.enable=true" - - "traefik.http.routers.a11yvillage.rule=Host(`a11yvillageBeta.coseeing.org`)" + - "traefik.http.routers.a11yvillage.rule=Host(`a11yvillagebeta.coseeing.org`)" - "traefik.http.routers.a11yvillage.entrypoints=websecure" - "traefik.http.routers.a11yvillage.tls.certresolver=a11yvillageresolver" - "traefik.docker.network=entry" From feaab5d816dab83d92d7fc0743bc3abcb3d6923c Mon Sep 17 00:00:00 2001 From: Anson Shie Date: Sun, 8 Jun 2025 17:00:38 +0800 Subject: [PATCH 2/5] Update docker repo --- ansible_yaml/a11yvillage-be-playbook.yml | 21 +++++++++++---------- ansible_yaml/a11yvillage-fe-playbook.yml | 21 +++++++++++---------- 2 files changed, 22 insertions(+), 20 deletions(-) diff --git a/ansible_yaml/a11yvillage-be-playbook.yml b/ansible_yaml/a11yvillage-be-playbook.yml index 45c1db6..328f6d3 100644 --- a/ansible_yaml/a11yvillage-be-playbook.yml +++ b/ansible_yaml/a11yvillage-be-playbook.yml @@ -66,17 +66,18 @@ update_cache: yes become: true - - name: Add Docker GPG key - apt_key: - url: https://download.docker.com/linux/ubuntu/gpg - state: present - become: true - - name: Add Docker repository - apt_repository: - repo: deb [arch=amd64] https://download.docker.com/linux/ubuntu {{ ansible_distribution_release }} stable - state: present - become: true + shell: | + install -m 0755 -d /etc/apt/keyrings + curl -fsSL https://download.docker.com/linux/ubuntu/gpg -o /etc/apt/keyrings/docker.asc + chmod a+r /etc/apt/keyrings/docker.asc + + # Add the repository to Apt sources: + echo \ + "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.asc] https://download.docker.com/linux/ubuntu \ + $(. /etc/os-release && echo "${UBUNTU_CODENAME:-$VERSION_CODENAME}") stable" | \ + tee /etc/apt/sources.list.d/docker.list > /dev/null + apt-get update - name: Install Docker apt: diff --git a/ansible_yaml/a11yvillage-fe-playbook.yml b/ansible_yaml/a11yvillage-fe-playbook.yml index ffc8cdf..456e2e6 100644 --- a/ansible_yaml/a11yvillage-fe-playbook.yml +++ b/ansible_yaml/a11yvillage-fe-playbook.yml @@ -66,17 +66,18 @@ update_cache: yes become: true - - name: Add Docker GPG key - apt_key: - url: https://download.docker.com/linux/ubuntu/gpg - state: present - become: true - - name: Add Docker repository - apt_repository: - repo: deb [arch=amd64] https://download.docker.com/linux/ubuntu {{ ansible_distribution_release }} stable - state: present - become: true + shell: | + install -m 0755 -d /etc/apt/keyrings + curl -fsSL https://download.docker.com/linux/ubuntu/gpg -o /etc/apt/keyrings/docker.asc + chmod a+r /etc/apt/keyrings/docker.asc + + # Add the repository to Apt sources: + echo \ + "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.asc] https://download.docker.com/linux/ubuntu \ + $(. /etc/os-release && echo "${UBUNTU_CODENAME:-$VERSION_CODENAME}") stable" | \ + tee /etc/apt/sources.list.d/docker.list > /dev/null + apt-get update - name: Install Docker apt: From 589f30c3a9048460350dcbc4ff5ae3bcedd7fa46 Mon Sep 17 00:00:00 2001 From: Anson Shie Date: Sun, 8 Jun 2025 17:05:54 +0800 Subject: [PATCH 3/5] Remove docker prepare --- ansible_yaml/a11yvillage-be-playbook.yml | 38 ------------------------ ansible_yaml/a11yvillage-fe-playbook.yml | 38 ------------------------ 2 files changed, 76 deletions(-) diff --git a/ansible_yaml/a11yvillage-be-playbook.yml b/ansible_yaml/a11yvillage-be-playbook.yml index 328f6d3..b2a2e23 100644 --- a/ansible_yaml/a11yvillage-be-playbook.yml +++ b/ansible_yaml/a11yvillage-be-playbook.yml @@ -55,44 +55,6 @@ update_cache: yes become: true - - name: Install Docker dependencies - apt: - name: - - apt-transport-https - - ca-certificates - - curl - - software-properties-common - state: present - update_cache: yes - become: true - - - name: Add Docker repository - shell: | - install -m 0755 -d /etc/apt/keyrings - curl -fsSL https://download.docker.com/linux/ubuntu/gpg -o /etc/apt/keyrings/docker.asc - chmod a+r /etc/apt/keyrings/docker.asc - - # Add the repository to Apt sources: - echo \ - "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.asc] https://download.docker.com/linux/ubuntu \ - $(. /etc/os-release && echo "${UBUNTU_CODENAME:-$VERSION_CODENAME}") stable" | \ - tee /etc/apt/sources.list.d/docker.list > /dev/null - apt-get update - - - name: Install Docker - apt: - name: docker-ce - state: present - update_cache: yes - become: true - - - name: Start Docker service - service: - name: docker - state: started - enabled: yes - become: true - - name: Get info from AWS secret manager set_fact: secret_data: "{{ lookup('amazon.aws.aws_secret', secret_name, region=secret_region) | from_json }}" diff --git a/ansible_yaml/a11yvillage-fe-playbook.yml b/ansible_yaml/a11yvillage-fe-playbook.yml index 456e2e6..acd354e 100644 --- a/ansible_yaml/a11yvillage-fe-playbook.yml +++ b/ansible_yaml/a11yvillage-fe-playbook.yml @@ -55,44 +55,6 @@ update_cache: yes become: true - - name: Install Docker dependencies - apt: - name: - - apt-transport-https - - ca-certificates - - curl - - software-properties-common - state: present - update_cache: yes - become: true - - - name: Add Docker repository - shell: | - install -m 0755 -d /etc/apt/keyrings - curl -fsSL https://download.docker.com/linux/ubuntu/gpg -o /etc/apt/keyrings/docker.asc - chmod a+r /etc/apt/keyrings/docker.asc - - # Add the repository to Apt sources: - echo \ - "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.asc] https://download.docker.com/linux/ubuntu \ - $(. /etc/os-release && echo "${UBUNTU_CODENAME:-$VERSION_CODENAME}") stable" | \ - tee /etc/apt/sources.list.d/docker.list > /dev/null - apt-get update - - - name: Install Docker - apt: - name: docker-ce - state: present - update_cache: yes - become: true - - - name: Start Docker service - service: - name: docker - state: started - enabled: yes - become: true - - name: Ensure docker compose directory exists file: path: "{{ docker_compose_dir }}" From 6603a6fe1939ceb2ef8938b56d4c5eed1d469c00 Mon Sep 17 00:00:00 2001 From: Anson Shie Date: Sun, 8 Jun 2025 18:20:14 +0800 Subject: [PATCH 4/5] Update path --- ansible_yaml/a11yvillage-be-playbook.yml | 2 +- ansible_yaml/a11yvillage-fe-playbook.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ansible_yaml/a11yvillage-be-playbook.yml b/ansible_yaml/a11yvillage-be-playbook.yml index b2a2e23..08c1ce0 100644 --- a/ansible_yaml/a11yvillage-be-playbook.yml +++ b/ansible_yaml/a11yvillage-be-playbook.yml @@ -4,7 +4,7 @@ become_user: root vars: deploy_tag: ${{ github.event.inputs.deployTag }} - docker_compose_dir: /home/data/a11yvillage-server + docker_compose_dir: /data/a11yvillage-server secret_name: prod/rdsuser/a11yvillage secret_region: ap-northeast-1 webroot_path: '/var/www/html' # the root path of your site diff --git a/ansible_yaml/a11yvillage-fe-playbook.yml b/ansible_yaml/a11yvillage-fe-playbook.yml index acd354e..4ac072d 100644 --- a/ansible_yaml/a11yvillage-fe-playbook.yml +++ b/ansible_yaml/a11yvillage-fe-playbook.yml @@ -4,7 +4,7 @@ become_user: root vars: deploy_tag: ${{ github.event.inputs.deployTag }} - docker_compose_dir: /home/data/a11yvillage-web + docker_compose_dir: /data/a11yvillage-web secret_name: prod/rdsuser/a11yvillage secret_region: ap-northeast-1 webroot_path: '/var/www/html' # the root path of your site From 7edbc8a6bfb7e34ac5e563b3c15d22a68344d2f8 Mon Sep 17 00:00:00 2001 From: Anson Shie Date: Sun, 8 Jun 2025 18:20:37 +0800 Subject: [PATCH 5/5] Update path --- ansible_yaml/a11yvillage-fe-playbook.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible_yaml/a11yvillage-fe-playbook.yml b/ansible_yaml/a11yvillage-fe-playbook.yml index 4ac072d..5ef52f6 100644 --- a/ansible_yaml/a11yvillage-fe-playbook.yml +++ b/ansible_yaml/a11yvillage-fe-playbook.yml @@ -79,7 +79,7 @@ memory: 1G labels: - "traefik.enable=true" - - "traefik.http.routers.a11yvillage.rule=Host(`a11yvillagebeta.coseeing.org`)" + - "traefik.http.routers.a11yvillage.rule=Host(`a11yvillage.coseeing.org`)" - "traefik.http.routers.a11yvillage.entrypoints=websecure" - "traefik.http.routers.a11yvillage.tls.certresolver=a11yvillageresolver" - "traefik.docker.network=entry"