Merge branch 'master' into ocis-1018

ocis/pkg/config/config.go

@@ -53,6 +53,11 @@ type Tracing struct {
 	Service   string
 }
 
+// TokenManager is the config for using the reva token manager
+type TokenManager struct {
+	JWTSecret string
+}
+
 // Config combines all available configuration parts.
 type Config struct {
 	File     string
@@ -62,6 +67,7 @@ type Config struct {
 	HTTP     HTTP
 	GRPC     GRPC
 	Tracing  Tracing
+	TokenManager TokenManager
 
 	Accounts      *accounts.Config
 	Graph         *graph.Config