Same name for 2-way SSL for the two configuration options.

trifork · Apr 28, 2011 · 25a4c5d · 25a4c5d
1 parent dc51b06
commit 25a4c5d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/...eplication/src/main/java/com/trifork/stamdata/replication/ApplicationContextListener.java b/...eplication/src/main/java/com/trifork/stamdata/replication/ApplicationContextListener.java
@@ -99,9 +99,9 @@ protected Injector getInjector() {
 			// CONFIGURE AUTHENTICATION & AUTHORIZATION
 
 			String security = config.getString("security");
-			if (security.equals("dgws")) {
+			if ("dgws".equals(security)) {
 				modules.add(new DGWSModule());
-			} else if (security.equals("ssl")) {
+			} else if ("twowayssl".equals(security)) {
 				modules.add(new SslModule(config.getBoolean("security.ssl.test")));
 			} else {
 				modules.add(new UnrestrictedSecurityModule());
@@ -128,7 +128,7 @@ protected Injector getInjector() {
 			else if ("twowayssl".equals(guiSecurity)) {
 				modules.add(new TwoWaySslSecurityModule());
 			}
-			else if ("none".equals(guiSecurity)) {
+			else {
 				// TODO
 			}
 

diff --git a/subprojects/replication/src/main/resources/config.properties b/subprojects/replication/src/main/resources/config.properties
@@ -12,5 +12,11 @@ rid2cpr.callTimeout=60000
 whitelist=25520041,21311292,22664104,11231122
 whitelistNames=Trifork,NSI,LMS,KOMBIT
 
+# none | twowayssl | dgws
 security=none
+# Only relevant if security=twowayssl
+# true | false
+#security.ssl.test=true
+
+# none | twowayssl | saml
 gui.security=saml