From 8d42e585580ca13b09abd18b6580683e49700453 Mon Sep 17 00:00:00 2001 From: vic Date: Wed, 6 May 2026 22:41:17 +0800 Subject: [PATCH 1/3] chore: Update environment variable configurations in a11yvillage playbook for development and production URLs --- .github/workflows/ansible.yml | 8 ++++---- ansible_yaml/a11yvillage-web-playbook.yml | 9 ++++++--- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ansible.yml b/.github/workflows/ansible.yml index 2247fe7..f4d715e 100644 --- a/.github/workflows/ansible.yml +++ b/.github/workflows/ansible.yml @@ -50,7 +50,7 @@ jobs: - name: Set up Python 3.10 uses: actions/setup-python@v4 with: - python-version: '3.10' + python-version: "3.10" - name: Install dependencies in virtual environment run: | @@ -106,7 +106,7 @@ jobs: id: set_domain run: | DOMAIN=$(jq -r --arg type "${{ github.event.inputs.deploy_type }}" --arg site "${{ github.event.inputs.deploy_site }}" '.[$type][$site].domain' .github/workflows/config/domain.json) - + if [ "$DOMAIN" = "null" ]; then echo "Error: Unknown deploy_type: ${{ github.event.inputs.deploy_type }} or deploy_site: ${{ github.event.inputs.deploy_site }}" exit 1 @@ -117,7 +117,7 @@ jobs: - name: Run Ansible Playbook env: - ANSIBLE_HOST_KEY_CHECKING: 'False' + ANSIBLE_HOST_KEY_CHECKING: "False" run: | source venv/bin/activate @@ -125,7 +125,7 @@ jobs: echo "Using domain: $DOMAIN" # Set deploy tag based on deploy_site - DEPLOY_TAG="latest" + DEPLOY_TAG="prod" if [ "${{ github.event.inputs.deploy_site }}" = "dev" ]; then DEPLOY_TAG="dev" fi diff --git a/ansible_yaml/a11yvillage-web-playbook.yml b/ansible_yaml/a11yvillage-web-playbook.yml index b34af2d..6bdae33 100644 --- a/ansible_yaml/a11yvillage-web-playbook.yml +++ b/ansible_yaml/a11yvillage-web-playbook.yml @@ -23,11 +23,14 @@ dest: "{{ docker_compose_dir }}/.env" content: | {% if project_postfix == "-dev" %} - NEXT_PUBLIC_BASE_URL=https://api-a11yvillage.dev.coseeing.org/blog/api + NEXT_PUBLIC_BASE_URL=https://a11yvillage-dev.coseeing.org + NEXT_PUBLIC_BASE_API_URL=https://api.a11yvillage.dev.coseeing.org + NEXT_PUBLIC_BASE_STORAGE_URL=https://storage.a11yvillage.dev.coseeing.org {% else %} - NEXT_PUBLIC_API_URL=https://api-a11yvillage.coseeing.org/ + NEXT_PUBLIC_BASE_URL=https://a11yvillage.coseeing.org + NEXT_PUBLIC_BASE_API_URL=https://api.a11yvillage.coseeing.org + NEXT_PUBLIC_BASE_STORAGE_URL=https://storage.a11yvillage.coseeing.org {% endif %} - NEXT_PUBLIC_RESOURCE_URL=https://a11yvillage.s3.ap-northeast-1.amazonaws.com/ - name: Copy docker-compose.yml Document copy: From 911f55c7a1b557521f1aa316bb6a8c45addb586e Mon Sep 17 00:00:00 2001 From: Woody Tseng Date: Thu, 7 May 2026 13:46:01 +0800 Subject: [PATCH 2/3] update --- .github/workflows/config/domain.json | 4 ++-- ansible_yaml/a11yvillage-server-playbook.yml | 9 +++++++++ ansible_yaml/a11yvillage-web-playbook.yml | 4 ++-- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/.github/workflows/config/domain.json b/.github/workflows/config/domain.json index 6b3f92b..6361b3e 100644 --- a/.github/workflows/config/domain.json +++ b/.github/workflows/config/domain.json @@ -4,7 +4,7 @@ "domain": "api-a11yvillage.coseeing.org" }, "dev": { - "domain": "api-a11yvillage.dev.coseeing.org" + "domain": "api-a11yvillage-dev.coseeing.org" } }, "a11yvillage-web": { @@ -31,4 +31,4 @@ "domain": "api.dev.coseeing.org" } } -} \ No newline at end of file +} diff --git a/ansible_yaml/a11yvillage-server-playbook.yml b/ansible_yaml/a11yvillage-server-playbook.yml index badf37c..cf91ce4 100644 --- a/ansible_yaml/a11yvillage-server-playbook.yml +++ b/ansible_yaml/a11yvillage-server-playbook.yml @@ -42,6 +42,15 @@ MARIADB_PORT={{ MARIADB_PORT }} MARIADB_DATABASE={{ MARIADB_DATABASE }} ALLOWED_HOSTS=* + {% if project_postfix == "-dev" %} + UI_HOST=https://a11yvillage-dev.coseeing.org + API_HOST=https://api-a11yvillage-dev.coseeing.org + STORAGE_HOST=https://storage.a11yvillage.dev.coseeing.org + {% else %} + UI_HOST=https://a11yvillage.coseeing.org + API_HOST=https://api-a11yvillage.coseeing.org + STORAGE_HOST=https://storage.a11yvillage.coseeing.org + {% endif %} - name: Copy docker-compose.yml Document copy: diff --git a/ansible_yaml/a11yvillage-web-playbook.yml b/ansible_yaml/a11yvillage-web-playbook.yml index 6bdae33..53473fe 100644 --- a/ansible_yaml/a11yvillage-web-playbook.yml +++ b/ansible_yaml/a11yvillage-web-playbook.yml @@ -24,11 +24,11 @@ content: | {% if project_postfix == "-dev" %} NEXT_PUBLIC_BASE_URL=https://a11yvillage-dev.coseeing.org - NEXT_PUBLIC_BASE_API_URL=https://api.a11yvillage.dev.coseeing.org + NEXT_PUBLIC_BASE_API_URL=https://api-a11yvillage-dev.coseeing.org NEXT_PUBLIC_BASE_STORAGE_URL=https://storage.a11yvillage.dev.coseeing.org {% else %} NEXT_PUBLIC_BASE_URL=https://a11yvillage.coseeing.org - NEXT_PUBLIC_BASE_API_URL=https://api.a11yvillage.coseeing.org + NEXT_PUBLIC_BASE_API_URL=https://api-a11yvillage.coseeing.org NEXT_PUBLIC_BASE_STORAGE_URL=https://storage.a11yvillage.coseeing.org {% endif %} From d3b47ddcd9a175a59a093a85887e6b63d75ed4aa Mon Sep 17 00:00:00 2001 From: Woody Tseng Date: Fri, 8 May 2026 23:36:41 +0800 Subject: [PATCH 3/3] update coseeing web env variable --- ansible_yaml/a11yvillage-web-playbook.yml | 1 - ansible_yaml/coseeing-web-playbook.yml | 5 ++--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/ansible_yaml/a11yvillage-web-playbook.yml b/ansible_yaml/a11yvillage-web-playbook.yml index 53473fe..9de101c 100644 --- a/ansible_yaml/a11yvillage-web-playbook.yml +++ b/ansible_yaml/a11yvillage-web-playbook.yml @@ -36,7 +36,6 @@ copy: dest: "{{ docker_compose_dir }}/docker-compose.yml" content: | - version: "3.7" services: a11yvillage-web: container_name: "a11yvillage-web{{ project_postfix }}" diff --git a/ansible_yaml/coseeing-web-playbook.yml b/ansible_yaml/coseeing-web-playbook.yml index 9a8ad66..ebb5120 100644 --- a/ansible_yaml/coseeing-web-playbook.yml +++ b/ansible_yaml/coseeing-web-playbook.yml @@ -23,9 +23,9 @@ dest: "{{ docker_compose_dir }}/.env" content: | {% if project_postfix == "-dev" %} - NEXT_PUBLIC_BASE_URL=https://api.dev.coseeing.org/about/api + NEXT_PUBLIC_BASE_API_URL=https://api-dev.coseeing.org {% else %} - NEXT_PUBLIC_BASE_URL=https://api.coseeing.org/about/api + NEXT_PUBLIC_BASE_API_URL=https://api.coseeing.org {% endif %} NEXT_PUBLIC_GOOGLE_TAG_MANAGER_ID=GTM-NQQ79V67 @@ -33,7 +33,6 @@ copy: dest: "{{ docker_compose_dir }}/docker-compose.yml" content: | - version: "3.7" services: coseeing-web: container_name: "coseeing-web{{ project_postfix }}"