uumas/ansible-docker
1
0
Fork 1
Code Issues 8 Pull Requests Projects Releases Wiki Activity

uumas.general.vhost update

Browse Source
This commit is contained in:
uumas
2024-07-28 01:23:43 +03:00
parent e4222635d9
commit c7b14f8dfa
4 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
roles/container/tasks/proxy.yml
View File

@@ -6,9 +6,9 @@
vars:
vhost_type: reverse_proxy
vhost_id: "{{ docker_service_name }}"
proxy_target_protocol: "{{ docker_proxy_target_protocol }}"
vhost_proxy_target_protocol: "{{ docker_proxy_target_protocol }}"
vhost_domains: "{{ docker_vhost_domains[docker_service_name] }}"
proxy_target_port: "{{ ports[docker_service_name][proxy_target_protocol] }}"
vhost_proxy_target_port: "{{ ports[docker_service_name][proxy_target_protocol] }}"
when: reverse_proxy_type != 'traefik'
- name: Set published ports variable to http port
@@ -29,7 +29,7 @@
vhost_type: reverse_proxy
vhost_id: "{{ docker_service_name }}_phpmyadmin"
vhost_domains: "{{ docker_vhost_domains[docker_service_name + '_phpmyadmin'] }}"
proxy_target_port: "{{ ports[docker_service_name]['phpmyadmin'] }}"
vhost_proxy_target_port: "{{ ports[docker_service_name]['phpmyadmin'] }}"
vhost_basicauth: "{{ docker_phpmyadmin_basicauth }}"
vhost_basicauth_users: "{{ docker_phpmyadmin_basicauth_users }}"
when: docker_database == 'mariadb' and ports[docker_service_name]['phpmyadmin'] is defined

5
roles/element/meta/main.yml
View File

@@ -2,8 +2,9 @@
dependencies:
- role: docker
- role: uumas.general.reverse_proxy
- role: uumas.general.vhost
vhost_type: reverse_proxy
vhost_id: element
vhost_domains: "{{ element_domains }}"
proxy_target: http://127.0.0.1:{{ ports.element_http }}
vhost_proxy_target: http://127.0.0.1:{{ ports.element_http }}
when: reverse_proxy_type != 'none' and reverse_proxy_type != 'traefik'

5
roles/jitsi/meta/main.yml
View File

@@ -2,9 +2,10 @@
dependencies:
- role: docker
- role: uumas.general.reverse_proxy
- role: uumas.general.vhost
vhost_type: reverse_proxy
vhost_id: jitsi
vhost_domains:
- "{{ jitsi_domain }}"
proxy_target: http://127.0.0.1:{{ ports.jitsi_http }}
vhost_proxy_target: http://127.0.0.1:{{ ports.jitsi_http }}
when: reverse_proxy_type != 'traefik'

4
roles/service/tasks/proxy.yml
View File

@@ -14,9 +14,9 @@
vars:
vhost_type: reverse_proxy
vhost_id: "{{ docker_service_name }}"
proxy_target_protocol: "{{ docker_proxy_target_protocol }}"
vhost_proxy_target_protocol: "{{ docker_proxy_target_protocol }}"
vhost_domains: "{{ docker_vhost_domains[docker_service_name] }}"
proxy_target_port: "{{ ports[docker_service_name][proxy_target_protocol] }}"
vhost_proxy_target_port: "{{ ports[docker_service_name][proxy_target_protocol] }}"
when: reverse_proxy_type != 'traefik'
- name: Set published ports variable to http port