Fixed typo in HTTPS port assignment.

Added comment to structr.conf template file on how to create self-signed SSL certificate. Fixes issue #43
structr · Mar 20, 2014 · d7c29f5 · d7c29f5
1 parent af9a090
commit d7c29f5
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/structr-rest/src/main/java/org/structr/rest/service/HttpService.java b/structr-rest/src/main/java/org/structr/rest/service/HttpService.java
@@ -217,7 +217,7 @@ public void initialize(final StructrConf additionalConfig) {
 		boolean enableHttps = parseBoolean(finalConfig.getProperty(APPLICATION_HTTPS_ENABLED), false);
 		boolean enableGzipCompression = true; //
 		boolean logRequests = false; //
-		int httpsPort = parseInt(finalConfig.getProperty(APPLICATION_HTTP_PORT), 8083);
+		int httpsPort = parseInt(finalConfig.getProperty(APPLICATION_HTTPS_PORT), 8083);
 
 		// get current base path
 		basePath = System.getProperty("home", basePath);
@@ -390,7 +390,6 @@ public void initialize(final StructrConf additionalConfig) {
 			logger.log(Level.WARNING, "Unable to configure HTTP server port, please make sure that {0} and {1} are set correctly in structr.conf.", new Object[]{APPLICATION_HOST, APPLICATION_HTTP_PORT});
 		}
 
-		// HTTPs can be disabled
 		if (enableHttps) {
 
 			if (httpsPort > -1 && keyStorePath != null && !keyStorePath.isEmpty() && keyStorePassword != null) {

diff --git a/structr-ui/structr.conf_templ b/structr-ui/structr.conf_templ
@@ -21,19 +21,23 @@ application.title = Structr UI
 application.host = 0.0.0.0
 #
 # Listener port for HTTP access REST and web service
-application.http.port  = 8082
+application.http.port = 8082
 #
 # URL base path of REST server
 application.rest.path = /structr/rest
 #
 # Listener port of built-in FTP server
-application.ftp.port   = 8022
+application.ftp.port = 8022
 #
 # HTTPS settings
-application.https.port = 8083
-application.https.enabled = false
-application.keystore.path =
-application.keystore.password =
+# run this command to create a selfsigned certificate:
+# 'keytool -genkey -keyalg RSA -alias selfsigned -keystore [KEYSTORE_FILE] -storepass [KEYSTORE_PASSWORD] -validity 360 -keysize 2048'
+#
+# application.https.enabled = true
+# application.https.port = 8083
+# application.keystore.path = [KEYSTORE_FILE]
+# application.keystore.password = [KEYSTORE_PASSWORD]
+#
 #
 # Paths
 base.path = .