e2m/dispatch
4
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add option to choose which address to listen on, closes #31

Browse Source
This commit is contained in:
Ken-Håvard Lieng 2018-08-22 00:31:29 +02:00
parent 004e7890e5
commit c8c09bce8c
3 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
assets/bindata.go
View File

File diff suppressed because one or more lines are too long

2
config.default.toml
View File

@ -1,3 +1,5 @@
# IP address to listen on, leave empty to listen on anything
address = ""
port = 80 port = 80
# Hex encode the users IP and use it as the ident # Hex encode the users IP and use it as the ident
hexIP = false hexIP = false

9
server/server.go
View File

@ -106,6 +106,7 @@ func (d *Dispatch) loadUser(user *storage.User) {
} }
func (d *Dispatch) startHTTP() { func (d *Dispatch) startHTTP() {
addr := viper.GetString("address")
port := viper.GetString("port") port := viper.GetString("port")
if viper.GetBool("https.enabled") { if viper.GetBool("https.enabled") {
@ -114,11 +115,11 @@ func (d *Dispatch) startHTTP() {
if redirect { if redirect {
log.Println("[HTTP] Listening on port", port, "(HTTPS Redirect)") log.Println("[HTTP] Listening on port", port, "(HTTPS Redirect)")
go http.ListenAndServe(":"+port, createHTTPSRedirect(portHTTPS)) go http.ListenAndServe(net.JoinHostPort(addr, port), createHTTPSRedirect(portHTTPS))
} }
server := &http.Server{ server := &http.Server{
Addr: ":" + portHTTPS, Addr: net.JoinHostPort(addr, portHTTPS),
Handler: http.HandlerFunc(d.serve), Handler: http.HandlerFunc(d.serve),
} }
@ -132,7 +133,7 @@ func (d *Dispatch) startHTTP() {
if viper.GetBool("letsencrypt.proxy") && lePort != "" && (port != "80" || !redirect) { if viper.GetBool("letsencrypt.proxy") && lePort != "" && (port != "80" || !redirect) {
log.Println("[HTTP] Listening on port 80 (Let's Encrypt Proxy))") log.Println("[HTTP] Listening on port 80 (Let's Encrypt Proxy))")
go http.ListenAndServe(":80", http.HandlerFunc(letsEncryptProxy)) go http.ListenAndServe(net.JoinHostPort(addr, "80"), http.HandlerFunc(letsEncryptProxy))
} }
le, err := letsencrypt.Run(dir, domain, email, ":"+lePort) le, err := letsencrypt.Run(dir, domain, email, ":"+lePort)
@ -156,7 +157,7 @@ func (d *Dispatch) startHTTP() {
port = "1337" port = "1337"
} }
log.Println("[HTTP] Listening on port", port) log.Println("[HTTP] Listening on port", port)
log.Fatal(http.ListenAndServe(":"+port, http.HandlerFunc(d.serve))) log.Fatal(http.ListenAndServe(net.JoinHostPort(addr, port), http.HandlerFunc(d.serve)))
} }
} }