konnectd working

This commit is contained in:
A.Unger
2020-09-18 14:57:59 +02:00
parent 33ff094524
commit b23ea8f21b
14 changed files with 714 additions and 135 deletions
+1 -1
View File
@@ -6,7 +6,7 @@ import (
"path"
"github.com/owncloud/ocis/konnectd/pkg/config"
"github.com/owncloud/ocis-pkg/v2/log"
"github.com/owncloud/ocis/ocis-pkg/log"
)
//go:generate go run github.com/UnnoTed/fileb0x embed.yml
+1 -1
View File
@@ -2,7 +2,7 @@ package assets
import (
"github.com/owncloud/ocis/konnectd/pkg/config"
"github.com/owncloud/ocis-pkg/v2/log"
"github.com/owncloud/ocis/ocis-pkg/log"
)
// Option defines a single option function.
+1 -1
View File
@@ -8,7 +8,7 @@ import (
"github.com/owncloud/ocis/konnectd/pkg/config"
"github.com/owncloud/ocis/konnectd/pkg/flagset"
"github.com/owncloud/ocis/konnectd/pkg/version"
"github.com/owncloud/ocis-pkg/v2/log"
"github.com/owncloud/ocis/ocis-pkg/log"
"github.com/spf13/viper"
)
+1 -1
View File
@@ -12,7 +12,7 @@ import (
"os"
"time"
"github.com/owncloud/ocis-pkg/v2/log"
"github.com/owncloud/ocis/ocis-pkg/log"
)
func publicKey(priv interface{}) interface{} {
+1 -1
View File
@@ -4,7 +4,7 @@ import (
"context"
"github.com/owncloud/ocis/konnectd/pkg/config"
"github.com/owncloud/ocis-pkg/v2/log"
"github.com/owncloud/ocis/ocis-pkg/log"
)
// Option defines a single option function.
+1 -1
View File
@@ -6,7 +6,7 @@ import (
"github.com/owncloud/ocis/konnectd/pkg/config"
"github.com/owncloud/ocis/konnectd/pkg/version"
"github.com/owncloud/ocis-pkg/v2/service/debug"
"github.com/owncloud/ocis/ocis-pkg/service/debug"
)
// Server initializes the debug service and server.
+1 -1
View File
@@ -6,7 +6,7 @@ import (
"github.com/micro/cli/v2"
"github.com/owncloud/ocis/konnectd/pkg/config"
"github.com/owncloud/ocis/konnectd/pkg/metrics"
"github.com/owncloud/ocis-pkg/v2/log"
"github.com/owncloud/ocis/ocis-pkg/log"
)
// Option defines a single option function.
+2 -2
View File
@@ -7,8 +7,8 @@ import (
"github.com/owncloud/ocis/konnectd/pkg/crypto"
svc "github.com/owncloud/ocis/konnectd/pkg/service/v0"
"github.com/owncloud/ocis/konnectd/pkg/version"
"github.com/owncloud/ocis-pkg/v2/middleware"
"github.com/owncloud/ocis-pkg/v2/service/http"
"github.com/owncloud/ocis/ocis-pkg/middleware"
"github.com/owncloud/ocis/ocis-pkg/service/http"
)
// Server initializes the http service and server.
+1 -1
View File
@@ -3,7 +3,7 @@ package svc
import (
"net/http"
"github.com/owncloud/ocis-pkg/v2/log"
"github.com/owncloud/ocis/ocis-pkg/log"
)
// NewLogging returns a service that logs messages.
+1 -1
View File
@@ -4,7 +4,7 @@ import (
"net/http"
"github.com/owncloud/ocis/konnectd/pkg/config"
"github.com/owncloud/ocis-pkg/v2/log"
"github.com/owncloud/ocis/ocis-pkg/log"
)
// Option defines a single option function.
+1 -1
View File
@@ -14,7 +14,7 @@ import (
"github.com/owncloud/ocis/konnectd/pkg/config"
logw "github.com/owncloud/ocis/konnectd/pkg/log"
"github.com/owncloud/ocis/konnectd/pkg/middleware"
"github.com/owncloud/ocis-pkg/v2/log"
"github.com/owncloud/ocis/ocis-pkg/log"
"stash.kopano.io/kc/konnect/bootstrap"
kcconfig "stash.kopano.io/kc/konnect/config"
"stash.kopano.io/kc/konnect/server"
+1 -1
View File
@@ -3,7 +3,7 @@ package svc
import (
"net/http"
"github.com/owncloud/ocis-pkg/v2/middleware"
"github.com/owncloud/ocis/ocis-pkg/middleware"
)
// NewTracing returns a service that instruments traces.