diff --git a/galaxy.yml b/galaxy.yml index f091c8b..0dc34a8 100644 --- a/galaxy.yml +++ b/galaxy.yml @@ -3,11 +3,11 @@ namespace: uumas name: docker description: Roles for installing services in docker containers -version: 0.9.0 +version: 0.9.1 readme: README.md repository: https://git.uumas.fi/uumas/ansible-docker license_file: LICENSE dependencies: - uumas.general: '>=0.5.9' + uumas.general: '>=0.5.13' authors: - uumas diff --git a/roles/alertmanager/meta/argument_specs.yml b/roles/alertmanager/meta/argument_specs.yml index 93749e1..9535cd8 100644 --- a/roles/alertmanager/meta/argument_specs.yml +++ b/roles/alertmanager/meta/argument_specs.yml @@ -74,6 +74,9 @@ argument_specs: docker_vhost_domains: description: "Passed to container role" required: false + docker_vhost_additional_locations: + description: "Passed to container role" + required: false docker_entrypoint: description: "Passed to container role" required: false diff --git a/roles/alpine/meta/argument_specs.yml b/roles/alpine/meta/argument_specs.yml index fcf3613..e579bc0 100644 --- a/roles/alpine/meta/argument_specs.yml +++ b/roles/alpine/meta/argument_specs.yml @@ -33,6 +33,9 @@ argument_specs: docker_vhost_domains: description: "Passed to container role" required: false + docker_vhost_additional_locations: + description: "Passed to container role" + required: false docker_entrypoint: description: "Passed to container role" required: false diff --git a/roles/authentik/meta/argument_specs.yml b/roles/authentik/meta/argument_specs.yml index 5f7965d..6e7b761 100644 --- a/roles/authentik/meta/argument_specs.yml +++ b/roles/authentik/meta/argument_specs.yml @@ -43,6 +43,9 @@ argument_specs: docker_vhost_domains: description: "Passed to container role" required: false + docker_vhost_additional_locations: + description: "Passed to container role" + required: false docker_entrypoint: description: "Passed to container role" required: false diff --git a/roles/authentik_ldap/meta/argument_specs.yaml b/roles/authentik_ldap/meta/argument_specs.yaml index 4ee3347..ccfe2fb 100644 --- a/roles/authentik_ldap/meta/argument_specs.yaml +++ b/roles/authentik_ldap/meta/argument_specs.yaml @@ -36,15 +36,9 @@ argument_specs: docker_volume_type: description: "Passed to container role" required: false - reverse_proxy_type: - description: "Passed to container role" - required: false ports: description: "Passed to container role" required: false - docker_vhost_domains: - description: "Passed to container role" - required: false docker_entrypoint: description: "Passed to container role" required: false diff --git a/roles/dokuwiki/meta/argument_specs.yml b/roles/dokuwiki/meta/argument_specs.yml index 8cfe968..76b7335 100644 --- a/roles/dokuwiki/meta/argument_specs.yml +++ b/roles/dokuwiki/meta/argument_specs.yml @@ -40,6 +40,9 @@ argument_specs: docker_vhost_domains: description: "Passed to container role" required: false + docker_vhost_additional_locations: + description: "Passed to container role" + required: false docker_entrypoint: description: "Passed to container role" required: false diff --git a/roles/grafana/meta/argument_specs.yml b/roles/grafana/meta/argument_specs.yml index 9778e89..1d7bf1b 100644 --- a/roles/grafana/meta/argument_specs.yml +++ b/roles/grafana/meta/argument_specs.yml @@ -88,4 +88,6 @@ argument_specs: docker_entrypoint: description: "Passed to container role" required: false - + docker_vhost_additional_locations: + description: "Passed to container role" + required: false diff --git a/roles/prometheus/meta/argument_specs.yml b/roles/prometheus/meta/argument_specs.yml index 5896961..f203b42 100644 --- a/roles/prometheus/meta/argument_specs.yml +++ b/roles/prometheus/meta/argument_specs.yml @@ -144,6 +144,9 @@ argument_specs: docker_vhost_domains: description: "Passed to container role" required: false + docker_vhost_additional_locations: + description: "Passed to container role" + required: false docker_entrypoint: description: "Passed to container role" required: false diff --git a/roles/service/meta/argument_specs.yml b/roles/service/meta/argument_specs.yml index 7297a86..232f173 100644 --- a/roles/service/meta/argument_specs.yml +++ b/roles/service/meta/argument_specs.yml @@ -168,6 +168,9 @@ argument_specs: docker_vhost_domains: description: "docker_vhost_domains[docker_service] is a list which defines which domains should be proxied to the container. Required if reverse_proxy_type is not none. docker_vhost_domains[docker_service + '-phpmyadmin'] is used for phpmyadmin" type: dict + docker_vhost_additional_locations: + description: "Passed to vhost role as vhost_locations variable" + required: false docker_published_ports: description: "A list of published ports in docker format (::)" type: list diff --git a/roles/service/tasks/proxy.yml b/roles/service/tasks/proxy.yml index e8de601..a735a16 100644 --- a/roles/service/tasks/proxy.yml +++ b/roles/service/tasks/proxy.yml @@ -17,6 +17,7 @@ vhost_proxy_target_protocol: "{{ docker_proxy_target_protocol }}" vhost_domains: "{{ docker_vhost_domains[docker_service_name] }}" vhost_proxy_target_port: "{{ ports[docker_service_name][vhost_proxy_target_protocol] }}" + vhost_locations: "{{ docker_vhost_additional_locations }}" when: reverse_proxy_type != 'traefik' - name: Set published ports variable to http port