From 6dd8d48f3522744423004fd797a5cb5fa60fc573 Mon Sep 17 00:00:00 2001
From: bytedream <bytedream@protonmail.com>
Date: Mon, 31 Jan 2022 11:55:19 +0100
Subject: [PATCH] Separated address and port config

---
 .env             | 3 ++-
 config/config.go | 5 ++++-
 main.go          | 6 ++++--
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/.env b/.env
index 9e65f4a..b050bf0 100644
--- a/.env
+++ b/.env
@@ -1,6 +1,7 @@
 ARTICLE_ROOT=./articles/
 
-SERVER_ADDRESS=localhost:8080
+SERVER_ADDRESS=localhost
+SERVER_PORT=8080
 
 PREFIX=
 
diff --git a/config/config.go b/config/config.go
index 6eeed93..46b3631 100644
--- a/config/config.go
+++ b/config/config.go
@@ -1,6 +1,7 @@
 package config
 
 import (
+	"fmt"
 	"github.com/joho/godotenv"
 	"os"
 	"path"
@@ -16,6 +17,7 @@ var (
 	ArticleRoot string
 
 	ServerAddress string
+	ServerPort    string
 
 	Prefix string
 
@@ -29,6 +31,7 @@ func init() {
 	ArticleRoot = os.Getenv("ARTICLE_ROOT")
 
 	ServerAddress = os.Getenv("SERVER_ADDRESS")
+	ServerPort = os.Getenv("SERVER_PORT")
 
 	Prefix = path.Join(os.Getenv("PREFIX"))
 
@@ -36,6 +39,6 @@ func init() {
 	FrontendDir = os.Getenv("FRONTEND_DIR")
 
 	PageBase = pageBase{
-		BasePath: "http://" + path.Join(ServerAddress, Prefix) + "/",
+		BasePath: "http://" + path.Join(fmt.Sprintf("%s:%s", ServerAddress, ServerPort), Prefix) + "/",
 	}
 }
diff --git a/main.go b/main.go
index 0e7fae1..be04ee5 100644
--- a/main.go
+++ b/main.go
@@ -33,7 +33,7 @@ func main() {
 	}
 	database.SetGlobDB(db)
 
-	if err := http.ListenAndServe(fmt.Sprintf("%s", config.ServerAddress), r); err != nil {
+	if err := http.ListenAndServe(fmt.Sprintf(":%s", config.ServerPort), r); err != nil {
 		panic(err)
 	}
 }
@@ -62,7 +62,9 @@ func setupFrontend(r *mux.Router) {
 
 	r.PathPrefix("/").HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		if path.Join(config.Prefix)+"/" == r.URL.Path {
-			landingpage.Execute(w, config.PageBase)
+			if err := landingpage.Execute(w, config.PageBase); err != nil {
+				fmt.Println(err)
+			}
 		} else {
 			server.Error404(w, r)
 		}