From e12df4df86ad52908e09c2ad551f6f73332562c2 Mon Sep 17 00:00:00 2001
From: haburger <haburger>
Date: Wed, 4 Sep 2024 11:08:15 +0000
Subject: [PATCH] new configuration version

---
 ...uaf-instance-ca92034f995b39fde562293c.yaml |  5 +++-
 ...uaf-database-9385d1b33aefe975fb1c5914.yaml | 26 +++++++++++++++++++
 .../opt/nevisfido/default/conf/nevisfido.yml  | 10 +++----
 3 files changed, 35 insertions(+), 6 deletions(-)
 create mode 100644 DEFAULT-ADN-AGOV-PROJECT/DEFAULT-ADN-AGOV-INV/fido-uaf/etc/nevis/k8s-nevisfido-uaf-database-9385d1b33aefe975fb1c5914.yaml

diff --git a/DEFAULT-ADN-AGOV-PROJECT/DEFAULT-ADN-AGOV-INV/fido-uaf/etc/nevis/k8s-fido-uaf-instance-ca92034f995b39fde562293c.yaml b/DEFAULT-ADN-AGOV-PROJECT/DEFAULT-ADN-AGOV-INV/fido-uaf/etc/nevis/k8s-fido-uaf-instance-ca92034f995b39fde562293c.yaml
index 5819839..a0ba6d1 100644
--- a/DEFAULT-ADN-AGOV-PROJECT/DEFAULT-ADN-AGOV-INV/fido-uaf/etc/nevis/k8s-fido-uaf-instance-ca92034f995b39fde562293c.yaml
+++ b/DEFAULT-ADN-AGOV-PROJECT/DEFAULT-ADN-AGOV-INV/fido-uaf/etc/nevis/k8s-fido-uaf-instance-ca92034f995b39fde562293c.yaml
@@ -46,9 +46,12 @@ spec:
   podDisruptionBudget:
     maxUnavailable: "50%"
   git:
-    tag: "r-f0c2fc352ad8e75f5eae1bab7fc80e6315293282"
+    tag: "r-ad8a6961a238d3829894bdb6f156305aae37be74"
     dir: "DEFAULT-ADN-AGOV-PROJECT/DEFAULT-ADN-AGOV-INV/fido-uaf"
     credentials: "git-credentials"
+  database:
+    name: "fido-uaf"
+    requiredVersion: "8.2405.0"
   keystores:
   - "fido-uaf-default-server-identity"
   - "fido-uaf-default-client-identity"
diff --git a/DEFAULT-ADN-AGOV-PROJECT/DEFAULT-ADN-AGOV-INV/fido-uaf/etc/nevis/k8s-nevisfido-uaf-database-9385d1b33aefe975fb1c5914.yaml b/DEFAULT-ADN-AGOV-PROJECT/DEFAULT-ADN-AGOV-INV/fido-uaf/etc/nevis/k8s-nevisfido-uaf-database-9385d1b33aefe975fb1c5914.yaml
new file mode 100644
index 0000000..a8e3cc0
--- /dev/null
+++ b/DEFAULT-ADN-AGOV-PROJECT/DEFAULT-ADN-AGOV-INV/fido-uaf/etc/nevis/k8s-nevisfido-uaf-database-9385d1b33aefe975fb1c5914.yaml
@@ -0,0 +1,26 @@
+apiVersion: "operator.nevis-security.ch/v1"
+kind: "NevisDatabase"
+metadata:
+  name: "fido-uaf"
+  namespace: "adn-agov-nevisidm-01-uat"
+  labels:
+    deploymentTarget: "fido-uaf"
+  annotations:
+    projectKey: "DEFAULT-ADN-AGOV-PROJECT"
+    patternId: "9385d1b33aefe975fb1c5914"
+spec:
+  type: "NevisFIDO"
+  databaseType: "MariaDB"
+  version: "8.2405.1"
+  url: "mariadb-session-store-service"
+  port: 3306
+  database: "nevisfido_uaf"
+  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/fido-uaf/var/opt/nevisfido/default/conf/nevisfido.yml b/DEFAULT-ADN-AGOV-PROJECT/DEFAULT-ADN-AGOV-INV/fido-uaf/var/opt/nevisfido/default/conf/nevisfido.yml
index 0a12a42..d6e93b3 100644
--- a/DEFAULT-ADN-AGOV-PROJECT/DEFAULT-ADN-AGOV-INV/fido-uaf/var/opt/nevisfido/default/conf/nevisfido.yml
+++ b/DEFAULT-ADN-AGOV-PROJECT/DEFAULT-ADN-AGOV-INV/fido-uaf/var/opt/nevisfido/default/conf/nevisfido.yml
@@ -31,11 +31,11 @@ credential-repository:
   user-attribute: extId
 
 session-repository:
-  type: in-memory
-  jdbc-url: 
-  max-connection-lifetime: 
-  user: 
-  password: 
+  type: sql
+  jdbc-url: jdbc:mariadb://mariadb-session-store-service:3306/nevisfido_uaf?sslMode=disable&autocommit=true
+  max-connection-lifetime: 10m
+  user: ${exec:/var/opt/nevisfido/default/conf/credentials/dbUser}
+  password: ${exec:/var/opt/nevisfido/default/conf/credentials/dbPassword}
   schema-user: 
   schema-user-password: 
   automatic-db-schema-setup: false