diff --git a/ansible_yaml/a11yvillage-be-playbook.yml b/ansible_yaml/a11yvillage-be-playbook.yml index 45c1db6..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 @@ -55,43 +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 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 - - - 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 984f2ef..5ef52f6 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 @@ -55,43 +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 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 - - - 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 }}" @@ -116,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"