Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2026-01-08 16:42:10 +01:00
Code Issues Packages Projects Releases Activity

Fix enabling forward headers and log appender with environment variable

Browse Source 
Co-authored-by: René Pfeuffer<rene.pfeuffer@cloudogu.com>
This commit is contained in:
Rene Pfeuffer
2024-02-02 15:10:32 +01:00
parent d8081ed074
commit 28c02dfcd6
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gradle/changelog/forward_header.yaml Normal file
View File

@@ -0,0 +1,2 @@
- type: fixed
description: Enabling forward headers and log appender with environment variable

6
scm-server/src/main/java/sonia/scm/server/ServerConfigYaml.java
View File

@@ -25,9 +25,9 @@
package sonia.scm.server;
public class ServerConfigYaml {
private static final String SCM_SERVER_PREFIX = "SCM_";
// ### Server
private String addressBinding = "0.0.0.0";
private int port = 8080;
@@ -161,7 +161,7 @@ public class ServerConfigYaml {
static boolean getEnvWithDefault(String envKey, boolean configValue) {
String value = getEnv(envKey);
return value != null ? Boolean.getBoolean(value) : configValue;
return value != null ? Boolean.parseBoolean(value) : configValue;
}
private static String getEnv(String envKey) {

2
scm-webapp/src/main/java/sonia/scm/config/ServerConfigYaml.java
View File

@@ -123,7 +123,7 @@ public class ServerConfigYaml {
static boolean getEnvWithDefault(String envKey, boolean configValue) {
String value = getEnv(envKey);
return value != null ? Boolean.getBoolean(value) : configValue;
return value != null ? Boolean.parseBoolean(value) : configValue;
}
private static String getEnv(String envKey) {