sevenhill/QSfera
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rebrand pkg

Browse Source
This commit is contained in:
André Duffeck
2025-01-20 09:34:32 +01:00
parent c99cf22a10
commit 1fff27f281
15 changed files with 40 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
opencloud/pkg/command/backup.go
+4 -4
View File
@@ -4,7 +4,7 @@ import (
"errors"
"fmt"
ocisbs "github.com/cs3org/reva/v2/pkg/storage/fs/ocis/blobstore"
ocbs "github.com/cs3org/reva/v2/pkg/storage/fs/ocis/blobstore"
s3bs "github.com/cs3org/reva/v2/pkg/storage/fs/s3ng/blobstore"
"github.com/opencloud-eu/opencloud/opencloud/pkg/backup"
"github.com/opencloud-eu/opencloud/opencloud/pkg/register"
@@ -18,7 +18,7 @@ import (
func BackupCommand(cfg *config.Config) *cli.Command {
return &cli.Command{
Name: "backup",
Usage: "ocis backup functionality",
Usage: "OpenCloud backup functionality",
Subcommands: []*cli.Command{
ConsistencyCommand(cfg),
},
@@ -41,7 +41,7 @@ func ConsistencyCommand(cfg *config.Config) *cli.Command {
&cli.StringFlag{
Name: "basepath",
Aliases: []string{"p"},
Usage: "the basepath of the decomposedfs (e.g. /var/tmp/ocis/storage/users)",
Usage: "the basepath of the decomposedfs (e.g. /var/tmp/opencloud/storage/users)",
Required: true,
},
&cli.StringFlag{
@@ -77,7 +77,7 @@ func ConsistencyCommand(cfg *config.Config) *cli.Command {
s3bs.Options{},
)
case "ocis":
bs, err = ocisbs.New(basePath)
bs, err = ocbs.New(basePath)
case "none":
bs = nil
default:
opencloud/pkg/command/benchmark.go
+2 -2
View File
@@ -91,7 +91,7 @@ func BenchmarkClientCommand(cfg *config.Config) *cli.Command {
// other flags
&cli.StringFlag{
Name: "bearer-token-command",
Usage: "Command to execute for a bearer token, e.g. 'oidc-token OCIS'. When set, disables basic auth.",
Usage: "Command to execute for a bearer token, e.g. 'oidc-token opencloud'. When set, disables basic auth.",
},
&cli.IntFlag{
Name: "every",
@@ -299,7 +299,7 @@ func BenchmarkSyscallsCommand(cfg *config.Config) *cli.Command {
path := c.String("path")
if path == "" {
f, err := os.CreateTemp("", "ocis-bench-temp-")
f, err := os.CreateTemp("", "opencloud-bench-temp-")
if err != nil {
log.Fatal(err)
}
opencloud/pkg/command/decomposedfs.go
+2 -2
View File
@@ -64,7 +64,7 @@ func checkCmd(cfg *config.Config) *cli.Command {
},
&cli.BoolFlag{
Name: "repair",
Usage: "Try to repair nodes with incorrect treesize metadata. IMPORTANT: Only use this while ownCloud Infinite Scale is not running.",
Usage: "Try to repair nodes with incorrect treesize metadata. IMPORTANT: Only use this while OpenCloud is not running.",
},
&cli.BoolFlag{
Name: "force",
@@ -80,7 +80,7 @@ func check(c *cli.Context) error {
repairFlag := c.Bool("repair")
if repairFlag && !c.Bool("force") {
answer := strings.ToLower(stringPrompt("IMPORTANT: Only use '--repair' when ownCloud Infinite Scale is not running. Do you want to continue? [yes | no = default]"))
answer := strings.ToLower(stringPrompt("IMPORTANT: Only use '--repair' when OpenCloud is not running. Do you want to continue? [yes | no = default]"))
if answer != "yes" && answer != "y" {
return nil
}
opencloud/pkg/command/init.go
+6 -6
View File
@@ -7,7 +7,7 @@ import (
"os"
"strings"
ocisinit "github.com/opencloud-eu/opencloud/opencloud/pkg/init"
ocinit "github.com/opencloud-eu/opencloud/opencloud/pkg/init"
"github.com/opencloud-eu/opencloud/opencloud/pkg/register"
"github.com/opencloud-eu/opencloud/pkg/config"
"github.com/opencloud-eu/opencloud/pkg/config/defaults"
@@ -18,13 +18,13 @@ import (
func InitCommand(cfg *config.Config) *cli.Command {
return &cli.Command{
Name: "init",
Usage: "initialise an ocis config",
Usage: "initialise an OpenCloud config",
Flags: []cli.Flag{
&cli.StringFlag{
Name: "insecure",
EnvVars: []string{"OC_INSECURE"},
Value: "ask",
Usage: "Allow insecure oCIS config",
Usage: "Allow insecure OpenCloud config",
},
&cli.BoolFlag{
Name: "diff",
@@ -42,7 +42,7 @@ func InitCommand(cfg *config.Config) *cli.Command {
&cli.StringFlag{
Name: "config-path",
Value: defaults.BaseConfigPath(),
Usage: "Config path for the ocis runtime",
Usage: "Config path for the OpenCloud runtime",
EnvVars: []string{"OC_CONFIG_DIR", "OC_BASE_DATA_PATH"},
},
&cli.StringFlag{
@@ -56,14 +56,14 @@ func InitCommand(cfg *config.Config) *cli.Command {
insecureFlag := c.String("insecure")
insecure := false
if insecureFlag == "ask" {
answer := strings.ToLower(stringPrompt("Do you want to configure Infinite Scale with certificate checking disabled?\n This is not recommended for public instances! [yes | no = default]"))
answer := strings.ToLower(stringPrompt("Do you want to configure OpenCloud with certificate checking disabled?\n This is not recommended for public instances! [yes | no = default]"))
if answer == "yes" || answer == "y" {
insecure = true
}
} else if insecureFlag == strings.ToLower("true") || insecureFlag == strings.ToLower("yes") || insecureFlag == strings.ToLower("y") {
insecure = true
}
err := ocisinit.CreateConfig(insecure, c.Bool("force-overwrite"), c.Bool("diff"), c.String("config-path"), c.String("admin-password"))
err := ocinit.CreateConfig(insecure, c.Bool("force-overwrite"), c.Bool("diff"), c.String("config-path"), c.String("admin-password"))
if err != nil {
log.Fatalf("Could not create config: %s", err)
}
opencloud/pkg/command/list.go
+1 -1
View File
@@ -15,7 +15,7 @@ import (
func ListCommand(cfg *config.Config) *cli.Command {
return &cli.Command{
Name: "list",
Usage: "list oCIS services running in the runtime (supervised mode)",
Usage: "list OpenCloud services running in the runtime (supervised mode)",
Category: "runtime",
Flags: []cli.Flag{
&cli.StringFlag{
opencloud/pkg/command/revisions.go
+4 -4
View File
@@ -6,7 +6,7 @@ import (
"path/filepath"
provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1"
ocisbs "github.com/cs3org/reva/v2/pkg/storage/fs/ocis/blobstore"
ocbs "github.com/cs3org/reva/v2/pkg/storage/fs/ocis/blobstore"
"github.com/cs3org/reva/v2/pkg/storage/fs/posix/lookup"
s3bs "github.com/cs3org/reva/v2/pkg/storage/fs/s3ng/blobstore"
"github.com/cs3org/reva/v2/pkg/storagespace"
@@ -27,7 +27,7 @@ var (
func RevisionsCommand(cfg *config.Config) *cli.Command {
return &cli.Command{
Name: "revisions",
Usage: "ocis revisions functionality",
Usage: "OpenCloud revisions functionality",
Subcommands: []*cli.Command{
PurgeRevisionsCommand(cfg),
},
@@ -50,7 +50,7 @@ func PurgeRevisionsCommand(cfg *config.Config) *cli.Command {
&cli.StringFlag{
Name: "basepath",
Aliases: []string{"p"},
Usage: "the basepath of the decomposedfs (e.g. /var/tmp/ocis/storage/metadata)",
Usage: "the basepath of the decomposedfs (e.g. /var/tmp/opencloud/storage/metadata)",
Required: true,
},
&cli.StringFlag{
@@ -103,7 +103,7 @@ func PurgeRevisionsCommand(cfg *config.Config) *cli.Command {
s3bs.Options{},
)
case "ocis":
bs, err = ocisbs.New(basePath)
bs, err = ocbs.New(basePath)
case "none":
bs = nil
default:
opencloud/pkg/command/root.go
+1 -1
View File
@@ -12,7 +12,7 @@ import (
"github.com/urfave/cli/v2"
)
// Execute is the entry point for the ocis command.
// Execute is the entry point for the opencloud command.
func Execute() error {
cfg := config.DefaultConfig()
opencloud/pkg/command/trash.go
+2 -2
View File
@@ -15,7 +15,7 @@ import (
func TrashCommand(cfg *config.Config) *cli.Command {
return &cli.Command{
Name: "trash",
Usage: "ocis trash functionality",
Usage: "OpenCloud trash functionality",
Subcommands: []*cli.Command{
TrashPurgeEmptyDirsCommand(cfg),
},
@@ -37,7 +37,7 @@ func TrashPurgeEmptyDirsCommand(cfg *config.Config) *cli.Command {
&cli.StringFlag{
Name: "basepath",
Aliases: []string{"p"},
Usage: "the basepath of the decomposedfs (e.g. /var/tmp/ocis/storage/users)",
Usage: "the basepath of the decomposedfs (e.g. /var/tmp/opencloud/storage/users)",
Required: true,
},
&cli.BoolFlag{