diff options
Diffstat (limited to 'playbooks/roles/nginx-proxy')
-rw-r--r-- | playbooks/roles/nginx-proxy/handlers/main.yml | 2 | ||||
-rw-r--r-- | playbooks/roles/nginx-proxy/tasks/main.yml | 4 | ||||
-rw-r--r-- | playbooks/roles/nginx-proxy/templates/docker-compose.yml | 4 |
3 files changed, 6 insertions, 4 deletions
diff --git a/playbooks/roles/nginx-proxy/handlers/main.yml b/playbooks/roles/nginx-proxy/handlers/main.yml index 43302b5..98486dc 100644 --- a/playbooks/roles/nginx-proxy/handlers/main.yml +++ b/playbooks/roles/nginx-proxy/handlers/main.yml @@ -5,3 +5,5 @@ name: docker-compose@nginx-proxy state: restarted enabled: true + when: compose_mode is not defined or compose_mode != false + diff --git a/playbooks/roles/nginx-proxy/tasks/main.yml b/playbooks/roles/nginx-proxy/tasks/main.yml index 9c14072..50958e7 100644 --- a/playbooks/roles/nginx-proxy/tasks/main.yml +++ b/playbooks/roles/nginx-proxy/tasks/main.yml @@ -3,14 +3,14 @@ - name: Build nginx-proxy compose dirs ansible.builtin.file: state: directory - dest: '/etc/docker/compose/nginx-proxy/{{ item.path }}' + dest: '{{ nginx_proxy_base }}/{{ item.path }}' with_filetree: '../templates' when: item.state == 'directory' - name: Build nginx-proxy compose files ansible.builtin.template: src: '{{ item.src }}' - dest: '/etc/docker/compose/nginx-proxy/{{ item.path }}' + dest: '{{ nginx_proxy_base }}/{{ item.path }}' with_filetree: '../templates' when: item.state == 'file' notify: diff --git a/playbooks/roles/nginx-proxy/templates/docker-compose.yml b/playbooks/roles/nginx-proxy/templates/docker-compose.yml index fd49712..e0f56c4 100644 --- a/playbooks/roles/nginx-proxy/templates/docker-compose.yml +++ b/playbooks/roles/nginx-proxy/templates/docker-compose.yml @@ -9,7 +9,7 @@ services: - "443:443" volumes: - /var/run/docker.sock:/tmp/docker.sock:ro - - ./certs:/etc/nginx/certs + - {{ nginx_proxy_base }}/certs:/etc/nginx/certs networks: - proxy labels: @@ -22,7 +22,7 @@ services: volumes: - /var/run/docker.sock:/var/run/docker.sock:ro - acme:/etc/acme.sh - - ./certs:/etc/nginx/certs + - {{ nginx_proxy_base }}/certs:/etc/nginx/certs environment: - "DEFAULT_EMAIL={{ certs_email }}" - "ACME_CHALLENGE=DNS-01" |