sidski/helse-sprik
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

🔧 Riktig brukernavn og passord ved auth

Browse source 
Co-authored-by: Markus A. R. Johansen <markus.aleksander.rakil.johansen@nav.no>
Co-authored-by: Amalie Erdal Mansåker <amalie.erdal.mansaker@nav.no>
Co-authored-by: Helene Arnesen <helene.arnesen@nav.no>
Co-authored-by: Øydis Kind Refsum <oydis.kind.refsum@nav.no>
Co-authored-by: Christian Bülow Skovborg <christian.bulow.skovborg@nav.no>
This commit is contained in:
Sindre Kjelsrud 2023-07-13 09:56:16 +02:00
parent 73573a0659
commit 2197a1b5b0
2 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
backend/src/main/kotlin/no/nav/helse/sprik/db/Database.kt
View file

@ -28,8 +28,8 @@ class Database(dbconfig: HikariConfig = dbconfig()) {
private fun dbconfig() = HikariConfig().apply { private fun dbconfig() = HikariConfig().apply {
jdbcUrl = DB_URL jdbcUrl = DB_URL
username = username username = Environment.Database.username
password = password password = Environment.Database.password
maximumPoolSize = 1 maximumPoolSize = 1
connectionTimeout = 30.seconds.toJavaDuration().toMillis() connectionTimeout = 30.seconds.toJavaDuration().toMillis()
initializationFailTimeout = 1.minutes.toJavaDuration().toMillis() initializationFailTimeout = 1.minutes.toJavaDuration().toMillis()
@ -37,8 +37,8 @@ private fun dbconfig() = HikariConfig().apply {
private fun migrateconfig() = HikariConfig().apply { private fun migrateconfig() = HikariConfig().apply {
jdbcUrl = DB_URL jdbcUrl = DB_URL
username = username username = Environment.Database.username
password = password password = Environment.Database.password
maximumPoolSize = 2 maximumPoolSize = 2
connectionTimeout = 30.seconds.toJavaDuration().toMillis() connectionTimeout = 30.seconds.toJavaDuration().toMillis()
initializationFailTimeout = 1.minutes.toJavaDuration().toMillis() initializationFailTimeout = 1.minutes.toJavaDuration().toMillis()

2
nais.yml
View file

@ -18,8 +18,6 @@ spec:
databases: databases:
- name: helse-sprik - name: helse-sprik
envVarPrefix: DATABASE envVarPrefix: DATABASE
users:
- name: helse-sprik
resources: resources:
requests: requests:
cpu: 100m cpu: 100m