Compare commits

..

No commits in common. "67e7b7d2755e3c0800c4c47c5490b86015921b0e" and "05bc71e15ab7917b224f49402bf5a525005cb7f1" have entirely different histories.

3 changed files with 10 additions and 12 deletions

View File

@ -74,7 +74,6 @@ hydra_dispatcher_available_locales:
hydra_dispatcher_sentry_dsn: hydra_dispatcher_sentry_dsn:
hydra_dispatcher_sentry_environment: hydra_dispatcher_sentry_environment:
hydra_dispatcher_mounts: [] hydra_dispatcher_mounts: []
hydra_dispatcher_disable_app_auto_select: true
# Hydra Passwordless configuration # Hydra Passwordless configuration

View File

@ -54,6 +54,15 @@
ansible.builtin.include_tasks: hydra-database.yml ansible.builtin.include_tasks: hydra-database.yml
when: not hydra_use_external_database when: not hydra_use_external_database
- name: Configure HAProxy
template:
src: haproxy.cfg.j2
dest: /etc/haproxy/haproxy.cfg
validate: "haproxy -c -f %s"
notify:
- Restart HAProxy
become: true
- name: Create hydra-clients - name: Create hydra-clients
template: template:
src: hydra-client.json.j2 src: hydra-client.json.j2
@ -113,12 +122,3 @@
- name: Stop OIDC Test app if disabled - name: Stop OIDC Test app if disabled
ansible.builtin.include_tasks: stop-oidc-test.yml ansible.builtin.include_tasks: stop-oidc-test.yml
when: not enable_oidc_test_app when: not enable_oidc_test_app
- name: Configure HAProxy
template:
src: haproxy.cfg.j2
dest: /etc/haproxy/haproxy.cfg
validate: "haproxy -c -f %s"
notify:
- Restart HAProxy
become: true

View File

@ -20,7 +20,6 @@ PODMAN_ARGS="\
-e 'TRUSTED_PROXIES=127.0.0.1,10.0.2.0/24' \ -e 'TRUSTED_PROXIES=127.0.0.1,10.0.2.0/24' \
-e 'SENTRY_DSN={{ hydra_dispatcher_sentry_dsn }}' \ -e 'SENTRY_DSN={{ hydra_dispatcher_sentry_dsn }}' \
-e 'SENTRY_ENVIRONMENT={{ hydra_dispatcher_sentry_environment }}' \ -e 'SENTRY_ENVIRONMENT={{ hydra_dispatcher_sentry_environment }}' \
-e 'DISABLE_APP_AUTO_SELECT={{ hydra_dispatcher_disable_app_auto_select }}' \
-v /etc/hydra-dispatcher/conf.d:/var/www/config/hydra \ -v /etc/hydra-dispatcher/conf.d:/var/www/config/hydra \
{% for item in hydra_dispatcher_mounts %} {% for item in hydra_dispatcher_mounts %}
-v {{ item.host }}:{{ item.container }} \ -v {{ item.host }}:{{ item.container }} \