🔧 Riktig brukernavn og passord ved auth
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:
parent
73573a0659
commit
2197a1b5b0
2 changed files with 4 additions and 6 deletions
|
@ -28,8 +28,8 @@ class Database(dbconfig: HikariConfig = dbconfig()) {
|
|||
|
||||
private fun dbconfig() = HikariConfig().apply {
|
||||
jdbcUrl = DB_URL
|
||||
username = username
|
||||
password = password
|
||||
username = Environment.Database.username
|
||||
password = Environment.Database.password
|
||||
maximumPoolSize = 1
|
||||
connectionTimeout = 30.seconds.toJavaDuration().toMillis()
|
||||
initializationFailTimeout = 1.minutes.toJavaDuration().toMillis()
|
||||
|
@ -37,8 +37,8 @@ private fun dbconfig() = HikariConfig().apply {
|
|||
|
||||
private fun migrateconfig() = HikariConfig().apply {
|
||||
jdbcUrl = DB_URL
|
||||
username = username
|
||||
password = password
|
||||
username = Environment.Database.username
|
||||
password = Environment.Database.password
|
||||
maximumPoolSize = 2
|
||||
connectionTimeout = 30.seconds.toJavaDuration().toMillis()
|
||||
initializationFailTimeout = 1.minutes.toJavaDuration().toMillis()
|
||||
|
|
2
nais.yml
2
nais.yml
|
@ -18,8 +18,6 @@ spec:
|
|||
databases:
|
||||
- name: helse-sprik
|
||||
envVarPrefix: DATABASE
|
||||
users:
|
||||
- name: helse-sprik
|
||||
resources:
|
||||
requests:
|
||||
cpu: 100m
|
||||
|
|
Reference in a new issue