Merge branch 'master' of github.com:cactorium/kelvinly-server

This commit is contained in:
Kelvin Ly 2019-01-26 23:29:11 -05:00
commit a81c384892
1 changed files with 12 additions and 6 deletions

18
main.go
View File

@ -29,6 +29,8 @@ var (
reload reloading the configuration file`) reload reloading the configuration file`)
) )
const DEBUG = false
const DOMAIN_NAME = "threefortiethofonehamster.com" const DOMAIN_NAME = "threefortiethofonehamster.com"
const HTML_HEADER = `<!doctype html5> const HTML_HEADER = `<!doctype html5>
@ -124,10 +126,13 @@ func main() {
PidFilePerm: 0644, PidFilePerm: 0644,
LogFileName: "/tmp/kelvinly-server-log", LogFileName: "/tmp/kelvinly-server-log",
LogFilePerm: 0640, LogFilePerm: 0640,
//WorkDir: "/home/kelvin/kelvinly-server/", WorkDir: "/home/kelvin/kelvinly-server/",
WorkDir: ".", Umask: 027,
Umask: 027,
} }
if DEBUG {
cntxt.WorkDir = "."
}
// TODO: figure out the daemonizing stuff // TODO: figure out the daemonizing stuff
if len(daemon.ActiveFlags()) > 0 { if len(daemon.ActiveFlags()) > 0 {
@ -263,11 +268,12 @@ func startServer(srv *http.Server) {
srv.Addr = ":8443" srv.Addr = ":8443"
srv.Handler = serveMux srv.Handler = serveMux
log.Print("starting server") log.Print("starting server")
/* if !DEBUG {
log.Fatal(srv.ListenAndServeTLS("/etc/letsencrypt/live/"+DOMAIN_NAME+"/fullchain.pem", log.Fatal(srv.ListenAndServeTLS("/etc/letsencrypt/live/"+DOMAIN_NAME+"/fullchain.pem",
"/etc/letsencrypt/live/"+DOMAIN_NAME+"/privkey.pem")) "/etc/letsencrypt/live/"+DOMAIN_NAME+"/privkey.pem"))
*/ } else {
log.Fatal(srv.ListenAndServe()) log.Fatal(srv.ListenAndServe())
}
close(serverShutdown) close(serverShutdown)
} }