Merge pull request #3690 from wkloucek/fix-deployment-examples

fix deployment examples

extensions/app-provider/pkg/config/config.go

@@ -18,8 +18,8 @@ type Config struct {
 	TokenManager *TokenManager `yaml:"token_manager"`
 	Reva         *Reva         `yaml:"reva"`
 
-	ExternalAddr string  `yaml:"external_addr"`
-	Driver       string  `yaml:"driver"`
+	ExternalAddr string  `yaml:"external_addr" env:"APP_PROVIDER_EXTERNAL_ADDR"`
+	Driver       string  `yaml:"driver" env:"APP_PROVIDER_DRIVER"`
 	Drivers      Drivers `yaml:"drivers"`
 
 	Supervised bool            `yaml:"-"`

extensions/frontend/pkg/config/config.go

@@ -34,6 +34,7 @@ type Config struct {
 
 	PublicURL string `yaml:"public_url" env:"OCIS_URL;FRONTEND_PUBLIC_URL"`
 
+	AppHandler  AppHandler  `yaml:"app_handler"`
 	Archiver    Archiver    `yaml:"archiver"`
 	DataGateway DataGateway `yaml:"data_gateway"`
 	OCS         OCS         `yaml:"ocs"`
@@ -86,6 +87,11 @@ type Auth struct {
 	CredentialsByUserAgent map[string]string `yaml:"credentials_by_user_agent"`
 }
 
+type AppHandler struct {
+	Prefix   string `yaml:"-"`
+	Insecure bool   `yaml:"insecure" env:"OCIS_INSECURE;FRONTEND_APP_HANDLER_INSECURE"`
+}
+
 type Archiver struct {
 	MaxNumFiles int64  `yaml:"max_num_files" env:"FRONTEND_ARCHIVER_MAX_NUM_FILES"`
 	MaxSize     int64  `yaml:"max_size" env:"FRONTEND_ARCHIVER_MAX_SIZE"`

extensions/frontend/pkg/config/defaults/defaultconfig.go

@@ -42,6 +42,9 @@ func DefaultConfig() *config.Config {
 			SupportedTypes:      []string{"sha1", "md5", "adler32"},
 			PreferredUploadType: "",
 		},
+		AppHandler: config.AppHandler{
+			Prefix: "app",
+		},
 		Archiver: config.Archiver{
 			Insecure:    false,
 			Prefix:      "archiver",

extensions/frontend/pkg/revaconfig/config.go

@@ -77,6 +77,17 @@ func FrontendConfigFromStruct(cfg *config.Config) map[string]interface{} {
 			},
 			// TODO build services dynamically
 			"services": map[string]interface{}{
+				// this reva service called "appprovider" comes from
+				// `internal/http/services/appprovider` and is a translation
+				// layer from the grpc app registry to http, used by eg. ownCloud Web
+				// It should not be confused with `internal/grpc/services/appprovider`
+				// which is currently only has only the driver for the CS3org WOPI server
+				"appprovider": map[string]interface{}{
+					"prefix":                 cfg.AppHandler.Prefix,
+					"transfer_shared_secret": cfg.TransferSecret,
+					"timeout":                86400,
+					"insecure":               cfg.AppHandler.Insecure,
+				},
 				"archiver": map[string]interface{}{
 					"prefix":        cfg.Archiver.Prefix,
 					"timeout":       86400,