From cf94b5c0965deb42c2e68a444f513793a2de5420 Mon Sep 17 00:00:00 2001 From: cmsassot Date: Wed, 7 Sep 2022 13:58:53 +0200 Subject: [PATCH 1/5] AJout variable hydra_dispatcher_mounts --- defaults/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/defaults/main.yml b/defaults/main.yml index 4db82a8..7f605bf 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -70,6 +70,7 @@ hydra_dispatcher_available_locales: - en hydra_dispatcher_sentry_dsn: hydra_dispatcher_sentry_environment: +hydra_dispatcher_mounts: [] # Hydra Passwordless configuration -- 2.17.1 From e3211734f29dd9055bba3c15658412d347a810ee Mon Sep 17 00:00:00 2001 From: cmsassot Date: Wed, 7 Sep 2022 14:03:14 +0200 Subject: [PATCH 2/5] Ajout volume cadoles-pod-hydra-dispatcher --- templates/cadoles-pod-hydra-dispatcher-v1.conf.j2 | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/templates/cadoles-pod-hydra-dispatcher-v1.conf.j2 b/templates/cadoles-pod-hydra-dispatcher-v1.conf.j2 index 19dcad7..510b2e3 100644 --- a/templates/cadoles-pod-hydra-dispatcher-v1.conf.j2 +++ b/templates/cadoles-pod-hydra-dispatcher-v1.conf.j2 @@ -5,7 +5,11 @@ PODMAN_ARGS="\ --network=slirp4netns:allow_host_loopback=true \ --tz=local \ -p 127.0.0.1:3000:80 \ - -v /etc/hydra-dispatcher/conf.d:/var/www/config/hydra \ + -v /etc/hydra-dispatcher/conf.d:/var/www/config/hydra \ + /etc/hydra-dispatcher/theme/templates:/var/www/templates \ + /etc/hydra-dispatcher/theme/fonts:/var/www/public/build/fonts \ + /etc/hydra-dispatcher/theme/theme.css:/var/www/public/build/theme/theme.css \ + /etc/hydra-dispatcher/theme/images:/var/www/public/build/images -e APP_ENV=prod \ -e 'APP_DEBUG={{ hydra_dispatcher_debug }}' \ -e HYDRA_ADMIN_BASE_URL=http://10.0.2.2:4445 \ -- 2.17.1 From 2db4ad991ace9dc9096805d3f90cf629b5bfa0c5 Mon Sep 17 00:00:00 2001 From: cmsassot Date: Wed, 7 Sep 2022 15:31:39 +0200 Subject: [PATCH 3/5] Ajout volume dynamique cadoles-pod-hydra-dispatcher pour personnalisation --- templates/cadoles-pod-hydra-dispatcher-v1.conf.j2 | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/templates/cadoles-pod-hydra-dispatcher-v1.conf.j2 b/templates/cadoles-pod-hydra-dispatcher-v1.conf.j2 index 510b2e3..d1333fb 100644 --- a/templates/cadoles-pod-hydra-dispatcher-v1.conf.j2 +++ b/templates/cadoles-pod-hydra-dispatcher-v1.conf.j2 @@ -6,10 +6,9 @@ PODMAN_ARGS="\ --tz=local \ -p 127.0.0.1:3000:80 \ -v /etc/hydra-dispatcher/conf.d:/var/www/config/hydra \ - /etc/hydra-dispatcher/theme/templates:/var/www/templates \ - /etc/hydra-dispatcher/theme/fonts:/var/www/public/build/fonts \ - /etc/hydra-dispatcher/theme/theme.css:/var/www/public/build/theme/theme.css \ - /etc/hydra-dispatcher/theme/images:/var/www/public/build/images + {% for item in hydra_dispatcher_mounts %} + -v "{{ item.host }}:{{ item.container }}" \ + {% endfor %} -e APP_ENV=prod \ -e 'APP_DEBUG={{ hydra_dispatcher_debug }}' \ -e HYDRA_ADMIN_BASE_URL=http://10.0.2.2:4445 \ -- 2.17.1 From 83466cad8e5c4954ee20b815c8e7c9abf994a607 Mon Sep 17 00:00:00 2001 From: cmsassot Date: Thu, 8 Sep 2022 14:26:42 +0200 Subject: [PATCH 4/5] Ajout configuration theme hydra-dispatcher --- defaults/main.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/defaults/main.yml b/defaults/main.yml index 7f605bf..e35e2ea 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -70,6 +70,11 @@ hydra_dispatcher_available_locales: - en hydra_dispatcher_sentry_dsn: hydra_dispatcher_sentry_environment: +hydra_dispatcher_repository_url: +hydra_dispatcher_deploy_key: +hydra_dispatcher_deploy_key_dest: +hydra_dispatcher_theme_gitref: +hydra_dispatcher_base_dir_theme: hydra_dispatcher_mounts: [] # Hydra Passwordless configuration -- 2.17.1 From a0be5bc53da9a88d48ad80f4667aa55ba1f8b53c Mon Sep 17 00:00:00 2001 From: cmsassot Date: Fri, 9 Sep 2022 15:23:30 +0200 Subject: [PATCH 5/5] Suppression variable inutiliser par role sso --- defaults/main.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index e35e2ea..7f605bf 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -70,11 +70,6 @@ hydra_dispatcher_available_locales: - en hydra_dispatcher_sentry_dsn: hydra_dispatcher_sentry_environment: -hydra_dispatcher_repository_url: -hydra_dispatcher_deploy_key: -hydra_dispatcher_deploy_key_dest: -hydra_dispatcher_theme_gitref: -hydra_dispatcher_base_dir_theme: hydra_dispatcher_mounts: [] # Hydra Passwordless configuration -- 2.17.1