From 0a3f4c7af4513198ec2fb02fbe6f8fc0890a76c3 Mon Sep 17 00:00:00 2001
From: tobias <thinkdifferent055@gmail.com>
Date: Tue, 30 Jul 2019 20:46:29 +0200
Subject: [PATCH] Improve settings
---
docker-compose.yaml | 4 ++--
.../scala/de/tobias/playpad/server/PlayPadServer.scala | 6 ++++--
.../scala/de/tobias/playpad/server/settings/Settings.scala | 7 +++++--
3 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 9448130..b1b8c8c 100644
--- a/docker-compose.yaml
+++ b/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:
diff --git a/src/main/scala/de/tobias/playpad/server/PlayPadServer.scala b/src/main/scala/de/tobias/playpad/server/PlayPadServer.scala
index 5436a00..e805cff 100644
--- a/src/main/scala/de/tobias/playpad/server/PlayPadServer.scala
+++ b/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))
diff --git a/src/main/scala/de/tobias/playpad/server/settings/Settings.scala b/src/main/scala/de/tobias/playpad/server/settings/Settings.scala
index 44dce21..c5b07f4 100644
--- a/src/main/scala/de/tobias/playpad/server/settings/Settings.scala
+++ b/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"
}
--
GitLab