Improve settings

docker-compose.yaml

@@ -19,9 +19,9 @@ services:
         volumes:
             - "${WORKING_DIR}/deploy_docker:/root/deploy"
         expose:
-            - "8090"
+            - "8080"
         ports:
-            - "8080:8080"
+            - "8090:8080"
         networks:
             - netMySQL
         depends_on:

src/main/scala/de/tobias/playpad/server/PlayPadServer.scala

@@ -79,13 +79,15 @@ object PlayPadServer extends App {
 
 
 		// Setup Http Server
-		port(8090)
+		port(settings.server_port)
 		threadPool(8, 2, 60 * 60 * 1000)
 
 		val externalPath = Paths.get(settings.download_folder).toAbsolutePath.toString
 		externalStaticFileLocation(externalPath)
 
-		//secure("deploy/keystore.jks", settings.keystorePassword, null, null)
+		if (settings.server_secure) {
+			secure(settings.server_keystore_path, settings.server_keystore_password, null, null)
+		}
 
 		// PlayWall Cloud
 		webSocket("/project", new ProjectSyncHandler(sessionDao, databaseConnection))

src/main/scala/de/tobias/playpad/server/settings/Settings.scala

@@ -5,6 +5,11 @@ package de.tobias.playpad.server.settings
  */
 class Settings {
 
+	var server_port: Int = 8080
+	var server_secure: Boolean = false
+	var server_keystore_path: String = ""
+	var server_keystore_password: String = ""
+
 	var db_host: String = "localhost"
 	var db_port: Int = 3306
 	var db_username: String = "root"
@@ -12,6 +17,4 @@ class Settings {
 	var db_database: String = "PlayWall"
 
 	var download_folder: String = "./"
-
-	var keystorePassword = "password"
 }