From c7cbe4fe4d6287fd1df4f8d4e529ed100359483c Mon Sep 17 00:00:00 2001 From: haburger Date: Mon, 25 Aug 2025 15:39:02 +0000 Subject: [PATCH] new configuration version --- ...ession-store-699f0a21dd0e852f28d27e9d.yaml | 26 +++++ ...visproxy-idp-0ceb05c56644a59d648c13b9.yaml | 5 +- .../WEB-INF/web.xml | 100 +++++++++++++----- 3 files changed, 105 insertions(+), 26 deletions(-) create mode 100644 DEFAULT-ADN-AGOV-PROJECT/DEFAULT-ADN-AGOV-INV/proxy-idp/etc/nevis/k8s-idp-nevisproxy-remote-hybrid-session-store-699f0a21dd0e852f28d27e9d.yaml diff --git a/DEFAULT-ADN-AGOV-PROJECT/DEFAULT-ADN-AGOV-INV/proxy-idp/etc/nevis/k8s-idp-nevisproxy-remote-hybrid-session-store-699f0a21dd0e852f28d27e9d.yaml b/DEFAULT-ADN-AGOV-PROJECT/DEFAULT-ADN-AGOV-INV/proxy-idp/etc/nevis/k8s-idp-nevisproxy-remote-hybrid-session-store-699f0a21dd0e852f28d27e9d.yaml new file mode 100644 index 0000000..6b49d08 --- /dev/null +++ b/DEFAULT-ADN-AGOV-PROJECT/DEFAULT-ADN-AGOV-INV/proxy-idp/etc/nevis/k8s-idp-nevisproxy-remote-hybrid-session-store-699f0a21dd0e852f28d27e9d.yaml @@ -0,0 +1,26 @@ +apiVersion: "operator.nevis-security.ch/v1" +kind: "NevisDatabase" +metadata: + name: "proxy-idp" + namespace: "adn-agov-nevisidm-01-uat" + labels: + deploymentTarget: "proxy-idp" + annotations: + projectKey: "DEFAULT-ADN-AGOV-PROJECT" + patternId: "699f0a21dd0e852f28d27e9d" +spec: + type: "NevisProxy" + databaseType: "MariaDB" + version: "8.2505.5" + url: "mariadb-session-store-service.adn-agov-nevisidm-ob-01-uat" + port: 3306 + database: "workproxy" + bootstrap: true + migrate: true + rootCredentials: + name: "root-mariadb-session-store" + namespace: "adn-agov-nevisidm-ob-01-uat" + podSecurity: + policy: "baseline" + automountServiceAccountToken: false + timeZone: "Europe/Zurich" diff --git a/DEFAULT-ADN-AGOV-PROJECT/DEFAULT-ADN-AGOV-INV/proxy-idp/etc/nevis/k8s-nevisproxy-idp-0ceb05c56644a59d648c13b9.yaml b/DEFAULT-ADN-AGOV-PROJECT/DEFAULT-ADN-AGOV-INV/proxy-idp/etc/nevis/k8s-nevisproxy-idp-0ceb05c56644a59d648c13b9.yaml index c4855ce..e262e18 100644 --- a/DEFAULT-ADN-AGOV-PROJECT/DEFAULT-ADN-AGOV-INV/proxy-idp/etc/nevis/k8s-nevisproxy-idp-0ceb05c56644a59d648c13b9.yaml +++ b/DEFAULT-ADN-AGOV-PROJECT/DEFAULT-ADN-AGOV-INV/proxy-idp/etc/nevis/k8s-nevisproxy-idp-0ceb05c56644a59d648c13b9.yaml @@ -47,9 +47,12 @@ spec: podDisruptionBudget: maxUnavailable: "50%" git: - tag: "r-5e17b7ae74eadb8800587a4f4db74406a7e21e95" + tag: "r-e89a903628d5717380e12490c3c41f93df97174b" dir: "DEFAULT-ADN-AGOV-PROJECT/DEFAULT-ADN-AGOV-INV/proxy-idp" credentials: "git-credentials" + database: + name: "proxy-idp" + requiredVersion: "8.2505.5" keystores: - "proxy-idp-notused-auth-realm-identity" - "proxy-idp-1f0702aaabef60a615abf41f" diff --git a/DEFAULT-ADN-AGOV-PROJECT/DEFAULT-ADN-AGOV-INV/proxy-idp/var/opt/nevisproxy/default/host-auth.agov-w.azure.adnovum.net/WEB-INF/web.xml b/DEFAULT-ADN-AGOV-PROJECT/DEFAULT-ADN-AGOV-INV/proxy-idp/var/opt/nevisproxy/default/host-auth.agov-w.azure.adnovum.net/WEB-INF/web.xml index 464dd4d..b18dbbb 100644 --- a/DEFAULT-ADN-AGOV-PROJECT/DEFAULT-ADN-AGOV-INV/proxy-idp/var/opt/nevisproxy/default/host-auth.agov-w.azure.adnovum.net/WEB-INF/web.xml +++ b/DEFAULT-ADN-AGOV-PROJECT/DEFAULT-ADN-AGOV-INV/proxy-idp/var/opt/nevisproxy/default/host-auth.agov-w.azure.adnovum.net/WEB-INF/web.xml @@ -1,6 +1,11 @@ + + + application-id + auth.agov-w.azure.adnovum.net + SectokenVerifierCert @@ -859,7 +864,7 @@ Servlet - LocalSessionStoreServlet + MySQLSessionStoreServlet @@ -904,7 +909,7 @@ Servlet - LocalSessionStoreServlet + MySQLSessionStoreServlet @@ -949,7 +954,7 @@ Servlet - LocalSessionStoreServlet + MySQLSessionStoreServlet @@ -994,7 +999,7 @@ Servlet - LocalSessionStoreServlet + MySQLSessionStoreServlet @@ -1636,27 +1641,6 @@ ch::nevis::isiweb4::servlet::defaults::DefaultServlet - - - LocalSessionStoreServlet - - ch::nevis::nevisproxy::servlet::cache::local::LocalSessionStoreServlet - - - MaxInactiveInterval - 600 - - - - MaxLifetime - 28800 - - - - MemorySize - 512000000 - - LoginRenderer_nevisLogrend @@ -1673,6 +1657,72 @@ remote:NevisLogrendConnector_nevisLogrend:/nevislogrend/index.vm?logrendresourcepath=/nevislogrend + + + MySQLSessionStoreServlet + + ch::nevis::nevisproxy::servlet::cache::mysql::MySQLSessionStoreServlet + + + AttributesTableName + attribute + + + + ConfigurationsTableName + conf + + + + ConnectString + //mariadb-session-store-service.adn-agov-nevisidm-ob-01-uat:3306/workproxy?connect_timeout=10&ping_timeout=2 + + + + DisableDatabaseSchemaCheck + false + + + + KeyToIdMapTableName + key_id_map + + + + MaxConn + 150 + + + + MaxLimitOnDelete + 100 + + + + MinConn + 10 + + + + Password + ${exec:/var/opt/nevisproxy/default/conf/credentials/dbPassword} + + + + SessionsTableName + session + + + + TimeOut + 600 + + + + UserName + ${exec:/var/opt/nevisproxy/default/conf/credentials/dbUser} + + NevisLogrendConnector_nevisLogrend