Actually use port settings in config

kesslern · Aug 8, 2019 · 7d2e3ad · 7d2e3ad
1 parent 6d69652
commit 7d2e3ad
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -11,6 +11,7 @@ A pastebin designed for personal self-hosting.
 ## Running
 
 Download a release from [here](https://github.com/kesslern/gluecan/releases). After extraction, configure `gluecan-config.yml` and run `bin/gluecan`.
+this.port = yamlMapping.string("port")!!.toInt()
 
 ## Configuration
 
@@ -23,6 +24,7 @@ GlueCan's pastes are always publicly viewable, but creation and deletion of past
 | Configuration Key | Description                                                                                                                  |
 | ----------------- | ---------------------------------------------------------------------------------------------------------------------------- |
 | port              | The port to listen on.                                                                                                       |
+| sslPort           | The port to listen on for SSL, if used.                                                                                      |
 | public            | If true, the admin interface and ability to create/delete pastes is password protected. Pastes are always publicly viewable. |
 | admin_pass        | The password if running in private mode. Unused in public mode.                                                              |
 | database          | Database path/filename to use.                                                                                               |

diff --git a/gluecan-backend/gluecan-config.yml b/gluecan-backend/gluecan-config.yml
@@ -1,4 +1,5 @@
 port: 8080
+sslPort: 8443
 
 # No password required to add/delete if public
 public: false

diff --git a/gluecan-backend/src/main/kotlin/config.kt b/gluecan-backend/src/main/kotlin/config.kt
@@ -11,6 +11,7 @@ object Config {
     val keystorePath: String?
     val keystorePassword: String?
     val port: Int
+    val sslPort: Int
 
 
     init {
@@ -22,6 +23,7 @@ object Config {
         this.adminPass = yamlMapping.string("adminPass")
         this.database = "jdbc:sqlite:${yamlMapping.string("database")}"
         this.port = yamlMapping.string("port")!!.toInt()
+        this.sslPort = yamlMapping.string("sslPort")!!.toInt()
         this.public = yamlMapping.string("public")!!.toBoolean()
 
         val keystore = yamlMapping.yamlMapping("keystore")

diff --git a/gluecan-backend/src/main/kotlin/server-config.kt b/gluecan-backend/src/main/kotlin/server-config.kt
@@ -23,12 +23,12 @@ fun JavalinConfig.gluecanConfig() {
         val sslConnector = if (Config.keystorePath != null) {
             log.info("Enabling SSL")
             val sslConnector = ServerConnector(server, getSslContextFactory())
-            sslConnector.setPort(8443)
+            sslConnector.port = Config.sslPort
             sslConnector
         } else null
 
         val connector = ServerConnector(server)
-        connector.port = 8080
+        connector.port = Config.port
 
         if (sslConnector != null) {
             server.connectors = arrayOf(sslConnector, connector)