fixed frfr
This commit is contained in:
13
main.go
13
main.go
@@ -19,11 +19,9 @@ import (
|
||||
"nxcaldav/internal/extra"
|
||||
)
|
||||
|
||||
|
||||
|
||||
func main() {
|
||||
// -- GET CONFIG
|
||||
path := "config.yaml";
|
||||
path := "config.yaml"
|
||||
if len(os.Args) == 3 {
|
||||
if os.Args[1] == "-c" {
|
||||
path = os.Args[2]
|
||||
@@ -41,18 +39,18 @@ func main() {
|
||||
log.Fatalf("failed to initialize database backend: %v", err)
|
||||
}
|
||||
|
||||
|
||||
// -- GET CONTEXT AND DB
|
||||
caldavHandler := &caldav.Handler{Backend: be}
|
||||
carddavHandler := &carddav.Handler{Backend: be}
|
||||
publicURL, _ := url.Parse(cfg.Server.PublicURL)
|
||||
|
||||
|
||||
// -- DISCOVERIES
|
||||
http.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
|
||||
|
||||
scheme := r.URL.Scheme
|
||||
if scheme == "" { scheme = "http" }
|
||||
if scheme == "" {
|
||||
scheme = "http"
|
||||
}
|
||||
|
||||
// set host (because reverse proxies exist)
|
||||
if publicURL != nil && publicURL.Host != "" {
|
||||
@@ -60,7 +58,7 @@ func main() {
|
||||
r.URL.Host = publicURL.Host
|
||||
|
||||
// prioritize X-Forwarded-Proto, then PublicURL (e.g. Cloudfalre proxy)
|
||||
scheme := publicURL.Scheme
|
||||
scheme = publicURL.Scheme
|
||||
if proto := r.Header.Get("X-Forwarded-Proto"); proto != "" {
|
||||
scheme = proto
|
||||
}
|
||||
@@ -162,6 +160,7 @@ func main() {
|
||||
http.NotFound(w, r)
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
fmt.Printf("Starting CalDAV/CardDAV server on %s...\n", cfg.Server.BindAddress)
|
||||
server := &http.Server{
|
||||
|
||||
Reference in New Issue
Block a user