Compare commits

..
5 Commits
Author SHA1 Message Date
2martens e50e769e22 Added production domain as allowed origin
continuous-integration/drone/push Build is failing
2023-08-16 12:52:17 +02:00
2martens b7c85e2368 Reversed code format 2023-08-16 01:00:48 +02:00
2martens a60289fc49 Added production server to OpenAPI
continuous-integration/drone/push Build is failing
2023-08-16 01:00:16 +02:00
2martens 9c4feee043 Use 127.0.0.1 as address
continuous-integration/drone/push Build is failing
2023-08-16 00:25:15 +02:00
2martens 1a50b40eaf Load log4j2.xml from resources
continuous-integration/drone/push Build is failing
2023-08-15 23:50:42 +02:00
4 changed files with 9 additions and 5 deletions
+1 -3
View File
@@ -31,10 +31,8 @@ jib {
}
}
container {
extraClasspath = listOf("/configmap")
mainClass = "de.twomartens.wahlrecht.MainApplicationKt"
jvmFlags = listOf("-XX:+UseContainerSupport",
"-XX:MaxRAMPercentage=75.0",
"-Dlog4j.configurationFile=/configmap/log4j2.xml")
"-XX:MaxRAMPercentage=75.0")
}
}
@@ -6,6 +6,7 @@ import io.swagger.v3.oas.annotations.security.OAuthFlows
import io.swagger.v3.oas.annotations.security.SecurityScheme
import io.swagger.v3.oas.models.OpenAPI
import io.swagger.v3.oas.models.info.Info
import io.swagger.v3.oas.models.servers.Server
import org.springframework.beans.factory.annotation.Value
import org.springframework.context.annotation.Bean
import org.springframework.context.annotation.Configuration
@@ -35,5 +36,7 @@ open class OpenApiConfiguration {
.version(apiVersion)
.description(apiDescription)
)
.addServersItem(Server().url("http://localhost:12000"))
.addServersItem(Server().url("https://api.2martens.de"))
}
}
@@ -20,6 +20,9 @@ open class WebConfiguration(private val headerInterceptorRest: HeaderInterceptor
HttpMethod.PUT.name(), HttpMethod.OPTIONS.name()
)
registration.allowCredentials(true)
registration.allowedOrigins("http://localhost:4200")
registration.allowedOrigins(
"http://localhost:4200",
"https://wahlrecht.2martens.de"
)
}
}
@@ -24,7 +24,7 @@ management:
spring:
config:
import: "optional:configserver:http://localhost:8888/config"
import: "optional:configserver:http://127.0.0.1:8888/config"
main:
banner-mode: off
profiles: