OpenConext · quartje · May 27, 2025 · May 27, 2025 · May 27, 2025 · May 27, 2025
diff --git a/roles/apachefpm/files/stepuplogging.conf b/roles/apachefpm/files/stepuplogging.conf
diff --git a/roles/apachefpm/handlers/main.yml b/roles/apachefpm/handlers/main.yml
diff --git a/roles/apachefpm/tasks/main.yml b/roles/apachefpm/tasks/main.yml
diff --git a/roles/apachefpm/templates/apachevhost.j2 b/roles/apachefpm/templates/apachevhost.j2
diff --git a/roles/apachefpm/templates/phpfpm.j2 b/roles/apachefpm/templates/phpfpm.j2
diff --git a/roles/haproxy/README.md b/roles/haproxy/README.md
@@ -16,7 +16,7 @@ haproxy_applications:
 
   - name: engine
     vhost_name: engine.{{ base_domain }}
-    port: "{{ loadbalancing.engine.port }}"
+    port: "443"
     ha_method: "GET"
     ha_url: "/health"
     servers: "{{ php_servers }}"
@@ -25,7 +25,7 @@ haproxy_applications:
     vhost_name: manage.{{ base_domain }}
     ha_method: "GET"
     ha_url: "/health"
-    port: "{{ loadbalancing.manage.port }}"
+    port: "443"
     servers: "{{ php_servers }}"
     stagingservers: "{{ staging_servers }}"
     sslbackend: yes

diff --git a/roles/metadata/templates/metadata.conf.j2 b/roles/metadata/templates/metadata.conf.j2
diff --git a/roles/mujina-idp/templates/mujina_idp.conf.j2 b/roles/mujina-idp/templates/mujina_idp.conf.j2
diff --git a/roles/oidcng/templates/oidcng.conf.j2 b/roles/oidcng/templates/oidcng.conf.j2
diff --git a/roles/static/templates/static.conf.j2 b/roles/static/templates/static.conf.j2
diff --git a/roles/stepupazuremfa/vars/main.yml b/roles/stepupazuremfa/vars/main.yml
@@ -1,6 +1,5 @@
 appname: "azuremfa"
 vhost_name: "{{ appname }}.{{ base_domain }}"
-loadbalancingport: "411"
 appversion: "{{ azuremfa_version }}"
 appversion_sha: "{{ azuremfa_version_sha }}"
 stepup_gh_appname: "Azure-MFA"

diff --git a/roles/stepupgateway/vars/main.yml b/roles/stepupgateway/vars/main.yml
@@ -1,6 +1,5 @@
 appname: "gateway"
 vhost_name: "sa-gw.{{ base_domain }}"
-loadbalancingport: "414"
 appversion: "{{ gateway_version }}"
 appversion_sha: "{{ gateway_version_sha }}"
 stepup_gh_appname: "Gateway"

diff --git a/roles/stepupmiddleware/tasks/main.yml b/roles/stepupmiddleware/tasks/main.yml
@@ -6,12 +6,3 @@
     or 'push_mw_whitelist' in ansible_run_tags
     or 'stepupmiddleware' in ansible_run_tags
     or 'stepup' in ansible_run_tags)"
-
-- name: Include vm tasks when running on a vm
-  import_tasks: vm.yml
-  when: "'docker' not in group_names
-    and ('push_mw_config' in ansible_run_tags
-    or 'push_mw_institution' in ansible_run_tags
-    or 'push_mw_whitelist' in ansible_run_tags
-    or 'stepupmiddleware' in ansible_run_tags
-    or 'stepup' in ansible_run_tags)"