defaults/main.yml

@@ -53,11 +53,6 @@ hydra_public_cors_allowed_origins: []
 hydra_log_level: warn
 hydra_log_leak_sensitive_values: no
 
-# Durée de vie des "refresh_token"
-hydra_ttl_refresh_token: "24h"
-
-hydra_bcrypt_cost: 8
-
 # This value should not be changed after first deployment !
 hydra_secrets_seed: "{{ inventory_hostname }}"
 
@@ -171,6 +166,9 @@ hydra_saml_debug: no
 # Niveau de verbosité du service shibboleth-sp
 hydra_saml_sp_log_level: WARN
 
+# Durée de vie des "refresh_token"
+hydra_ttl_refresh_token: "24h"
+
 # Inclure les règles de cartographie des attributs SAML fournis  par défaut par le projet hydra-shibboleth-sp-v3
 hydra_saml_include_sp_default_attributes_mapping: "yes"
 
@@ -228,7 +226,6 @@ oidc_test_app_public_base_url: "{{ haproxy_public_base_url }}{{ haproxy_oidc_tes
 
 enable_hydra_oidc: no
 hydra_oidc_debug: no
-hydra_oidc_internal_port: 8080
 hydra_oidc_hydra_url_error:
 hydra_oidc_base_url:
 hydra_oidc_cookie_path: "{{ haproxy_hydra_oidc_base_path }}"

handlers/main.yml

@@ -46,7 +46,6 @@
     name: cadoles-pod-hydra-oidc-v1
     state: restarted
   become: true
-  when: not install_only
 
 - name: Restart cadoles-pod-hydra-ldap-v1
   service:

sso.schema.yml

@@ -89,10 +89,6 @@ properties:
   hydra_ttl_refresh_token:
     type: string
 
-  hydra_brypt_cost:
-    type: number
-    description: Coût CPU pour calculer des hachages de secret (4-31)
-
   # This value should not be changed after first deployment !
   hydra_secrets_seed:
     type: string

tasks/configure-hydra-sp.yml

@@ -1,21 +0,0 @@
----
-# Simple task to update the config files of cadoles-pod-shibboleth-sp only.
-
-- name: Configure cadoles-pod-shibboleth-sp-v3
-  ansible.builtin.template:
-    src: "{{ item.src }}"
-    dest: "{{ item.dest }}"
-    mode: "{{ item.mode }}"
-  with_items:
-    - src:  cadoles-pod-shibboleth-sp-v3.conf.j2
-      dest: /etc/cadoles-pod-shibboleth-sp-v3.conf
-      mode: u=rw,g=r
-    - src:  shibboleth-attribute-map.inc.xml.j2
-      dest: /etc/shibboleth/attribute-map.inc.xml
-      mode: u=rw,g=r,o=r
-    - src:  shibboleth-attribute-policy.inc.xml.j2
-      dest: /etc/shibboleth/attribute-policy.inc.xml
-      mode: u=rw,g=r,o=r
-  notify:
-    - Restart cadoles-pod-shibboleth-sp-v3
-  become: true

tasks/update-hydra-sp.yml

@@ -8,5 +8,15 @@
     state: present
   become: true
 
-- name: Configure hydra SP
+- name: Configure cadoles-pod-shibboleth-sp-v3
-  ansible.builtin.include_tasks: configure-hydra-sp.yml
+  template:
+    src: "{{ item.src }}"
+    dest: "{{ item.dest }}"
+    mode: "{{ item.mode }}"
+  with_items:
+    - src: cadoles-pod-shibboleth-sp-v3.conf.j2
+      dest: /etc/cadoles-pod-shibboleth-sp-v3.conf
+      mode: u=rw,g=r
+  notify:
+    - Restart cadoles-pod-shibboleth-sp-v3
+  become: true

templates/cadoles-pod-hydra-dispatcher-v1.conf.j2

@@ -4,7 +4,7 @@ PODMAN_ARGS="\
     --replace \
     --network=slirp4netns:allow_host_loopback=true \
     --tz=local \
-    -p 127.0.0.1:3000:8080 \
+    -p 127.0.0.1:3000:80 \
     -e APP_ENV=prod \
     -e 'APP_DEBUG={{ hydra_dispatcher_debug }}' \
     -e HYDRA_ADMIN_BASE_URL=http://10.0.2.2:4445 \
@@ -21,8 +21,7 @@ PODMAN_ARGS="\
     -e 'SENTRY_DSN={{ hydra_dispatcher_sentry_dsn }}' \
     -e 'SENTRY_ENVIRONMENT={{ hydra_dispatcher_sentry_environment }}' \
     -e 'DISABLE_APP_AUTO_SELECT={{ hydra_dispatcher_disable_app_auto_select }}' \
-    -e 'PHP_FPM_MEMORY_LIMIT=128m' \
+    -v /etc/hydra-dispatcher/conf.d:/var/www/config/hydra \
-    -v /etc/hydra-dispatcher/conf.d:/app/config/hydra \
     {% for item in hydra_dispatcher_mounts %}
     -v {{ item.host }}:{{ item.container }} \
     {% endfor %}

templates/cadoles-pod-hydra-oidc-v1.conf.j2

@@ -4,7 +4,7 @@ PODMAN_ARGS="\
     --replace \
     --network=slirp4netns:allow_host_loopback=true \
     --tz=local \
-    -p 127.0.0.1:3004:{{ hydra_oidc_internal_port | default(8080) }} \
+    -p 127.0.0.1:3004:80 \
     -e APP_ENV=prod \
     -e 'APP_DEBUG={{ hydra_oidc_debug }}' \
     -e 'HYDRA_ADMIN_BASE_URL=http://10.0.2.2:3000' \

templates/cadoles-pod-hydra-v1.conf.j2

@@ -25,6 +25,5 @@ PODMAN_ARGS="\
     {% endif %}
     -e 'HYDRA_SECRETS_SYSTEM={{ lookup('ansible.builtin.password', '/dev/null length=32 seed=hydra_secrets_seed') }}' \
     -e 'HYDRA_OIDC_SUBJECT_IDENTIFIERS_PAIRWISE_SALT={{ lookup('ansible.builtin.password', '/dev/null length=32 seed=hydra_secrets_seed') }}' \
-    -e 'HYDRA_BCRYPT_COST={{ hydra_bcrypt_cost }}' \
     -v /etc/hydra/clients.d:/etc/hydra/clients.d \
 "