diff --git a/ansible/roles/web/tasks/install.yaml b/ansible/roles/web/tasks/install.yaml index e0ebf94..9f3174a 100644 --- a/ansible/roles/web/tasks/install.yaml +++ b/ansible/roles/web/tasks/install.yaml @@ -7,6 +7,7 @@ git: repo: 'https://github.com/datalets/public-health-ch' dest: "{{ release_dir }}" + force: yes - name: Copy Docker site configuration template: diff --git a/ansible/roles/web/tasks/manage.yaml b/ansible/roles/web/tasks/manage.yaml index 2444a1d..e6ff316 100644 --- a/ansible/roles/web/tasks/manage.yaml +++ b/ansible/roles/web/tasks/manage.yaml @@ -1,4 +1,4 @@ --- - name: Start Docker site - shell: docker-compose up + shell: docker-compose up -d diff --git a/ansible/roles/web/tasks/nginx.yaml b/ansible/roles/web/tasks/nginx.yaml index d2d61bd..4e102d4 100644 --- a/ansible/roles/web/tasks/nginx.yaml +++ b/ansible/roles/web/tasks/nginx.yaml @@ -1,8 +1,5 @@ --- -- name: Test and reload Nginx - service: name=nginx state=reloaded - # Note that changing the domain leaves the old config in place - name: Copy Nginx site config template: diff --git a/ansible/roles/web/templates/docker-compose.j2 b/ansible/roles/web/templates/docker-compose.j2 index 914b200..88fe9a8 100644 --- a/ansible/roles/web/templates/docker-compose.j2 +++ b/ansible/roles/web/templates/docker-compose.j2 @@ -25,12 +25,12 @@ web: redis: image: redis ports: - - "6379:6379" + - "6379:6379" postgres: image: postgres ports: - - "5432:5432" + - "5432:5432" elasticsearch: image: orchardup/elasticsearch ports: - - "9200:9200" + - "9200:9200" diff --git a/ansible/site.yaml b/ansible/site.yaml index 90860b5..f8a0a60 100644 --- a/ansible/site.yaml +++ b/ansible/site.yaml @@ -6,7 +6,7 @@ django_log_dir: /var/log/publichealth ipv4_addresses: "{{ ansible_all_ipv4_addresses }}" environment: - COMPOSE_FILE: "./docker-compose.yml" + COMPOSE_FILE: "{{ release_dir }}/docker-compose.yml" COMPOSE_PROJECT_NAME: publichealth roles: - web