From 445efce2abf8310acc5b7bb652feef7968c86a2a Mon Sep 17 00:00:00 2001 From: Vitaly Takmazov Date: Thu, 22 Feb 2018 14:26:09 +0300 Subject: default database is h2 --- juick-server/src/main/java/com/juick/server/XMPPServer.java | 8 ++++---- .../java/com/juick/server/configuration/ApiSecurityConfig.java | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'juick-server/src/main/java/com/juick/server') 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 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; -- cgit v1.2.3