diff --git a/defaults/main.yml b/defaults/main.yml index 7619aa6..cafc0c9 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -8,7 +8,7 @@ haproxy_pkg_state: present haproxy_enabled: True haproxy_k_bind_non_local_ip: True haproxy_docker_container: False -haproxy_docker_compose_dir: /src/haproxy_swarm +haproxy_docker_compose_dir: /srv/haproxy_swarm haproxy_ha_with_keepalived: False haproxy_default_port: 80 diff --git a/templates/haproxy-docker-compose.yml.j2 b/templates/haproxy-docker-compose.yml.j2 index 0e894c9..5f8a1ae 100644 --- a/templates/haproxy-docker-compose.yml.j2 +++ b/templates/haproxy-docker-compose.yml.j2 @@ -4,15 +4,15 @@ services: haproxy: image: haproxytech/haproxy-debian:{{ haproxy_version }} volumes: - - '{{ haproxy_cert_dir }}':'{{ haproxy_cert_dir }}':ro + - {{ haproxy_cert_dir }}:{{ haproxy_cert_dir }}:ro - /etc/haproxy:/etc/haproxy:ro ports: - - target: '{{ haproxy_default_port }}' - published: '{{ haproxy_default_port }}' + - target: {{ haproxy_default_port }} + published: {{ haproxy_default_port }} protocol: tcp mode: host - - target: '{{ haproxy_ssl_port }}' - published: '{{ haproxy_ssl_port }}' + - target: {{ haproxy_ssl_port }} + published: {{ haproxy_ssl_port }} protocol: tcp mode: host {% if docker_swarm_haproxy_networks is defined %}