Allow roll-back for hydra-dispatcher

Used by the cache when available

defaults/main.yml

@@ -82,6 +82,7 @@ hydra_dispatcher_available_locales:
   - en
 hydra_dispatcher_sentry_dsn:
 hydra_dispatcher_sentry_environment:
+hydra_dispatcher_redis_dsn:
 hydra_dispatcher_mounts: []
 hydra_dispatcher_disable_app_auto_select: true
 hydra_dispatcher_webhook: false

files/www.conf.gotmpl

@@ -0,0 +1,24 @@
+{%- raw -%}
+[www]
+user = www-data
+group = www-data
+
+listen = {{ env.Getenv "PHP_FPM_LISTEN" "/tmp/php-fpm.sock" }}
+listen.owner = www-data
+listen.group = www-data
+listen.mode = 0660
+
+pm = dynamic
+pm.max_children = {{ env.Getenv "PHP_FPM_MAX_CHILDREN" "5" }}
+pm.start_servers = {{ env.Getenv "PHP_FPM_START_SERVERS" "2" }}
+pm.min_spare_servers = {{ env.Getenv "PHP_FPM_MIN_SPARE_SERVERS" "1" }}
+pm.max_spare_servers = {{ env.Getenv "PHP_FPM_MAX_SPARE_SERVERS" "3" }}
+
+pm.status_path = /healthcheck
+pm.status_listen = 127.0.0.1:8091
+
+clear_env = no
+
+php_admin_value[display_errors] = {{ env.Getenv "PHP_FPM_DISPLAY_ERRORS" "off" }}
+php_admin_value[memory_limit] = {{ env.Getenv "PHP_FPM_MEMORY_LIMIT" "32m" }}
+{% endraw %}

tasks/hydra-saml.yml

@@ -21,14 +21,23 @@
     - src:  hydra-remote-user.yml.j2
       dest: /etc/hydra-remote-user/conf.d/remote-user.yml
       mode: u=rw,g=r,o=r
+    - src:  mpm_prefork.conf.j2
+      dest: /etc/hydra-remote-user/mpm_prefork.conf
+      mode: u=rw,g=r,o=r
   notify:
     - Restart cadoles-pod-hydra-remote-user-v1
   become: true
 
 - name: Configure cadoles-pod-hydra-remote-user-v1 (2)
   ansible.builtin.copy:
-    src:  hydra-remote-user-v1-apache.conf
-    dest: /etc/hydra-remote-user/apache.conf
+    src: "{{ item.src }}"
+    dest: "{{ item.dest }}"
+  with_items:
+    - src:  hydra-remote-user-v1-apache.conf
+      dest: /etc/hydra-remote-user/apache.conf
+    - src:  mpm_prefork.conf
+      dest: /etc/hydra-remote-user/mpm_prefork.conf
+      mode: u=rw,g=r,o=r
   notify:
     - Restart cadoles-pod-hydra-remote-user-v1
   become: true

tasks/main.yml

@@ -81,6 +81,9 @@
     - src:  hydra-dispatcher-apps.yml.j2
       dest: /etc/hydra-dispatcher/conf.d/apps.yml
       mode: u=rw,g=r,o=r
+    - src:  www.conf.gotmpl
+      dest: /etc/hydra-dispatcher/www.conf.gotmpl
+      mode: u=rw,g=r,o=r
   notify:
     - Restart cadoles-pod-hydra-dispatcher-v1
   become: true

tasks/update-hydra-dispatcher.yml

@@ -5,6 +5,7 @@
     name:
       - cadoles-pod-hydra-dispatcher-v1={{ cadoles_pod_hydra_dispatcher_v1_package_version }}
     update_cache: yes
+    allow_downgrade: true
     state: present
   become: true
 

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

@@ -20,8 +20,15 @@ PODMAN_ARGS="\
     -e 'TRUSTED_PROXIES=127.0.0.1,10.0.2.0/24' \
     -e 'SENTRY_DSN={{ hydra_dispatcher_sentry_dsn }}' \
     -e 'SENTRY_ENVIRONMENT={{ hydra_dispatcher_sentry_environment }}' \
+    -e 'REDIS_DSN={{ hydra_dispatcher_redis_dsn }}' \
+    --mount type=tmpfs,tmpfs-size=512M,destination=/app/var/cache \
     -e 'DISABLE_APP_AUTO_SELECT={{ hydra_dispatcher_disable_app_auto_select }}' \
     -e 'PHP_FPM_MEMORY_LIMIT=128m' \
+    -e 'PHP_FPM_MAX_CHILDREN=128' \
+    -e 'PHP_FPM_START_SERVERS=42' \
+    -e 'PHP_FPM_MIN_SPARE_SERVERS=24' \
+    -e 'PHP_FPM_MAX_SPARE_SERVERS=64' \
+    -v /etc/hydra-dispatcher/www.conf.gotmpl:/etc/php81/php-fpm.d/www.conf.gotmpl \
     -v /etc/hydra-dispatcher/conf.d:/app/config/hydra \
     {% for item in hydra_dispatcher_mounts %}
     -v {{ item.host }}:{{ item.container }} \

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

@@ -6,6 +6,7 @@ PODMAN_ARGS="\
     --tz=local \
     -v /etc/hydra-remote-user/conf.d:/var/www/config/remote_user \
     -v /etc/hydra-remote-user/apache.conf:/etc/apache2/sites-available/000-default.conf \
+    -v /etc/hydra-remote-user/mpm_prefork.conf:/etc/apache2/mods-available/mpm_prefork.conf \
     -v /etc/hosts:/etc/hosts:ro \
     -e APP_ENV=prod \
     -e 'APP_DEBUG={{ hydra_saml_debug }}' \
@@ -14,4 +15,4 @@ PODMAN_ARGS="\
     -e HYDRA_ADMIN_BASE_URL=http://10.0.2.2:3000 \
     -e 'TRUSTED_PROXIES=127.0.0.1,10.0.2.0/24' \
     -e 'LOGOUT_REDIRECT_URL_PATTERN={{ haproxy_public_base_url }}{{ haproxy_hydra_saml_base_path }}/Shibboleth.sso/Logout?return=%s' \
-"
+"

templates/mpm_prefork.conf.j2

@@ -0,0 +1,10 @@
+# prefork MPM
+
+<IfModule mpm_prefork_module>
+	StartServers       10
+	MinSpareServers	   10
+	MaxSpareServers	   20
+	MaxRequestWorkers 128
+	MaxConnectionsPerChild  2000
+</IfModule>
+