From 4267103bd5d3f6e1b6c4e9b79aabee9e40e6e250 Mon Sep 17 00:00:00 2001 From: "A.Unger" Date: Mon, 24 Feb 2020 13:20:39 +0100 Subject: [PATCH] moved init code away from main routine --- pkg/server/http/server.go | 28 ++-------------------------- 1 file changed, 2 insertions(+), 26 deletions(-) diff --git a/pkg/server/http/server.go b/pkg/server/http/server.go index 65c04af76b..39205ad535 100644 --- a/pkg/server/http/server.go +++ b/pkg/server/http/server.go @@ -2,9 +2,6 @@ package http import ( "crypto/tls" - "log" - "net/http/httputil" - "net/url" "os" occrypto "github.com/owncloud/ocis-konnectd/pkg/crypto" @@ -29,37 +26,16 @@ func Server(opts ...Option) (svc.Service, error) { config := &tls.Config{Certificates: []tls.Certificate{cer}} service := svc.NewService( + svc.Name("web.proxy"), + svc.TLSConfig(config), svc.Logger(options.Logger), svc.Namespace(options.Namespace), - svc.Name("web.proxy"), svc.Version(version.String), svc.Address(options.Config.HTTP.Addr), svc.Context(options.Context), - svc.TLSConfig(config), svc.Flags(options.Flags...), ) - phoenixURL, err := url.Parse("http://localhost:9100") - if err != nil { - log.Fatal(err) - } - konnectdURL, err := url.Parse("http://localhost:9130") - if err != nil { - log.Fatal(err) - } - revaURL, err := url.Parse("http://localhost:9140") - if err != nil { - log.Fatal(err) - } - - service.Handle("/", httputil.NewSingleHostReverseProxy(phoenixURL)) - service.Handle("/.well-known/openid-configuration", httputil.NewSingleHostReverseProxy(konnectdURL)) - service.Handle("/konnect/v1/jwks.json/", httputil.NewSingleHostReverseProxy(konnectdURL)) - service.Handle("/signin/", httputil.NewSingleHostReverseProxy(konnectdURL)) - service.Handle("/konnect/", httputil.NewSingleHostReverseProxy(konnectdURL)) - service.Handle("/ocs/v1.php/", httputil.NewSingleHostReverseProxy(revaURL)) - service.Handle("/remote.php/webdav/", httputil.NewSingleHostReverseProxy(revaURL)) - service.Init() return service, nil