Merge branch 'version-status-php' into ocs-version-update

Author: micbar

extensions/ocdav/pkg/command/server.go

@@ -52,6 +52,11 @@ func Server(cfg *config.Config) *cli.Command {
 					ocdav.Prefix(cfg.HTTP.Prefix),
 					ocdav.GatewaySvc(cfg.Reva.Address),
 					ocdav.JWTSecret(cfg.TokenManager.JWTSecret),
+					ocdav.ProductName(cfg.Status.ProductName),
+					ocdav.Product(cfg.Status.Product),
+					ocdav.Version(cfg.Status.Version),
+					ocdav.VersionString(cfg.Status.VersionString),
+					ocdav.Edition(cfg.Status.Edition),
 					// ocdav.FavoriteManager() // FIXME needs a proper persistence implementation
 					// ocdav.LockSystem(), // will default to the CS3 lock system
 					// ocdav.TLSConfig() // tls config for the http server

extensions/ocdav/pkg/config/config.go

@@ -33,6 +33,7 @@ type Config struct {
 	Middleware Middleware `yaml:"middleware"`
 
 	Context context.Context `yaml:"-"`
+	Status  Status          `yaml:"-"`
 }
 type Tracing struct {
 	Enabled   bool   `yaml:"enabled" env:"OCIS_TRACING_ENABLED;OCDAV_TRACING_ENABLED" desc:"Activates tracing."`
@@ -75,3 +76,12 @@ type Middleware struct {
 type Auth struct {
 	CredentialsByUserAgent map[string]string `yaml:"credentials_by_user_agent"`
 }
+
+// Status holds the configurable values for the status.php
+type Status struct {
+	Version       string
+	VersionString string
+	Product       string
+	ProductName   string
+	Edition       string
+}

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

@@ -2,6 +2,7 @@ package defaults
 
 import (
 	"github.com/owncloud/ocis/v2/extensions/ocdav/pkg/config"
+	"github.com/owncloud/ocis/v2/ocis-pkg/version"
 )
 
 func FullDefaultConfig() *config.Config {
@@ -42,6 +43,13 @@ func DefaultConfig() *config.Config {
 				CredentialsByUserAgent: map[string]string{},
 			},
 		},
+		Status: config.Status{
+			Version:       version.String + ".0",
+			VersionString: version.String,
+			Product:       "ocis",
+			ProductName:   "Infinite Scale",
+			Edition:       "Community",
+		},
 	}
 }
 

go.mod

@@ -274,3 +274,5 @@ require (
 
 // we need to use a fork to make the windows build pass
 replace github.com/pkg/xattr => github.com/micbar/xattr v0.4.6-0.20220215112335-88e74d648fb7
+
+replace github.com/cs3org/reva/v2 => ../reva

ocis-pkg/version/version.go

@@ -6,10 +6,10 @@ import (
 
 var (
 	// String gets defined by the build system.
-	String = "0.0.0"
+	String = "2.0.0-dev"
 
 	// Date indicates the build date.
-	Date = "00000000"
+	Date = time.Now().Format("20060102")
 )
 
 // Compiled returns the compile time of this service.