diff options
| author |  Vitaly Takmazov | 2018-02-22 14:26:09 +0300 |
|---|---|---|
| committer | Vitaly Takmazov | 2018-02-22 14:26:09 +0300 |
| commit | 445efce2abf8310acc5b7bb652feef7968c86a2a (patch) | |
| tree | 04ef8712a014a2f75b8bd96cf68c8bd3a5af6dc6 /juick-server/src/main/java/com/juick | |
| parent | b74b92f124f6d31a7ee48deaf48f0604886836f8 (diff) | |
default database is h2
Diffstat (limited to 'juick-server/src/main/java/com/juick')
| -rw-r--r-- | juick-server/src/main/java/com/juick/server/XMPPServer.java | 8 | ||||
| -rw-r--r-- | juick-server/src/main/java/com/juick/server/configuration/ApiSecurityConfig.java | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/juick-server/src/main/java/com/juick/server/XMPPServer.java b/juick-server/src/main/java/com/juick/server/XMPPServer.java index 358860f7..9f0a8183 100644 --- a/juick-server/src/main/java/com/juick/server/XMPPServer.java +++ b/juick-server/src/main/java/com/juick/server/XMPPServer.java @@ -67,13 +67,13 @@ public class XMPPServer implements ConnectionListener, AutoCloseable { private Jid jid; @Value("${s2s_port:5269}") private int s2sPort; - @Value("${keystore}") + @Value("${keystore:juick.p12}") public String keystore; - @Value("${keystore_password}") + @Value("${keystore_password:secret}") public String keystorePassword; - @Value("${broken_ssl_hosts}") + @Value("${broken_ssl_hosts:}") public String[] brokenSSLhosts; - @Value("${banned_hosts}") + @Value("${banned_hosts:}") public String[] bannedHosts; private final List<ConnectionIn> inConnections = new CopyOnWriteArrayList<>(); diff --git a/juick-server/src/main/java/com/juick/server/configuration/ApiSecurityConfig.java b/juick-server/src/main/java/com/juick/server/configuration/ApiSecurityConfig.java index 58fd4231..f074f9c7 100644 --- a/juick-server/src/main/java/com/juick/server/configuration/ApiSecurityConfig.java +++ b/juick-server/src/main/java/com/juick/server/configuration/ApiSecurityConfig.java @@ -49,7 +49,7 @@ import java.util.concurrent.TimeUnit; @Configuration @EnableWebSecurity public class ApiSecurityConfig extends WebSecurityConfigurerAdapter { - @Value("${auth_remember_me_key}") + @Value("${auth_remember_me_key:secret}") private String rememberMeKey; @Inject private UserService userService; |