wbrawner/twigs
1
0
Fork 0
Code Issues Pull requests 2 Projects Releases Packages 1 Wiki Activity Actions

Remove config file, just load data from env

Browse source
This commit is contained in:
William Brawner 2024-03-04 15:10:30 -07:00
parent 4ae19c09c2
commit 6b9c34d5d1
2 changed files with 17 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
app/src/main/kotlin/com/wbrawner/twigs/server/Application.kt
View file

@ -26,20 +26,22 @@ import org.slf4j.LoggerFactory
import java.util.concurrent.TimeUnit
fun main() {
embeddedServer(CIO, port = System.getenv("PORT")?.toIntOrNull() ?: 8080) {
module()
}.start(wait = true)
embeddedServer(
CIO,
port = System.getenv("PORT")?.toIntOrNull() ?: 8080,
module = Application::module
).start(wait = true)
}
private const val DATABASE_VERSION = 3
fun Application.module() {
val dbType = environment.config.propertyOrNull("twigs.database.type")?.getString() ?: "sqlite"
val dbHost = environment.config.propertyOrNull("twigs.database.host")?.getString() ?: "localhost"
val dbPort = environment.config.propertyOrNull("twigs.database.port")?.getString() ?: "5432"
val dbName = environment.config.propertyOrNull("twigs.database.name")?.getString() ?: "twigs"
val dbUser = environment.config.propertyOrNull("twigs.database.user")?.getString() ?: "twigs"
val dbPass = environment.config.propertyOrNull("twigs.database.password")?.getString() ?: "twigs"
val dbType = System.getenv("TWIGS_DB_TYPE") ?: "sqlite"
val dbHost = System.getenv("TWIGS_DB_HOST") ?: "localhost"
val dbPort = System.getenv("TWIGS_DB_PORT") ?: "5432"
val dbName = System.getenv("TWIGS_DB_NAME") ?: "twigs"
val dbUser = System.getenv("TWIGS_DB_USER") ?: "twigs"
val dbPass = System.getenv("TWIGS_DB_PASS") ?: "twigs"
val jdbcUrl = when (dbType) {
"postgresql" -> {
"jdbc:$dbType://$dbHost:$dbPort/$dbName?stringtype=unspecified"
@ -71,9 +73,7 @@ fun Application.module() {
if (metadata.salt.isBlank()) {
metadataRepository.save(
metadata.copy(
salt = environment.config
.propertyOrNull("twigs.password.salt")
?.getString()
salt = System.getenv("TWIGS_PW_SALT")
?: randomString(16)
)
)
@ -83,11 +83,11 @@ fun Application.module() {
}
moduleWithDependencies(
emailService = SmtpEmailService(
from = environment.config.propertyOrNull("twigs.smtp.from")?.getString(),
host = environment.config.propertyOrNull("twigs.smtp.host")?.getString(),
port = environment.config.propertyOrNull("twigs.smtp.port")?.getString()?.toIntOrNull(),
username = environment.config.propertyOrNull("twigs.smtp.user")?.getString(),
password = environment.config.propertyOrNull("twigs.smtp.pass")?.getString(),
from = System.getenv("TWIGS_SMTP_FROM"),
host = System.getenv("TWIGS_SMTP_HOST"),
port = System.getenv("TWIGS_SMTP_PORT")?.toIntOrNull(),
username = System.getenv("TWIGS_SMTP_USER"),
password = System.getenv("TWIGS_SMTP_PASS"),
),
metadataRepository = JdbcMetadataRepository(it),
budgetRepository = JdbcBudgetRepository(it),

27
app/src/main/resources/application.conf
View file

@ -1,27 +0,0 @@
ktor {
deployment {
port = 8080
port = ${?PORT}
}
}
twigs {
database {
type = ${?TWIGS_DB_TYPE}
host = ${?TWIGS_DB_HOST}
port = ${?TWIGS_DB_PORT}
name = ${?TWIGS_DB_NAME}
user = ${?TWIGS_DB_USER}
password = ${?TWIGS_DB_PASS}
}
password {
salt = ${?TWIGS_PW_SALT}
}
smtp {
from = ${?TWIGS_SMTP_FROM}
host = ${?TWIGS_SMTP_HOST}
port = ${?TWIGS_SMTP_PORT}
user = ${?TWIGS_SMTP_USER}
pass = ${?TWIGS_SMTP_PASS}
}
}