From c8c6913eb0a9001494486296f5cd45e0a5e89d2f Mon Sep 17 00:00:00 2001 From: Feng Ruohang Date: Thu, 6 Aug 2026 11:07:14 +0800 Subject: [PATCH 1/7] fix: disable SUBNET connectivity and licensing upsell paths Close every outbound path to MinIO SUBNET while keeping command names, flags and exit semantics stable for CLI compatibility: - subnetReqDo returns a stable error before any HTTP request is built, so no code path can reach subnet.min.io (defense in depth behind the per-command gates below) - license register and support upload always exit with the stable disabled error; license update keeps the local license-file path and rejects only the SUBNET renew form; license unregister and info now operate strictly on locally stored state - support diag/perf/profile/inspect always run in local (airgap) mode and save their reports to disk; SUBNET registration is never required - support callhome enable is refused; status and disable keep working - fresh configurations no longer seed the play alias pointing at MinIO's public demo cluster (existing user configs are untouched) - commercial subscription pitch removed from license info output - disabled-update wording aligned with the Silo brand Regression tests pin the disabled network layer, the play-free default config, and the upsell-free AGPL message. Co-Authored-By: Claude Fable 5 Signed-off-by: Feng Ruohang --- cmd/admin-subnet-health.go | 2 +- cmd/config-v10.go | 14 +++---- cmd/license-info.go | 11 ++++-- cmd/license-register.go | 28 +++++--------- cmd/license-unregister.go | 15 ++++++-- cmd/license-update.go | 13 +++++-- cmd/runtime-info.go | 2 +- cmd/subnet-disabled_test.go | 76 +++++++++++++++++++++++++++++++++++++ cmd/subnet-utils.go | 27 +++++++++++-- cmd/support-callhome.go | 26 ++++++++----- cmd/support-diag.go | 22 ++++++----- cmd/support-inspect.go | 18 +++++---- cmd/support-perf.go | 18 +++++---- cmd/support-profile.go | 22 ++++++----- cmd/support-register.go | 4 +- cmd/support-upload.go | 17 +++++---- cmd/support.go | 9 ++++- cmd/update-main.go | 4 +- 18 files changed, 225 insertions(+), 103 deletions(-) create mode 100644 cmd/subnet-disabled_test.go diff --git a/cmd/admin-subnet-health.go b/cmd/admin-subnet-health.go index 6013b972ce..45b51e253b 100644 --- a/cmd/admin-subnet-health.go +++ b/cmd/admin-subnet-health.go @@ -27,7 +27,7 @@ import ( var adminSubnetHealthCmd = cli.Command{ Name: "health", - Usage: "generate MinIO health report for SUBNET", + Usage: "generate a health report for SUBNET (deprecated)", OnUsageError: onUsageError, Action: mainSubnetHealth, Before: setGlobalsFromContext, diff --git a/cmd/config-v10.go b/cmd/config-v10.go index af741b8cae..d801cc7bb8 100644 --- a/cmd/config-v10.go +++ b/cmd/config-v10.go @@ -72,7 +72,7 @@ func (c *configV10) setAlias(alias string, cfg aliasConfigV10) { // load default values for missing entries. func (c *configV10) loadDefaults() { - // MinIO server running locally. + // Silo/MinIO server running locally. c.setAlias("local", aliasConfigV10{ URL: "http://localhost:9000", AccessKey: "", @@ -99,14 +99,10 @@ func (c *configV10) loadDefaults() { Path: "dns", }) - // MinIO anonymous server for demo. - c.setAlias("play", aliasConfigV10{ - URL: "https://play.min.io", - AccessKey: "Q3AM3UQ867SPQQA43P2F", - SecretKey: "zuf+tfteSlswRu7BJ86wekitnifILbZam1KYY3TG", - API: "S3v4", - Path: "auto", - }) + // The upstream MinIO client also seeded a "play" alias pointing at + // MinIO's public demo cluster (play.min.io). The Silo fork does not + // create aliases for third-party services in new configurations; + // existing user configurations are never modified. } // loadConfigV10 - loads a new config. diff --git a/cmd/license-info.go b/cmd/license-info.go index 9d9e145e9f..f0f60f96ee 100644 --- a/cmd/license-info.go +++ b/cmd/license-info.go @@ -49,8 +49,8 @@ FLAGS: {{end}} EXAMPLES: - 1. Display license configuration for cluster with alias 'play' - {{.Prompt}} {{.HelpName}} play + 1. Display license configuration for cluster with alias 'mysilo' + {{.Prompt}} {{.HelpName}} mysilo `, } @@ -160,8 +160,7 @@ func getLicInfoStr(li licInfo) string { } func getAGPLMessage() string { - return `License: GNU AGPL v3 -If you are distributing or hosting MinIO along with your proprietary application as combined works, you may require a commercial license included in the Standard and Enterprise subscription plans. (https://min.io/signup?ref=mc)` + return `License: GNU AGPL v3 ` } func initLicInfoColors() { @@ -175,6 +174,10 @@ func mainLicenseInfo(ctx *cli.Context) error { if len(ctx.Args()) != 1 { showCommandHelpAndExit(ctx, 1) // last argument is exit code } + if !subnetServicesEnabled() { + // Display only locally stored license information; never consult SUBNET. + globalAirgapped = true + } initLicInfoColors() diff --git a/cmd/license-register.go b/cmd/license-register.go index 3c254bc1d7..4cee284f37 100644 --- a/cmd/license-register.go +++ b/cmd/license-register.go @@ -40,7 +40,7 @@ const ( var licenseRegisterFlags = append([]cli.Flag{ cli.StringFlag{ Name: "name", - Usage: "Specify the name to associate to this MinIO cluster in SUBNET", + Usage: "Specify the name to associate to this Silo/MinIO cluster in SUBNET", }, cli.StringFlag{ Name: "license", @@ -50,7 +50,7 @@ var licenseRegisterFlags = append([]cli.Flag{ var licenseRegisterCmd = cli.Command{ Name: "register", - Usage: "register with MinIO Subscription Network", + Usage: "register with MinIO SUBNET (disabled in this build)", OnUsageError: onUsageError, Action: mainLicenseRegister, Before: setGlobalsFromContext, @@ -64,23 +64,12 @@ USAGE: FLAGS: {{range .VisibleFlags}}{{.}} {{end}} -EXAMPLES: - 1. Register MinIO cluster at alias 'play' on SUBNET, using api key for auth - {{.Prompt}} {{.HelpName}} play --api-key 08efc836-4289-dbd4-ad82-b5e8b6d25577 +DESCRIPTION: + Registration with MinIO SUBNET is not available in this Silo build of mc. + The command is retained for CLI compatibility and always exits with an error. - 2. Register MinIO cluster at alias 'play' on SUBNET, using license file ./minio.license - {{.Prompt}} {{.HelpName}} play --license ./minio.license - - 3. Register MinIO cluster at alias 'play' on SUBNET, using api key for auth, - and "play-cluster" as the preferred name for the cluster on SUBNET. - {{.Prompt}} {{.HelpName}} play --api-key 08efc836-4289-dbd4-ad82-b5e8b6d25577 --name play-cluster - - 4. Register MinIO cluster at alias 'play' on SUBNET in an airgapped environment - {{.Prompt}} {{.HelpName}} play --airgap - - 5. Register MinIO cluster at alias 'play' on SUBNET, using alias as the cluster name. - This asks for SUBNET credentials if the cluster is not already registered. - {{.Prompt}} {{.HelpName}} play +EXIT STATUS: + 1 - SUBNET services are disabled `, } @@ -203,6 +192,9 @@ func validateNotPlay(aliasedURL string) { } func mainLicenseRegister(ctx *cli.Context) error { + if !subnetServicesEnabled() { + return subnetDisabledExit() + } console.SetColor(licRegisterMsgTag, color.New(color.FgGreen, color.Bold)) console.SetColor(licRegisterLinkTag, color.New(color.FgWhite, color.Bold)) checkLicenseRegisterSyntax(ctx) diff --git a/cmd/license-unregister.go b/cmd/license-unregister.go index 833d02dd33..a9a55898c7 100644 --- a/cmd/license-unregister.go +++ b/cmd/license-unregister.go @@ -31,7 +31,7 @@ const licUnregisterMsgTag = "licenseUnregisterMessage" var licenseUnregisterCmd = cli.Command{ Name: "unregister", - Usage: "unregister from MinIO Subscription Network", + Usage: "remove SUBNET registration credentials from the cluster", OnUsageError: onUsageError, Action: mainLicenseUnregister, Before: setGlobalsFromContext, @@ -46,9 +46,13 @@ USAGE: FLAGS: {{range .VisibleFlags}}{{.}} {{end}} +DESCRIPTION: + This Silo build of mc never contacts MinIO SUBNET; unregister only removes + SUBNET credentials stored in the cluster configuration. + EXAMPLES: - 1. Unregister MinIO cluster at alias 'myminio' from SUBNET - {{.Prompt}} {{.HelpName}} myminio + 1. Remove SUBNET registration credentials from cluster at alias 'mysilo' + {{.Prompt}} {{.HelpName}} mysilo `, } @@ -79,6 +83,11 @@ func checkLicenseUnregisterSyntax(ctx *cli.Context) { } func mainLicenseUnregister(ctx *cli.Context) error { + if !subnetServicesEnabled() { + // Offline behavior: scrub SUBNET credentials from the cluster + // configuration without contacting SUBNET. + globalAirgapped = true + } console.SetColor(licUnregisterMsgTag, color.New(color.FgGreen, color.Bold)) checkLicenseUnregisterSyntax(ctx) diff --git a/cmd/license-update.go b/cmd/license-update.go index ed9b0d77a3..2245ba098d 100644 --- a/cmd/license-update.go +++ b/cmd/license-update.go @@ -46,10 +46,12 @@ FLAGS: {{end}} EXAMPLES: - 1. Update license for cluster with alias 'play' from the file license.key - {{.Prompt}} {{.HelpName}} play license.key - 2. Update (renew) license for already registered cluster with alias 'play' - {{.Prompt}} {{.HelpName}} play + 1. Update license for cluster with alias 'mysilo' from the file license.key + {{.Prompt}} {{.HelpName}} mysilo license.key + +NOTE: + Online license renewal via MinIO SUBNET ('{{.HelpName}} ALIAS' without a + file argument) is disabled in this Silo build and always exits with an error. `, } @@ -92,6 +94,9 @@ func mainLicenseUpdate(ctx *cli.Context) error { } // renew the license + if !subnetServicesEnabled() { + return subnetDisabledExit() + } printMsg(performLicenseRenew(alias)) return nil } diff --git a/cmd/runtime-info.go b/cmd/runtime-info.go index aa1d293d08..340b52eabe 100644 --- a/cmd/runtime-info.go +++ b/cmd/runtime-info.go @@ -115,7 +115,7 @@ func IsSourceBuild() bool { return err != nil } -// DownloadReleaseData is retained for source compatibility. The Pigsty fork +// DownloadReleaseData is retained for source compatibility. The Silo fork // does not contact a release feed or download self-update metadata. func DownloadReleaseData(_ string, _ time.Duration) (data string, err *probe.Error) { return "", probe.NewError(errors.New(selfUpdateDisabledMessage)) diff --git a/cmd/subnet-disabled_test.go b/cmd/subnet-disabled_test.go new file mode 100644 index 0000000000..05f97b37bd --- /dev/null +++ b/cmd/subnet-disabled_test.go @@ -0,0 +1,76 @@ +// Copyright (c) 2015-2022 MinIO, Inc. +// +// This file is part of MinIO Object Storage stack +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . + +package cmd + +import ( + "strings" + "testing" +) + +// The Silo fork ships permanently offline: no code path may contact MinIO +// SUBNET. These tests pin the fork-level guarantees so upstream merges +// cannot silently re-enable connectivity. + +func TestSubnetServicesDisabled(t *testing.T) { + if subnetServicesEnabled() { + t.Fatal("subnetServicesEnabled() = true; the Silo fork must ship with SUBNET permanently disabled") + } +} + +func TestSubnetRequestsReturnDisabledError(t *testing.T) { + // The URL must never be contacted; using an unroutable address makes an + // accidental regression fail loudly instead of silently succeeding. + const unroutable = "http://192.0.2.1/api/test" + + if _, e := subnetGetReq(unroutable, nil); e == nil || e.Error() != subnetDisabledMessage { + t.Fatalf("subnetGetReq error = %v, want %q", e, subnetDisabledMessage) + } + if _, e := subnetHeadReq(unroutable, nil); e == nil || e.Error() != subnetDisabledMessage { + t.Fatalf("subnetHeadReq error = %v, want %q", e, subnetDisabledMessage) + } + if _, e := SubnetPostReq(unroutable, nil, nil); e == nil || e.Error() != subnetDisabledMessage { + t.Fatalf("SubnetPostReq error = %v, want %q", e, subnetDisabledMessage) + } +} + +func TestFreshConfigHasNoThirdPartyDemoAlias(t *testing.T) { + cfg := newMcConfig() + + if _, ok := cfg.Aliases["play"]; ok { + t.Fatal(`fresh config contains a "play" alias; new configurations must not point at MinIO's demo cluster`) + } + for _, alias := range []string{"local", "s3", "gcs"} { + if _, ok := cfg.Aliases[alias]; !ok { + t.Fatalf("fresh config is missing the default %q alias", alias) + } + } + for alias, cfgV10 := range cfg.Aliases { + if strings.Contains(cfgV10.URL, "min.io") { + t.Fatalf("fresh config alias %q points at %s; MinIO-operated endpoints are not allowed in new configs", alias, cfgV10.URL) + } + } +} + +func TestAGPLMessageHasNoCommercialPitch(t *testing.T) { + msg := getAGPLMessage() + for _, needle := range []string{"min.io", "commercial", "subscription"} { + if strings.Contains(strings.ToLower(msg), needle) { + t.Fatalf("getAGPLMessage() contains %q; commercial upsell text must not appear: %q", needle, msg) + } + } +} diff --git a/cmd/subnet-utils.go b/cmd/subnet-utils.go index b79dfb465f..0779420da3 100644 --- a/cmd/subnet-utils.go +++ b/cmd/subnet-utils.go @@ -45,11 +45,27 @@ import ( const ( subnetRespBodyLimit = 1 << 20 // 1 MiB - minioSubscriptionURL = "https://min.io/subscription" subnetPublicKeyPath = "/downloads/license-pubkey.pem" minioDeploymentIDHeader = "x-minio-deployment-id" + + // subnetDisabledMessage is the stable error returned by every code path + // that would otherwise contact MinIO SUBNET. Command names and flags are + // retained for CLI compatibility; only the connectivity is removed. + subnetDisabledMessage = "MinIO SUBNET services (registration, licensing, uploads) are disabled in this Silo build of mc; diagnostics remain available locally. See https://github.com/pgsty/mc" ) +// subnetServicesEnabled reports whether this build may talk to MinIO SUBNET. +// The Silo fork ships permanently offline; re-enabling requires a fork-level +// decision, not a runtime switch. +func subnetServicesEnabled() bool { return false } + +// subnetDisabledExit prints the stable SUBNET-disabled error and returns the +// standard error exit status, mirroring the disabled self-update command. +func subnetDisabledExit() error { + printMsg(disabledUpdateMessage{Status: "error", Message: subnetDisabledMessage}) + return exitStatus(globalErrorExitStatus) +} + var subnetCommonFlags = append(supportGlobalFlags, cli.StringFlag{ Name: "api-key", Usage: "API Key of the account on SUBNET", @@ -239,6 +255,9 @@ func dumpHTTPReqTo(out io.Writer, req *http.Request, resp *http.Response) error } func subnetReqDo(r *http.Request, headers map[string]string) (string, error) { + if !subnetServicesEnabled() { + return "", errors.New(subnetDisabledMessage) + } for k, v := range headers { r.Header.Add(k, v) } @@ -393,7 +412,7 @@ func mcConfig() *configV10 { func minioConfigSupportsSubSys(client *madmin.AdminClient, subSys string) bool { help, e := client.HelpConfigKV(globalContext, "", "", false) - fatalIf(probe.NewError(e), "Unable to get minio config keys") + fatalIf(probe.NewError(e), "Unable to get server config keys") for _, h := range help.KeysHelp { if h.Key == subSys { @@ -427,7 +446,7 @@ func setSubnetConfig(alias, subKey, cfgVal string) { cfgKey := "subnet " + subKey _, e := client.SetConfigKV(globalContext, cfgKey+"="+cfgVal) - fatalIf(probe.NewError(e), "Unable to set "+cfgKey+" config on MinIO") + fatalIf(probe.NewError(e), "Unable to set "+cfgKey+" config on Silo/MinIO") } func setSubnetAPIKey(alias, apiKey string) { @@ -523,7 +542,7 @@ func subnetLogin() (string, error) { username = strings.TrimSpace(username) if len(username) == 0 { - return "", errors.New("Username cannot be empty. If you don't have one, please create one from here: " + minioSubscriptionURL) + return "", errors.New("Username cannot be empty") } fmt.Print("Password: ") diff --git a/cmd/support-callhome.go b/cmd/support-callhome.go index db5959062b..c42a6dc1d3 100644 --- a/cmd/support-callhome.go +++ b/cmd/support-callhome.go @@ -39,7 +39,7 @@ USAGE: {{.HelpName}} enable|disable|status ALIAS OPTIONS: - enable - Enable callhome + enable - Enable callhome (not supported in this build; always exits with an error) disable - Disable callhome status - Display callhome settings @@ -47,14 +47,14 @@ FLAGS: {{range .VisibleFlags}}{{.}} {{end}} EXAMPLES: - 1. Enable callhome for cluster with alias 'myminio' - {{.Prompt}} {{.HelpName}} enable myminio + 1. Enable callhome for cluster with alias 'mysilo' + {{.Prompt}} {{.HelpName}} enable mysilo - 2. Disable callhome for cluster with alias 'myminio' - {{.Prompt}} {{.HelpName}} disable myminio + 2. Disable callhome for cluster with alias 'mysilo' + {{.Prompt}} {{.HelpName}} disable mysilo - 3. Check callhome status for cluster with alias 'myminio' - {{.Prompt}} {{.HelpName}} status myminio + 3. Check callhome status for cluster with alias 'mysilo' + {{.Prompt}} {{.HelpName}} status mysilo `, } @@ -84,7 +84,13 @@ func mainCallhome(ctx *cli.Context) error { setSuccessMessageColor() alias, arg := checkToggleCmdSyntax(ctx) - validateClusterRegistered(alias, false) + if subnetServicesEnabled() { + validateClusterRegistered(alias, false) + } else if arg == "enable" { + // Call-home reports to MinIO SUBNET; enabling it is not supported + // in this build. Status display and disabling remain available. + return subnetDisabledExit() + } if arg == "status" { printCallhomeStatus(alias) @@ -114,7 +120,7 @@ func setCallhomeConfig(alias string, enableCallhome bool) { fatalIf(err, "Unable to initialize admin connection.") if !minioConfigSupportsSubSys(client, "callhome") { - fatal(errDummy().Trace(), "Your version of MinIO doesn't support this configuration") + fatal(errDummy().Trace(), "Your version of the Silo/MinIO server doesn't support this configuration") } enableStr := "off" @@ -123,5 +129,5 @@ func setCallhomeConfig(alias string, enableCallhome bool) { } configStr := "callhome enable=" + enableStr _, e := client.SetConfigKV(globalContext, configStr) - fatalIf(probe.NewError(e), "Unable to set callhome config on minio") + fatalIf(probe.NewError(e), "Unable to set callhome config on the server") } diff --git a/cmd/support-diag.go b/cmd/support-diag.go index 7a43d6e8f6..8846351f2e 100644 --- a/cmd/support-diag.go +++ b/cmd/support-diag.go @@ -69,7 +69,7 @@ var supportDiagFlags = append([]cli.Flag{ var supportDiagCmd = cli.Command{ Name: "diag", Aliases: []string{"diagnostics"}, - Usage: "upload health data for diagnostics", + Usage: "generate a health report for diagnostics", OnUsageError: onUsageError, Action: mainSupportDiag, Before: setGlobalsFromContext, @@ -84,14 +84,11 @@ FLAGS: {{range .VisibleFlags}}{{.}} {{end}} EXAMPLES: - 1. Upload MinIO diagnostics report for cluster with alias 'myminio' to SUBNET - {{.Prompt}} {{.HelpName}} myminio + 1. Generate a diagnostics report for cluster with alias 'mysilo' and save it locally + {{.Prompt}} {{.HelpName}} mysilo - 2. Generate MinIO diagnostics report for cluster with alias 'myminio', save and upload to SUBNET manually - {{.Prompt}} {{.HelpName}} myminio --airgap - - 3. Upload MinIO diagnostics report for cluster with alias 'myminio' to SUBNET, with strict anonymization - {{.Prompt}} {{.HelpName}} myminio --anonymize=strict + 2. Generate a diagnostics report for cluster with alias 'mysilo' with strict anonymization + {{.Prompt}} {{.HelpName}} mysilo --anonymize=strict `, } @@ -143,7 +140,7 @@ func tarGZ(healthInfo any, version, filename string) error { warningMsgHeader := infoText(warningMsgBoundary) warningMsgTrailer := infoText(warningMsgBoundary) console.Printf("%s\n%s\n%s\n%s\n", warningMsgHeader, warning, warningContents, warningMsgTrailer) - console.Infoln("MinIO diagnostics report saved at ", filename) + console.Infoln("Diagnostics report saved at ", filename) } return nil @@ -191,6 +188,11 @@ func warnText(s string) string { } func mainSupportDiag(ctx *cli.Context) error { + if !subnetServicesEnabled() { + // SUBNET uploads are disabled in this build; always operate in + // local (airgap) mode so the report is saved to disk. + globalAirgapped = true + } checkSupportDiagSyntax(ctx) // Get the alias parameter from cli @@ -239,7 +241,7 @@ func execSupportDiag(ctx *cli.Context, client *madmin.AdminClient, alias, apiKey } e = tarGZ(healthInfo, version, filename) - fatalIf(probe.NewError(e), "Unable to save MinIO diagnostics report") + fatalIf(probe.NewError(e), "Unable to save diagnostics report") if !globalAirgapped { _, e = (&SubnetFileUploader{ diff --git a/cmd/support-inspect.go b/cmd/support-inspect.go index 8ea83caf70..5d1031dacf 100644 --- a/cmd/support-inspect.go +++ b/cmd/support-inspect.go @@ -55,7 +55,7 @@ var supportInspectFlags = append(subnetCommonFlags, var supportInspectCmd = cli.Command{ Name: "inspect", - Usage: "upload raw object contents for analysis", + Usage: "download raw object contents for analysis", Action: mainSupportInspect, OnUsageError: onUsageError, Before: setGlobalsFromContext, @@ -71,14 +71,11 @@ FLAGS: {{range .VisibleFlags}}{{.}} {{end}} EXAMPLES: - 1. Upload 'xl.meta' of a specific object from all the drives - {{.Prompt}} {{.HelpName}} myminio/bucket/test*/xl.meta + 1. Download 'xl.meta' of a specific object from all the drives + {{.Prompt}} {{.HelpName}} mysilo/bucket/test*/xl.meta - 2. Upload recursively all objects at a prefix. NOTE: This can be an expensive operation use it with caution. - {{.Prompt}} {{.HelpName}} myminio/bucket/test/** - - 3. Download 'xl.meta' of a specific object from all the drives locally, and upload to SUBNET manually - {{.Prompt}} {{.HelpName}} myminio/bucket/test*/xl.meta --airgap + 2. Download recursively all objects at a prefix. NOTE: This can be an expensive operation use it with caution. + {{.Prompt}} {{.HelpName}} mysilo/bucket/test/** `, } @@ -124,6 +121,11 @@ func checkSupportInspectSyntax(ctx *cli.Context) { // mainSupportInspect - the entry function of inspect command func mainSupportInspect(ctx *cli.Context) error { + if !subnetServicesEnabled() { + // SUBNET uploads are disabled in this build; always operate in + // local (airgap) mode so inspect data is saved to disk. + globalAirgapped = true + } // Check for command syntax checkSupportInspectSyntax(ctx) diff --git a/cmd/support-perf.go b/cmd/support-perf.go index b9eb34b02d..26deb8a92c 100644 --- a/cmd/support-perf.go +++ b/cmd/support-perf.go @@ -87,7 +87,7 @@ var supportPerfFlags = append([]cli.Flag{ var supportPerfCmd = cli.Command{ Name: "perf", - Usage: "upload object, network and drive performance analysis", + Usage: "run object, network and drive performance analysis", Action: mainSupportPerf, OnUsageError: onUsageError, Before: setGlobalsFromContext, @@ -103,11 +103,8 @@ FLAGS: {{range .VisibleFlags}}{{.}} {{end}} EXAMPLES: - 1. Upload object storage, network, and drive performance analysis for cluster with alias 'myminio' to SUBNET - {{.Prompt}} {{.HelpName}} myminio - - 2. Run object storage, network, and drive performance tests on cluster with alias 'myminio', save and upload to SUBNET manually - {{.Prompt}} {{.HelpName}} myminio --airgap + 1. Run object storage, network, and drive performance tests on cluster with alias 'mysilo' and save the results locally + {{.Prompt}} {{.HelpName}} mysilo `, } @@ -249,7 +246,7 @@ func objectTestVerboseResult(result *madmin.SpeedTestResult) (msg string) { } func objectTestShortResult(result *madmin.SpeedTestResult) (msg string) { - msg += fmt.Sprintf("MinIO %s, %d servers, %d drives, %s objects, %d threads", + msg += fmt.Sprintf("Silo/MinIO %s, %d servers, %d drives, %s objects, %d threads", result.Version, result.Servers, result.Disks, humanize.IBytes(uint64(result.Size)), result.Concurrent) @@ -271,6 +268,11 @@ func (p PerfTestOutput) JSON() string { var globalPerfTestVerbose bool func mainSupportPerf(ctx *cli.Context) error { + if !subnetServicesEnabled() { + // SUBNET uploads are disabled in this build; always operate in + // local (airgap) mode so results are saved to disk. + globalAirgapped = true + } args := ctx.Args() // the alias parameter from cli @@ -514,7 +516,7 @@ func savePerfResultFile(tmpFileName, resultFileNamePfx string) { zipFileName := resultFileNamePfx + ".zip" e := moveFile(tmpFileName, zipFileName) fatalIf(probe.NewError(e), fmt.Sprintf("Unable to move %s -> %s", tmpFileName, zipFileName)) - console.Infof("MinIO performance report saved at %s, please upload to SUBNET portal manually\n", zipFileName) + console.Infof("Performance report saved at %s\n", zipFileName) } func runPerfTests(ctx *cli.Context, aliasedURL, perfType string) []PerfTestResult { diff --git a/cmd/support-profile.go b/cmd/support-profile.go index 0950843aa2..ae7b775394 100644 --- a/cmd/support-profile.go +++ b/cmd/support-profile.go @@ -81,7 +81,7 @@ func (s supportProfileMessage) JSON() string { var supportProfileCmd = cli.Command{ Name: "profile", - Usage: "upload profile data for debugging", + Usage: "generate profile data for debugging", Action: mainSupportProfile, OnUsageError: onUsageError, Before: setGlobalsFromContext, @@ -97,17 +97,14 @@ FLAGS: {{range .VisibleFlags}}{{.}} {{end}} EXAMPLES: - 1. Profile CPU for 10 seconds on cluster with alias 'myminio' and upload results to SUBNET - {{.Prompt}} {{.HelpName}} --type cpu myminio + 1. Profile CPU for 10 seconds on cluster with alias 'mysilo' and save the results locally + {{.Prompt}} {{.HelpName}} --type cpu mysilo - 2. Profile CPU, Memory, Goroutines for 10 seconds on cluster with alias 'myminio' and upload results to SUBNET - {{.Prompt}} {{.HelpName}} --type cpu,mem,goroutines myminio + 2. Profile CPU, Memory, Goroutines for 10 seconds on cluster with alias 'mysilo' and save the results locally + {{.Prompt}} {{.HelpName}} --type cpu,mem,goroutines mysilo - 3. Profile CPU, Memory, Goroutines for 10 minutes on cluster with alias 'myminio' and upload results to SUBNET - {{.Prompt}} {{.HelpName}} --type cpu,mem,goroutines --duration 600 myminio - - 4. Profile CPU for 10 seconds on cluster with alias 'myminio', save and upload to SUBNET manually - {{.Prompt}} {{.HelpName}} --type cpu --airgap myminio + 3. Profile CPU, Memory, Goroutines for 10 minutes on cluster with alias 'mysilo' and save the results locally + {{.Prompt}} {{.HelpName}} --type cpu,mem,goroutines --duration 600 mysilo `, } @@ -197,6 +194,11 @@ func saveProfileFile(data io.ReadCloser) { // mainSupportProfile is the handle for "mc support profile" command. func mainSupportProfile(ctx *cli.Context) error { + if !subnetServicesEnabled() { + // SUBNET uploads are disabled in this build; always operate in + // local (airgap) mode so profile data is saved to disk. + globalAirgapped = true + } // Check for command syntax checkAdminProfileSyntax(ctx) diff --git a/cmd/support-register.go b/cmd/support-register.go index 3a0880d37c..baf8462bb3 100644 --- a/cmd/support-register.go +++ b/cmd/support-register.go @@ -24,13 +24,13 @@ import ( var supportRegisterFlags = append([]cli.Flag{ cli.StringFlag{ Name: "name", - Usage: "Specify the name to associate to this MinIO cluster in SUBNET", + Usage: "Specify the name to associate to this Silo/MinIO cluster in SUBNET", }, }, subnetCommonFlags...) var supportRegisterCmd = cli.Command{ Name: "register", - Usage: "register with MinIO subscription network", + Usage: "register with MinIO SUBNET (deprecated)", OnUsageError: onUsageError, Action: mainSupportRegister, Before: setGlobalsFromContext, diff --git a/cmd/support-upload.go b/cmd/support-upload.go index 0dc8a7bc96..bd716a0a60 100644 --- a/cmd/support-upload.go +++ b/cmd/support-upload.go @@ -39,7 +39,7 @@ var ( }, cli.BoolFlag{ Name: "enc", - Usage: "encrypt content with key only accessible to minio employees", + Usage: "accepted for compatibility; uploads are disabled in this build", }, cli.BoolFlag{ Name: "dev", @@ -68,7 +68,7 @@ func (s supportUploadMessage) JSON() string { var supportUploadCmd = cli.Command{ Name: "upload", - Usage: "upload file to a SUBNET issue", + Usage: "upload file to a SUBNET issue (disabled in this build)", Action: mainSupportUpload, OnUsageError: onUsageError, Before: setGlobalsFromContext, @@ -83,12 +83,12 @@ USAGE: FLAGS: {{range .VisibleFlags}}{{.}} {{end}} -EXAMPLES: - 1. Upload file './trace.log' for cluster 'myminio' to SUBNET issue number 10 - {{.Prompt}} {{.HelpName}} --issue 10 myminio ./trace.log +DESCRIPTION: + Uploads to MinIO SUBNET are not available in this Silo build of mc. + The command is retained for CLI compatibility and always exits with an error. - 2. Upload file './trace.log' for cluster 'myminio' to SUBNET issue number 10 with comment 'here is the trace log' - {{.Prompt}} {{.HelpName}} --issue 10 --comment "here is the trace log" myminio ./trace.log +EXIT STATUS: + 1 - SUBNET services are disabled `, } @@ -104,6 +104,9 @@ func checkSupportUploadSyntax(ctx *cli.Context) { // mainSupportUpload is the handle for "mc support upload" command. func mainSupportUpload(ctx *cli.Context) error { + if !subnetServicesEnabled() { + return subnetDisabledExit() + } // Check for command syntax checkSupportUploadSyntax(ctx) setSuccessMessageColor() diff --git a/cmd/support.go b/cmd/support.go index 58a9499c94..91be55f147 100644 --- a/cmd/support.go +++ b/cmd/support.go @@ -42,7 +42,7 @@ var supportGlobalFlags = append(globalFlags, }, cli.BoolFlag{ Name: "airgap", - Usage: "use in environments without network access to SUBNET (e.g. airgapped, firewalled, etc.)", + Usage: "operate offline (accepted for compatibility; this build always runs without SUBNET access)", }, ) @@ -117,6 +117,11 @@ func validateClusterRegistered(alias string, cmdTalksToSubnet bool) string { if cmdTalksToSubnet { requireRegistration = !GlobalDevMode || !globalAirgapped } + if !subnetServicesEnabled() { + // SUBNET registration cannot be a prerequisite when SUBNET support + // is disabled; commands proceed with local-only behavior. + requireRegistration = false + } apiKey, e := getSubnetAPIKey(alias) if requireRegistration { @@ -126,7 +131,7 @@ func validateClusterRegistered(alias string, cmdTalksToSubnet bool) string { return apiKey } -// isFeatureEnabled - checks if a feature is enabled in MinIO config +// isFeatureEnabled - checks if a feature is enabled in Silo/MinIO config // To be used with configs that can be switched on/off using the `enable` key // e.g. subSys = logger_webhook, target = logger_webhook:subnet // Returns true if any of the following is true diff --git a/cmd/update-main.go b/cmd/update-main.go index 6a1fe33621..48d72d5a47 100644 --- a/cmd/update-main.go +++ b/cmd/update-main.go @@ -24,7 +24,7 @@ import ( ) const ( - selfUpdateDisabledMessage = "Self-update is disabled in the Pigsty mc fork; upgrade only through the Pigsty package repository or https://github.com/pgsty/mc/releases." + selfUpdateDisabledMessage = "Self-update is disabled in this Silo build of mc; upgrade only through your package repository or https://github.com/pgsty/mc/releases." selfUpdateTooManyArgumentsMessage = "mc update accepts at most one custom release URL; self-update remains disabled." ) @@ -47,7 +47,7 @@ func (m disabledUpdateMessage) JSON() string { func disabledUpdateCmd() cli.Command { return cli.Command{ Name: "update", - Usage: "self-update is disabled in this Pigsty build", + Usage: "self-update is disabled in this Silo build", Action: mainUpdate, OnUsageError: onUsageError, Flags: []cli.Flag{ From 59e176a4521a7cb3e97e3e47849c6ad951c6f48d Mon Sep 17 00:00:00 2001 From: Feng Ruohang Date: Thu, 6 Aug 2026 11:07:25 +0800 Subject: [PATCH 2/7] rebrand: adopt Silo identity in CLI help and examples Apply the brand policy across all user-visible cmd/ strings: - product identity: app usage line, author, and version output now identify the Silo client, with an explicit 'based on MinIO technology' source statement; original MinIO copyright lines are retained - server references in help and messages use the 'Silo/MinIO' wording since mc administers both Silo and upstream MinIO deployments - example aliases and hosts de-branded: myminio->mysilo, minio1/2-> silo1/2, play->mysilo, MINIOTIER->SILOTIER, minio.example.com-> silo.example.com, dc=min,dc=io->dc=example,dc=com, and similar - stale upstream links replaced: issue reporting now points at pgsty/mc, SQL docs at silo.pgsty.com Protocol and compatibility surfaces are deliberately untouched: MINIO_*/MC_* env vars, x-minio-* headers, --type minio log/tier enums, /minio/* metrics paths, prometheus job name minio-job, the .part.minio transfer suffix, minio-go SDK user agent, module and import paths, and all license headers. Co-Authored-By: Claude Fable 5 Signed-off-by: Feng Ruohang --- cmd/admin-accesskey-create.go | 10 ++-- cmd/admin-accesskey-disable.go | 2 +- cmd/admin-accesskey-edit.go | 4 +- cmd/admin-accesskey-enable.go | 2 +- cmd/admin-accesskey-list.go | 8 ++-- cmd/admin-accesskey-sts-revoke.go | 8 ++-- cmd/admin-accesskey.go | 2 +- cmd/admin-bucket.go | 2 +- cmd/admin-cluster-bucket-export.go | 2 +- cmd/admin-cluster-bucket-import.go | 2 +- cmd/admin-cluster-bucket.go | 2 +- cmd/admin-cluster-iam-export.go | 4 +- cmd/admin-cluster-iam-import.go | 4 +- cmd/admin-cluster-iam.go | 2 +- cmd/admin-cluster.go | 2 +- cmd/admin-config-export.go | 4 +- cmd/admin-config-get.go | 12 ++--- cmd/admin-config-history.go | 2 +- cmd/admin-config-import.go | 4 +- cmd/admin-config-reset.go | 6 +-- cmd/admin-config-restore.go | 4 +- cmd/admin-config-set.go | 10 ++-- cmd/admin-config.go | 2 +- cmd/admin-console.go | 2 +- cmd/admin-decom-cancel.go | 4 +- cmd/admin-decom-start.go | 2 +- cmd/admin-decom-status.go | 4 +- cmd/admin-decom.go | 2 +- cmd/admin-group-add.go | 6 +-- cmd/admin-group-disable.go | 2 +- cmd/admin-group-enable.go | 2 +- cmd/admin-group-info.go | 2 +- cmd/admin-group-list.go | 2 +- cmd/admin-group-remove.go | 4 +- cmd/admin-heal.go | 6 +-- cmd/admin-idp.go | 2 +- cmd/admin-info.go | 8 ++-- cmd/admin-inspect.go | 2 +- cmd/admin-kms-key-create.go | 2 +- cmd/admin-kms-key-list.go | 4 +- cmd/admin-kms-key-status.go | 8 ++-- cmd/admin-logs.go | 14 +++--- cmd/admin-main.go | 2 +- cmd/admin-policy-attach.go | 6 +-- cmd/admin-policy-create.go | 4 +- cmd/admin-policy-detach.go | 6 +-- cmd/admin-policy-entities.go | 10 ++-- cmd/admin-policy-info.go | 6 +-- cmd/admin-policy-list.go | 4 +- cmd/admin-policy-remove.go | 6 +-- cmd/admin-policy.go | 2 +- cmd/admin-prometheus-generate.go | 36 +++++++------- cmd/admin-prometheus-metrics.go | 32 ++++++------- cmd/admin-rebalance-main.go | 2 +- cmd/admin-rebalance-start.go | 4 +- cmd/admin-rebalance-status.go | 4 +- cmd/admin-rebalance-stop.go | 4 +- cmd/admin-replicate-add.go | 4 +- cmd/admin-replicate-info.go | 2 +- cmd/admin-replicate-remove.go | 6 +-- cmd/admin-replicate-resync-cancel.go | 4 +- cmd/admin-replicate-resync-start.go | 4 +- cmd/admin-replicate-resync-status.go | 4 +- cmd/admin-replicate-status.go | 8 ++-- cmd/admin-replicate-update.go | 10 ++-- cmd/admin-replicate.go | 2 +- cmd/admin-scanner-status.go | 4 +- cmd/admin-scanner-trace.go | 18 +++---- cmd/admin-scanner.go | 2 +- cmd/admin-service-freeze.go | 8 ++-- cmd/admin-service-restart.go | 10 ++-- cmd/admin-service-stop.go | 8 ++-- cmd/admin-service-unfreeze.go | 10 ++-- cmd/admin-service.go | 2 +- cmd/admin-subnet-register.go | 2 +- cmd/admin-tier-deprecated.go | 32 ++++++------- cmd/admin-top-api.go | 2 +- cmd/admin-top-locks.go | 2 +- cmd/admin-top.go | 2 +- cmd/admin-trace.go | 22 ++++----- cmd/admin-update.go | 12 ++--- cmd/admin-user-add.go | 18 +++---- cmd/admin-user-disable.go | 4 +- cmd/admin-user-enable.go | 4 +- cmd/admin-user-info.go | 2 +- cmd/admin-user-list.go | 4 +- cmd/admin-user-policy.go | 2 +- cmd/admin-user-remove.go | 4 +- cmd/admin-user-sts-info.go | 2 +- cmd/admin-user-svcacct-add.go | 22 ++++----- cmd/admin-user-svcacct-disable.go | 4 +- cmd/admin-user-svcacct-enable.go | 4 +- cmd/admin-user-svcacct-info.go | 2 +- cmd/admin-user-svcacct-list.go | 4 +- cmd/admin-user-svcacct-remove.go | 4 +- cmd/admin-user-svcacct-set.go | 8 ++-- cmd/alias-export.go | 2 +- cmd/alias-import.go | 8 ++-- cmd/alias-main.go | 2 +- cmd/alias-set.go | 8 ++-- cmd/batch-cancel.go | 2 +- cmd/batch-describe.go | 2 +- cmd/batch-generate.go | 4 +- cmd/batch-list.go | 4 +- cmd/batch-start.go | 2 +- cmd/batch-status.go | 4 +- cmd/cat-main.go | 10 ++-- cmd/certs.go | 2 +- cmd/config-old.go | 4 +- cmd/cors-get.go | 2 +- cmd/cors-remove.go | 2 +- cmd/cors-set.go | 4 +- cmd/cp-main.go | 50 ++++++++++---------- cmd/encrypt-clear.go | 4 +- cmd/encrypt-info.go | 2 +- cmd/encrypt-set.go | 4 +- cmd/event-add.go | 4 +- cmd/event-list.go | 2 +- cmd/event-remove.go | 4 +- cmd/find-main.go | 10 ++-- cmd/find.go | 2 +- cmd/flags.go | 2 +- cmd/get-main.go | 8 ++-- cmd/head-main.go | 2 +- cmd/health_v1.go | 2 +- cmd/idp-ldap-accesskey-create-with-login.go | 4 +- cmd/idp-ldap-accesskey-disable.go | 2 +- cmd/idp-ldap-accesskey-edit.go | 4 +- cmd/idp-ldap-accesskey-enable.go | 2 +- cmd/idp-ldap-accesskey-list.go | 10 ++-- cmd/idp-ldap-accesskey-sts-revoke.go | 10 ++-- cmd/idp-ldap-policy-subcommands.go | 34 +++++++------- cmd/idp-ldap-subcommands.go | 22 ++++----- cmd/idp-openid-accesskey-disable.go | 2 +- cmd/idp-openid-accesskey-edit.go | 4 +- cmd/idp-openid-accesskey-enable.go | 2 +- cmd/idp-openid-accesskey-list.go | 8 ++-- cmd/idp-openid-subcommands.go | 34 +++++++------- cmd/idp.go | 2 +- cmd/ilm-deprecated-cmds.go | 52 ++++++++++----------- cmd/ilm-remove.go | 8 ++-- cmd/ilm-restore.go | 10 ++-- cmd/ilm-rule-add.go | 16 +++---- cmd/ilm-rule-export.go | 4 +- cmd/ilm-rule-import.go | 8 ++-- cmd/ilm-rule-list.go | 16 +++---- cmd/ilm-tier-add.go | 10 ++-- cmd/ilm-tier-check.go | 2 +- cmd/ilm-tier-edit.go | 6 +-- cmd/ilm-tier-info.go | 8 ++-- cmd/ilm-tier-list.go | 4 +- cmd/ilm-tier-remove.go | 2 +- cmd/ilm-tier-update.go | 6 +-- cmd/ilm-tier-verify.go | 2 +- cmd/legalhold-clear.go | 8 ++-- cmd/legalhold-info.go | 8 ++-- cmd/legalhold-set.go | 8 ++-- cmd/ls-main.go | 2 +- cmd/main.go | 5 +- cmd/mb-main.go | 8 ++-- cmd/mirror-main.go | 18 +++---- cmd/mv-main.go | 48 +++++++++---------- cmd/od-main.go | 6 +-- cmd/ping.go | 10 ++-- cmd/pipe-main.go | 10 ++-- cmd/put-main.go | 18 +++---- cmd/quota-clear.go | 4 +- cmd/quota-info.go | 4 +- cmd/quota-set.go | 8 ++-- cmd/ready-main.go | 6 +-- cmd/replicate-add.go | 20 ++++---- cmd/replicate-backlog.go | 8 ++-- cmd/replicate-export.go | 8 ++-- cmd/replicate-import.go | 8 ++-- cmd/replicate-list.go | 4 +- cmd/replicate-remove.go | 8 ++-- cmd/replicate-reset-start.go | 6 +-- cmd/replicate-reset-status.go | 6 +-- cmd/replicate-status.go | 8 ++-- cmd/replicate-update.go | 36 +++++++------- cmd/retention-clear.go | 12 ++--- cmd/retention-info.go | 10 ++-- cmd/retention-set.go | 10 ++-- cmd/sql-main.go | 20 ++++---- cmd/support-proxy-remove.go | 4 +- cmd/support-proxy-set.go | 4 +- cmd/support-proxy-show.go | 6 +-- cmd/support-top-api.go | 6 +-- cmd/support-top-drive.go | 2 +- cmd/support-top-locks.go | 6 +-- cmd/support-top-net.go | 2 +- cmd/support-top-rpc.go | 2 +- cmd/support-top.go | 2 +- cmd/tag-list.go | 14 +++--- cmd/tag-remove.go | 12 ++--- cmd/tag-set.go | 14 +++--- cmd/tree-main.go | 20 ++++---- cmd/typed-errors.go | 2 +- cmd/version-enable.go | 8 ++-- cmd/version-info.go | 2 +- cmd/version-suspend.go | 4 +- cmd/watch-main.go | 18 +++---- 202 files changed, 745 insertions(+), 744 deletions(-) diff --git a/cmd/admin-accesskey-create.go b/cmd/admin-accesskey-create.go index 42629c841d..4f2e93343c 100644 --- a/cmd/admin-accesskey-create.go +++ b/cmd/admin-accesskey-create.go @@ -70,22 +70,22 @@ FLAGS: {{end}} EXAMPLES: 1. Create a new access key pair with the same policy as the authenticated user - {{.Prompt}} {{.HelpName}} myminio/ + {{.Prompt}} {{.HelpName}} mysilo/ 2. Create a new access key pair with custom access key and secret key - {{.Prompt}} {{.HelpName}} myminio/ --access-key myaccesskey --secret-key mysecretkey + {{.Prompt}} {{.HelpName}} mysilo/ --access-key myaccesskey --secret-key mysecretkey 3. Create a new access key pair for user 'tester' that expires in 1 day - {{.Prompt}} {{.HelpName}} myminio/ tester --expiry-duration 24h + {{.Prompt}} {{.HelpName}} mysilo/ tester --expiry-duration 24h 4. Create a new access key pair for authenticated user that expires on 2025-01-01 {{.Prompt}} {{.HelpName}} --expiry 2025-01-01 5. Create a new access key pair for user 'tester' with a custom policy - {{.Prompt}} {{.HelpName}} myminio/ tester --policy /path/to/policy.json + {{.Prompt}} {{.HelpName}} mysilo/ tester --policy /path/to/policy.json 6. Create a new access key pair for user 'tester' with a custom name and description - {{.Prompt}} {{.HelpName}} myminio/ tester --name "Tester's Access Key" --description "Access key for tester" + {{.Prompt}} {{.HelpName}} mysilo/ tester --name "Tester's Access Key" --description "Access key for tester" `, } diff --git a/cmd/admin-accesskey-disable.go b/cmd/admin-accesskey-disable.go index 715f09e827..63a3fdfd69 100644 --- a/cmd/admin-accesskey-disable.go +++ b/cmd/admin-accesskey-disable.go @@ -39,7 +39,7 @@ FLAGS: {{end}} EXAMPLES: 1. Disable access key - {{.Prompt}} {{.HelpName}} myminio myaccesskey + {{.Prompt}} {{.HelpName}} mysilo myaccesskey `, } diff --git a/cmd/admin-accesskey-edit.go b/cmd/admin-accesskey-edit.go index e36df3c186..b994769154 100644 --- a/cmd/admin-accesskey-edit.go +++ b/cmd/admin-accesskey-edit.go @@ -66,9 +66,9 @@ FLAGS: {{end}} EXAMPLES: 1. Change the secret key for the access key "testkey" - {{.Prompt}} {{.HelpName}} myminio/ testkey --secret-key 'xxxxxxx' + {{.Prompt}} {{.HelpName}} mysilo/ testkey --secret-key 'xxxxxxx' 2. Change the expiry duration for the access key "testkey" - {{.Prompt}} {{.HelpName}} myminio/ testkey ---expiry-duration 24h + {{.Prompt}} {{.HelpName}} mysilo/ testkey ---expiry-duration 24h `, } diff --git a/cmd/admin-accesskey-enable.go b/cmd/admin-accesskey-enable.go index 6a1eb2b281..a419ceff1a 100644 --- a/cmd/admin-accesskey-enable.go +++ b/cmd/admin-accesskey-enable.go @@ -39,7 +39,7 @@ FLAGS: {{end}} EXAMPLES: 1. Enable access key - {{.Prompt}} {{.HelpName}} myminio myaccesskey + {{.Prompt}} {{.HelpName}} mysilo myaccesskey `, } diff --git a/cmd/admin-accesskey-list.go b/cmd/admin-accesskey-list.go index 4bcc7efdcb..1e37ead532 100644 --- a/cmd/admin-accesskey-list.go +++ b/cmd/admin-accesskey-list.go @@ -78,14 +78,14 @@ EXAMPLES: 3. Get list of builtin users in local server {{.Prompt}} {{.HelpName}} local/ --all --users-only - 4. Get list of all builtin users and associated temporary access keys in play server (if admin) - {{.Prompt}} {{.HelpName}} play/ --temp-only + 4. Get list of all builtin users and associated temporary access keys in mysilo server (if admin) + {{.Prompt}} {{.HelpName}} mysilo/ --temp-only 5. Get list of access keys associated with user 'foobar' - {{.Prompt}} {{.HelpName}} play/ foobar + {{.Prompt}} {{.HelpName}} mysilo/ foobar 6. Get list of access keys associated with users 'foobar' and 'tester' - {{.Prompt}} {{.HelpName}} play/ foobar tester + {{.Prompt}} {{.HelpName}} mysilo/ foobar tester 7. Get all users and access keys if admin, else get authenticated user and associated access keys {{.Prompt}} {{.HelpName}} local/ diff --git a/cmd/admin-accesskey-sts-revoke.go b/cmd/admin-accesskey-sts-revoke.go index bb4e72f875..eaf2505b7d 100644 --- a/cmd/admin-accesskey-sts-revoke.go +++ b/cmd/admin-accesskey-sts-revoke.go @@ -59,16 +59,16 @@ FLAGS: {{end}} EXAMPLES: 1. Revoke all STS accounts for user "user1" - {{.Prompt}} {{.HelpName}} myminio user1 --all + {{.Prompt}} {{.HelpName}} mysilo user1 --all 2. Revoke STS accounts of a token type "app-1" for user "user1" - {{.Prompt}} {{.HelpName}} myminio user1 --token-type app-1 + {{.Prompt}} {{.HelpName}} mysilo user1 --token-type app-1 3. Revoke all STS accounts for the authenticated user - {{.Prompt}} {{.HelpName}} myminio --self + {{.Prompt}} {{.HelpName}} mysilo --self 4. Revoke STS accounts of a token type "app-1" for the authenticated user - {{.Prompt}} {{.HelpName}} myminio --self --token-type app-1 + {{.Prompt}} {{.HelpName}} mysilo --self --token-type app-1 `, } diff --git a/cmd/admin-accesskey.go b/cmd/admin-accesskey.go index 9db279d1a1..c2376f78ee 100644 --- a/cmd/admin-accesskey.go +++ b/cmd/admin-accesskey.go @@ -32,7 +32,7 @@ var adminAccesskeySubcommands = []cli.Command{ var adminAccesskeyCmd = cli.Command{ Name: "accesskey", - Usage: "manage access keys defined in the MinIO server", + Usage: "manage access keys defined in the Silo/MinIO server", Action: mainAdminAccesskey, Before: setGlobalsFromContext, Flags: globalFlags, diff --git a/cmd/admin-bucket.go b/cmd/admin-bucket.go index dc157da8ef..6d9d0194be 100644 --- a/cmd/admin-bucket.go +++ b/cmd/admin-bucket.go @@ -27,7 +27,7 @@ var adminBucketSubcommands = []cli.Command{ var adminBucketCmd = cli.Command{ Name: "bucket", - Usage: "manage buckets defined in the MinIO server", + Usage: "manage buckets defined in the Silo/MinIO server", Action: mainAdminBucket, Before: setGlobalsFromContext, Flags: globalFlags, diff --git a/cmd/admin-cluster-bucket-export.go b/cmd/admin-cluster-bucket-export.go index 4a59b97916..92495305e8 100644 --- a/cmd/admin-cluster-bucket-export.go +++ b/cmd/admin-cluster-bucket-export.go @@ -52,7 +52,7 @@ FLAGS: {{end}} EXAMPLES: 1. Save metadata of all buckets to a zip file. - {{.Prompt}} {{.HelpName}} myminio + {{.Prompt}} {{.HelpName}} mysilo `, } diff --git a/cmd/admin-cluster-bucket-import.go b/cmd/admin-cluster-bucket-import.go index 6bc82b27a9..4df29acce7 100644 --- a/cmd/admin-cluster-bucket-import.go +++ b/cmd/admin-cluster-bucket-import.go @@ -54,7 +54,7 @@ FLAGS: {{end}} EXAMPLES: 1. Recover bucket metadata for all buckets from previously saved bucket metadata backup. - {{.Prompt}} {{.HelpName}} myminio /backups/myminio-bucket-metadata.zip + {{.Prompt}} {{.HelpName}} mysilo /backups/mysilo-bucket-metadata.zip `, } diff --git a/cmd/admin-cluster-bucket.go b/cmd/admin-cluster-bucket.go index 276ce771a9..3b4f3efae2 100644 --- a/cmd/admin-cluster-bucket.go +++ b/cmd/admin-cluster-bucket.go @@ -26,7 +26,7 @@ var adminClusterBucketSubcommands = []cli.Command{ var adminClusterBucketCmd = cli.Command{ Name: "bucket", - Usage: "manage bucket metadata on MinIO cluster", + Usage: "manage bucket metadata on Silo/MinIO cluster", Action: mainAdminClusterBucket, Before: setGlobalsFromContext, Flags: globalFlags, diff --git a/cmd/admin-cluster-iam-export.go b/cmd/admin-cluster-iam-export.go index ad66537750..196670cfd3 100644 --- a/cmd/admin-cluster-iam-export.go +++ b/cmd/admin-cluster-iam-export.go @@ -61,10 +61,10 @@ FLAGS: {{end}} EXAMPLES: 1. Download all IAM metadata for cluster into zip file. - {{.Prompt}} {{.HelpName}} myminio + {{.Prompt}} {{.HelpName}} mysilo 2. Download all IAM metadata to a custom file. - {{.Prompt}} {{.HelpName}} myminio --output /tmp/myminio-iam.zip + {{.Prompt}} {{.HelpName}} mysilo --output /tmp/mysilo-iam.zip `, } diff --git a/cmd/admin-cluster-iam-import.go b/cmd/admin-cluster-iam-import.go index 96ad8a9701..f2a680d776 100644 --- a/cmd/admin-cluster-iam-import.go +++ b/cmd/admin-cluster-iam-import.go @@ -45,14 +45,14 @@ var adminClusterIAMImportCmd = cli.Command{ {{.HelpName}} - {{.Usage}} USAGE: - {{.HelpName}} [FLAGS] TARGET/BUCKET /path/to/myminio-iam-info.zip + {{.HelpName}} [FLAGS] TARGET/BUCKET /path/to/mysilo-iam-info.zip FLAGS: {{range .VisibleFlags}}{{.}} {{end}} EXAMPLES: 1. Set IAM info from previously exported metadata zip file. - {{.Prompt}} {{.HelpName}} myminio /tmp/myminio-iam-info.zip + {{.Prompt}} {{.HelpName}} mysilo /tmp/mysilo-iam-info.zip `, } diff --git a/cmd/admin-cluster-iam.go b/cmd/admin-cluster-iam.go index 45b12be0e8..eaf521b50e 100644 --- a/cmd/admin-cluster-iam.go +++ b/cmd/admin-cluster-iam.go @@ -26,7 +26,7 @@ var adminClusterIAMSubcommands = []cli.Command{ var adminClusterIAMCmd = cli.Command{ Name: "iam", - Usage: "manage IAM info on MinIO cluster", + Usage: "manage IAM info on Silo/MinIO cluster", Action: mainadminClusterIAM, Before: setGlobalsFromContext, Flags: globalFlags, diff --git a/cmd/admin-cluster.go b/cmd/admin-cluster.go index 89ee5cc6a7..417d880f5c 100644 --- a/cmd/admin-cluster.go +++ b/cmd/admin-cluster.go @@ -26,7 +26,7 @@ var adminClusterSubcommands = []cli.Command{ var adminClusterCmd = cli.Command{ Name: "cluster", - Usage: "manage MinIO cluster metadata", + Usage: "manage Silo/MinIO cluster metadata", Action: mainAdminCluster, Before: setGlobalsFromContext, Flags: globalFlags, diff --git a/cmd/admin-config-export.go b/cmd/admin-config-export.go index d5315ba916..6cd80d006f 100644 --- a/cmd/admin-config-export.go +++ b/cmd/admin-config-export.go @@ -50,8 +50,8 @@ FLAGS: EXAMPLES: The output includes environment variables set on the server. These cannot be overridden from the client. - 1. Export the current config from MinIO server - {{.Prompt}} {{.HelpName}} play/ > config.txt + 1. Export the current config from Silo/MinIO server + {{.Prompt}} {{.HelpName}} mysilo/ > config.txt `, } diff --git a/cmd/admin-config-get.go b/cmd/admin-config-get.go index c63a5bc064..ed946ce1a4 100644 --- a/cmd/admin-config-get.go +++ b/cmd/admin-config-get.go @@ -51,16 +51,16 @@ FLAGS: EXAMPLES: The output includes environment variables set on the server. These cannot be overridden from the client. - 1. Get the current region setting on MinIO server. - {{.Prompt}} {{.HelpName}} play/ region + 1. Get the current region setting on Silo/MinIO server. + {{.Prompt}} {{.HelpName}} mysilo/ region region name=us-east-1 - 2. Get the current notification settings for Webhook target on MinIO server - {{.Prompt}} {{.HelpName}} myminio/ notify_webhook + 2. Get the current notification settings for Webhook target on Silo/MinIO server + {{.Prompt}} {{.HelpName}} mysilo/ notify_webhook notify_webhook endpoint="http://localhost:8080" auth_token= queue_limit=10000 queue_dir="/home/events" - 3. Get the current compression settings on MinIO server - {{.Prompt}} {{.HelpName}} myminio/ compression + 3. Get the current compression settings on Silo/MinIO server + {{.Prompt}} {{.HelpName}} mysilo/ compression compression extensions=".txt,.csv" mime_types="text/*" `, } diff --git a/cmd/admin-config-history.go b/cmd/admin-config-history.go index 1e5cc91861..25010954b1 100644 --- a/cmd/admin-config-history.go +++ b/cmd/admin-config-history.go @@ -59,7 +59,7 @@ FLAGS: {{end}} EXAMPLES: 1. List all history entries sorted by time. - {{.Prompt}} {{.HelpName}} play/ + {{.Prompt}} {{.HelpName}} mysilo/ `, } diff --git a/cmd/admin-config-import.go b/cmd/admin-config-import.go index ecd347bed0..67a2ea27bc 100644 --- a/cmd/admin-config-import.go +++ b/cmd/admin-config-import.go @@ -45,8 +45,8 @@ FLAGS: {{range .VisibleFlags}}{{.}} {{end}} EXAMPLES: - 1. Import the new local config and apply to the MinIO server - {{.Prompt}} {{.HelpName}} play/ < config.txt + 1. Import the new local config and apply to the Silo/MinIO server + {{.Prompt}} {{.HelpName}} mysilo/ < config.txt `, } diff --git a/cmd/admin-config-reset.go b/cmd/admin-config-reset.go index ee8614ff93..718ba4563e 100644 --- a/cmd/admin-config-reset.go +++ b/cmd/admin-config-reset.go @@ -53,11 +53,11 @@ FLAGS: {{end}} EXAMPLES: 1. Reset MQTT notifcation target 'name1' settings to default values. - {{.Prompt}} {{.HelpName}} myminio/ notify_mqtt:name1 + {{.Prompt}} {{.HelpName}} mysilo/ notify_mqtt:name1 2. Reset compression's 'extensions' setting to default value. - {{.Prompt}} {{.HelpName}} myminio/ compression extensions + {{.Prompt}} {{.HelpName}} mysilo/ compression extensions 3. Reset site name and site region to default values. - {{.Prompt}} {{.HelpName}} myminio/ site name region + {{.Prompt}} {{.HelpName}} mysilo/ site name region `, } diff --git a/cmd/admin-config-restore.go b/cmd/admin-config-restore.go index 911349ca17..31457fce46 100644 --- a/cmd/admin-config-restore.go +++ b/cmd/admin-config-restore.go @@ -44,8 +44,8 @@ FLAGS: {{range .VisibleFlags}}{{.}} {{end}} EXAMPLES: - 1. Restore 'restore-id' history key value on MinIO server. - {{.Prompt}} {{.HelpName}} play/ + 1. Restore 'restore-id' history key value on Silo/MinIO server. + {{.Prompt}} {{.HelpName}} mysilo/ `, } diff --git a/cmd/admin-config-set.go b/cmd/admin-config-set.go index 4929513280..5bca1ae035 100644 --- a/cmd/admin-config-set.go +++ b/cmd/admin-config-set.go @@ -46,13 +46,13 @@ FLAGS: {{range .VisibleFlags}}{{.}} {{end}} EXAMPLES: - 1. Enable webhook notification target for MinIO server. - {{.Prompt}} {{.HelpName}} myminio/ notify_webhook endpoint="http://localhost:8080/minio/events" + 1. Enable webhook notification target for Silo/MinIO server. + {{.Prompt}} {{.HelpName}} mysilo/ notify_webhook endpoint="http://localhost:8080/events" - 2. Change region name for the MinIO server to 'us-west-1'. - {{.Prompt}} {{.HelpName}} myminio/ region name=us-west-1 + 2. Change region name for the Silo/MinIO server to 'us-west-1'. + {{.Prompt}} {{.HelpName}} mysilo/ region name=us-west-1 - 3. Change healing settings on a distributed MinIO server setup. + 3. Change healing settings on a distributed Silo/MinIO server setup. {{.Prompt}} {{.HelpName}} mydist/ heal max_delay=300ms max_io=50 `, } diff --git a/cmd/admin-config.go b/cmd/admin-config.go index 7bd53dde28..1b53d75a62 100644 --- a/cmd/admin-config.go +++ b/cmd/admin-config.go @@ -31,7 +31,7 @@ var adminConfigSubcommands = []cli.Command{ var adminConfigCmd = cli.Command{ Name: "config", - Usage: "manage MinIO server configuration", + Usage: "manage Silo/MinIO server configuration", Action: mainAdminConfig, Before: setGlobalsFromContext, Flags: globalFlags, diff --git a/cmd/admin-console.go b/cmd/admin-console.go index c8e8b8fb5e..4d368aa5b5 100644 --- a/cmd/admin-console.go +++ b/cmd/admin-console.go @@ -39,7 +39,7 @@ var adminConsoleFlags = []cli.Flag{ var adminConsoleCmd = cli.Command{ Name: "console", - Usage: "show MinIO logs", + Usage: "show Silo/MinIO logs", Action: mainAdminConsole, OnUsageError: onUsageError, Before: setGlobalsFromContext, diff --git a/cmd/admin-decom-cancel.go b/cmd/admin-decom-cancel.go index 51990993e8..00bd174a92 100644 --- a/cmd/admin-decom-cancel.go +++ b/cmd/admin-decom-cancel.go @@ -46,10 +46,10 @@ FLAGS: {{end}} EXAMPLES: 1. Cancel an ongoing decommissioning of a pool. - {{.Prompt}} {{.HelpName}} myminio/ http://server{5...8}/disk{1...4} + {{.Prompt}} {{.HelpName}} mysilo/ http://server{5...8}/disk{1...4} 2. Cancel all ongoing decommissioning of pools. - {{.Prompt}} {{.HelpName}} myminio/ + {{.Prompt}} {{.HelpName}} mysilo/ `, } diff --git a/cmd/admin-decom-start.go b/cmd/admin-decom-start.go index fed431b6e8..d10cf31096 100644 --- a/cmd/admin-decom-start.go +++ b/cmd/admin-decom-start.go @@ -45,7 +45,7 @@ FLAGS: {{end}} EXAMPLES: 1. Start decommissioning a pool for removal. - {{.Prompt}} {{.HelpName}} myminio/ http://server{5...8}/disk{1...4} + {{.Prompt}} {{.HelpName}} mysilo/ http://server{5...8}/disk{1...4} `, } diff --git a/cmd/admin-decom-status.go b/cmd/admin-decom-status.go index d89fae7bfb..55a5d3ad8c 100644 --- a/cmd/admin-decom-status.go +++ b/cmd/admin-decom-status.go @@ -48,9 +48,9 @@ FLAGS: {{end}} EXAMPLES: 1. Show current decommissioning status. - {{.Prompt}} {{.HelpName}} myminio/ http://server{5...8}/disk{1...4} + {{.Prompt}} {{.HelpName}} mysilo/ http://server{5...8}/disk{1...4} 2. List all current decommissioning status of all pools. - {{.Prompt}} {{.HelpName}} myminio/ + {{.Prompt}} {{.HelpName}} mysilo/ `, } diff --git a/cmd/admin-decom.go b/cmd/admin-decom.go index 9f1f5509d6..9d23f14272 100644 --- a/cmd/admin-decom.go +++ b/cmd/admin-decom.go @@ -30,7 +30,7 @@ var adminDecommissionSubcommands = []cli.Command{ var adminDecommissionCmd = cli.Command{ Name: "decommission", Aliases: []string{"decom"}, - Usage: "manage MinIO server pool decommissioning", + Usage: "manage Silo/MinIO server pool decommissioning", Action: mainAdminDecommission, Before: setGlobalsFromContext, Flags: globalFlags, diff --git a/cmd/admin-group-add.go b/cmd/admin-group-add.go index d90a50e2eb..fc26872ee6 100644 --- a/cmd/admin-group-add.go +++ b/cmd/admin-group-add.go @@ -47,11 +47,11 @@ FLAGS: {{end}} EXAMPLES: 1. Add users 'fivecent' and 'tencent' to the group 'allcents': - {{.Prompt}} {{.HelpName}} myminio allcents fivecent tencent + {{.Prompt}} {{.HelpName}} mysilo allcents fivecent tencent 2. Add user "james" to group "staff", then add the "readwrite" policy to the group "staff". - {{.Prompt}} {{.HelpName}} myminio staff james - {{.Prompt}} mc admin policy attach myminio readwrite --group staff + {{.Prompt}} {{.HelpName}} mysilo staff james + {{.Prompt}} mc admin policy attach mysilo readwrite --group staff `, } diff --git a/cmd/admin-group-disable.go b/cmd/admin-group-disable.go index 41af8bc1d8..68ab38946a 100644 --- a/cmd/admin-group-disable.go +++ b/cmd/admin-group-disable.go @@ -39,6 +39,6 @@ FLAGS: {{end}} EXAMPLES: 1. Disable group 'allcents'. - {{.Prompt}} {{.HelpName}} myminio allcents + {{.Prompt}} {{.HelpName}} mysilo allcents `, } diff --git a/cmd/admin-group-enable.go b/cmd/admin-group-enable.go index 758200f50f..dd2d726cca 100644 --- a/cmd/admin-group-enable.go +++ b/cmd/admin-group-enable.go @@ -43,7 +43,7 @@ FLAGS: {{end}} EXAMPLES: 1. Enable group 'allcents'. - {{.Prompt}} {{.HelpName}} myminio allcents + {{.Prompt}} {{.HelpName}} mysilo allcents `, } diff --git a/cmd/admin-group-info.go b/cmd/admin-group-info.go index d5e0bda95b..6433d20554 100644 --- a/cmd/admin-group-info.go +++ b/cmd/admin-group-info.go @@ -42,7 +42,7 @@ FLAGS: {{end}} EXAMPLES: 1. Get info on group 'allcents'. - {{.Prompt}} {{.HelpName}} myminio allcents + {{.Prompt}} {{.HelpName}} mysilo allcents `, } diff --git a/cmd/admin-group-list.go b/cmd/admin-group-list.go index 4fd3da1fa3..38f6f41550 100644 --- a/cmd/admin-group-list.go +++ b/cmd/admin-group-list.go @@ -43,7 +43,7 @@ FLAGS: {{end}} EXAMPLES: 1. List all groups. - {{.Prompt}} {{.HelpName}} myminio + {{.Prompt}} {{.HelpName}} mysilo `, } diff --git a/cmd/admin-group-remove.go b/cmd/admin-group-remove.go index a2686a1372..b499143690 100644 --- a/cmd/admin-group-remove.go +++ b/cmd/admin-group-remove.go @@ -44,10 +44,10 @@ FLAGS: {{end}} EXAMPLES: 1. Remove members 'tencent' and 'fivecent' from group 'allcents'. - {{.Prompt}} {{.HelpName}} myminio allcents tencent fivecent + {{.Prompt}} {{.HelpName}} mysilo allcents tencent fivecent 2. Remove group 'allcents'. - {{.Prompt}} {{.HelpName}} myminio allcents + {{.Prompt}} {{.HelpName}} mysilo allcents `, } diff --git a/cmd/admin-heal.go b/cmd/admin-heal.go index 1d235976c6..53a5f62b41 100644 --- a/cmd/admin-heal.go +++ b/cmd/admin-heal.go @@ -110,7 +110,7 @@ var adminHealFlags = []cli.Flag{ var adminHealCmd = cli.Command{ Name: "heal", - Usage: "monitor healing for bucket(s) and object(s) on MinIO server", + Usage: "monitor healing for bucket(s) and object(s) on Silo/MinIO server", Action: mainAdminHeal, OnUsageError: onUsageError, Before: setGlobalsFromContext, @@ -126,8 +126,8 @@ FLAGS: {{range .VisibleFlags}}{{.}} {{end}} EXAMPLES: - 1. Monitor healing status on a running server at alias 'myminio': - {{.Prompt}} {{.HelpName}} myminio/ + 1. Monitor healing status on a running server at alias 'mysilo': + {{.Prompt}} {{.HelpName}} mysilo/ `, } diff --git a/cmd/admin-idp.go b/cmd/admin-idp.go index 25171d1041..cfd8b97f47 100644 --- a/cmd/admin-idp.go +++ b/cmd/admin-idp.go @@ -21,7 +21,7 @@ import "github.com/minio/cli" var adminIDPCmd = cli.Command{ Name: "idp", - Usage: "manage MinIO IDentity Provider server configuration", + Usage: "manage Silo/MinIO IDentity Provider server configuration", Action: mainAdminIDP, Before: setGlobalsFromContext, Flags: globalFlags, diff --git a/cmd/admin-info.go b/cmd/admin-info.go index 7f153199cd..9e7ada1437 100644 --- a/cmd/admin-info.go +++ b/cmd/admin-info.go @@ -45,7 +45,7 @@ var adminInfoFlags = []cli.Flag{ var adminInfoCmd = cli.Command{ Name: "info", - Usage: "display MinIO server information", + Usage: "display Silo/MinIO server information", Action: mainAdminInfo, OnUsageError: onUsageError, Before: setGlobalsFromContext, @@ -60,8 +60,8 @@ FLAGS: {{range .VisibleFlags}}{{.}} {{end}} EXAMPLES: - 1. Get server information of the 'play' MinIO server. - {{.Prompt}} {{.HelpName}} play/ + 1. Get server information of the 'mysilo' Silo/MinIO server. + {{.Prompt}} {{.HelpName}} mysilo/ `, } @@ -173,7 +173,7 @@ func (u clusterStruct) String() (msg string) { // Loop through each server and put together info for each one for _, srv := range u.Info.Servers { - // Check if MinIO server is not online ("Mode" field), + // Check if Silo/MinIO server is not online ("Mode" field), if srv.State != string(madmin.ItemOnline) { totalOfflineNodes++ // "PrintB" is color blue in console library package diff --git a/cmd/admin-inspect.go b/cmd/admin-inspect.go index a6ff1558e7..322c2f6268 100644 --- a/cmd/admin-inspect.go +++ b/cmd/admin-inspect.go @@ -23,7 +23,7 @@ import ( var adminInspectCmd = cli.Command{ Name: "inspect", - Usage: "inspect files on MinIO server", + Usage: "inspect files on Silo/MinIO server", Action: mainAdminInspect, OnUsageError: onUsageError, Before: setGlobalsFromContext, diff --git a/cmd/admin-kms-key-create.go b/cmd/admin-kms-key-create.go index 78cad24734..c67dccf737 100644 --- a/cmd/admin-kms-key-create.go +++ b/cmd/admin-kms-key-create.go @@ -46,7 +46,7 @@ FLAGS: {{end}} EXAMPLES: 1. Create a new master key named 'my-key' default master key. - $ {{.HelpName}} play my-key + $ {{.HelpName}} mysilo my-key `, } diff --git a/cmd/admin-kms-key-list.go b/cmd/admin-kms-key-list.go index 30607338b4..d622db0df5 100644 --- a/cmd/admin-kms-key-list.go +++ b/cmd/admin-kms-key-list.go @@ -47,8 +47,8 @@ FLAGS: {{range .VisibleFlags}}{{.}} {{end}} EXAMPLES: - 1. Get list of master keys from a MinIO server/cluster. - $ {{.HelpName}} play + 1. Get list of master keys from a Silo/MinIO server/cluster. + $ {{.HelpName}} mysilo `, } diff --git a/cmd/admin-kms-key-status.go b/cmd/admin-kms-key-status.go index 6d63295a94..bf84f82506 100644 --- a/cmd/admin-kms-key-status.go +++ b/cmd/admin-kms-key-status.go @@ -44,10 +44,10 @@ FLAGS: {{range .VisibleFlags}}{{.}} {{end}} EXAMPLES: - 1. Get default master key and its status from a MinIO server/cluster. - $ {{.HelpName}} play - 2. Get the status of one particular master key from a MinIO server/cluster. - $ {{.HelpName}} play my-master-key + 1. Get default master key and its status from a Silo/MinIO server/cluster. + $ {{.HelpName}} mysilo + 2. Get the status of one particular master key from a Silo/MinIO server/cluster. + $ {{.HelpName}} mysilo my-master-key `, } diff --git a/cmd/admin-logs.go b/cmd/admin-logs.go index 72270d5a57..53754aa547 100644 --- a/cmd/admin-logs.go +++ b/cmd/admin-logs.go @@ -48,7 +48,7 @@ var logsShowFlags = []cli.Flag{ var adminLogsCmd = cli.Command{ Name: "logs", - Usage: "show MinIO logs", + Usage: "show Silo/MinIO logs", OnUsageError: onUsageError, Action: mainAdminLogs, Before: setGlobalsFromContext, @@ -62,12 +62,12 @@ FLAGS: {{range .VisibleFlags}}{{.}} {{end}} EXAMPLES: - 1. Show logs for a MinIO server with alias 'myminio' - {{.Prompt}} {{.HelpName}} myminio - 2. Show last 5 log entries for node 'node1' for a MinIO server with alias 'myminio' - {{.Prompt}} {{.HelpName}} --last 5 myminio node1 - 3. Show application errors in logs for a MinIO server with alias 'myminio' - {{.Prompt}} {{.HelpName}} --type application myminio + 1. Show logs for a Silo/MinIO server with alias 'mysilo' + {{.Prompt}} {{.HelpName}} mysilo + 2. Show last 5 log entries for node 'node1' for a Silo/MinIO server with alias 'mysilo' + {{.Prompt}} {{.HelpName}} --last 5 mysilo node1 + 3. Show application errors in logs for a Silo/MinIO server with alias 'mysilo' + {{.Prompt}} {{.HelpName}} --type application mysilo `, } diff --git a/cmd/admin-main.go b/cmd/admin-main.go index af237b5374..c2bed0b8bf 100644 --- a/cmd/admin-main.go +++ b/cmd/admin-main.go @@ -61,7 +61,7 @@ var adminCmdSubcommands = []cli.Command{ var adminCmd = cli.Command{ Name: "admin", - Usage: "manage MinIO servers", + Usage: "manage Silo/MinIO servers", Action: mainAdmin, Subcommands: adminCmdSubcommands, HideHelpCommand: true, diff --git a/cmd/admin-policy-attach.go b/cmd/admin-policy-attach.go index de58277757..226091b04d 100644 --- a/cmd/admin-policy-attach.go +++ b/cmd/admin-policy-attach.go @@ -54,16 +54,16 @@ USAGE: Exactly one of --user or --group is required. POLICY: - Name of the policy on the MinIO server. + Name of the policy on the Silo/MinIO server. FLAGS: {{range .VisibleFlags}}{{.}} {{end}} EXAMPLES: 1. Attach the "readonly" policy to user "james". - {{.Prompt}} {{.HelpName}} myminio readonly --user james + {{.Prompt}} {{.HelpName}} mysilo readonly --user james 2. Attach the "audit-policy" and "acct-policy" policies to group "legal". - {{.Prompt}} {{.HelpName}} myminio audit-policy acct-policy --group legal + {{.Prompt}} {{.HelpName}} mysilo audit-policy acct-policy --group legal `, } diff --git a/cmd/admin-policy-create.go b/cmd/admin-policy-create.go index de1b5a1098..20b67edb74 100644 --- a/cmd/admin-policy-create.go +++ b/cmd/admin-policy-create.go @@ -43,7 +43,7 @@ USAGE: {{.HelpName}} TARGET POLICYNAME POLICYFILE POLICYNAME: - Name of the canned policy on MinIO server. + Name of the canned policy on Silo/MinIO server. POLICYFILE: Name of the policy file associated with the policy name. @@ -53,7 +53,7 @@ FLAGS: {{end}} EXAMPLES: 1. Create a new canned policy 'writeonly'. - {{.Prompt}} {{.HelpName}} myminio writeonly /tmp/writeonly.json + {{.Prompt}} {{.HelpName}} mysilo writeonly /tmp/writeonly.json `, } diff --git a/cmd/admin-policy-detach.go b/cmd/admin-policy-detach.go index 6a0edb0dc6..de0012b326 100644 --- a/cmd/admin-policy-detach.go +++ b/cmd/admin-policy-detach.go @@ -48,16 +48,16 @@ USAGE: Exactly one of --user or --group is required. POLICY: - Name of the policy on the MinIO server. + Name of the policy on the Silo/MinIO server. FLAGS: {{range .VisibleFlags}}{{.}} {{end}} EXAMPLES: 1. Detach the "readonly" policy from user "james". - {{.Prompt}} {{.HelpName}} myminio readonly --user james + {{.Prompt}} {{.HelpName}} mysilo readonly --user james 2. Detach the "audit-policy" and "acct-policy" policies from group "legal". - {{.Prompt}} {{.HelpName}} myminio audit-policy acct-policy --group legal + {{.Prompt}} {{.HelpName}} mysilo audit-policy acct-policy --group legal `, } diff --git a/cmd/admin-policy-entities.go b/cmd/admin-policy-entities.go index 8f17fb88ee..7a6def45f9 100644 --- a/cmd/admin-policy-entities.go +++ b/cmd/admin-policy-entities.go @@ -56,15 +56,15 @@ FLAGS: {{end}} EXAMPLES: 1. List all entities associated with all policies - {{.Prompt}} {{.HelpName}} play/ + {{.Prompt}} {{.HelpName}} mysilo/ 2. List all entities associated with the policies 'finteam-policy' and 'mlteam-policy' - {{.Prompt}} {{.HelpName}} play/ --policy finteam-policy --policy mlteam-policy + {{.Prompt}} {{.HelpName}} mysilo/ --policy finteam-policy --policy mlteam-policy 3. List all policies associated with a pair of user entities - {{.Prompt}} {{.HelpName}} play/ --user bob --user james + {{.Prompt}} {{.HelpName}} mysilo/ --user bob --user james 4. List all policies associated with a pair of group entities - {{.Prompt}} {{.HelpName}} play/ --group auditors --group accounting + {{.Prompt}} {{.HelpName}} mysilo/ --group auditors --group accounting 5. List all entities associated with a policy, group and user - {{.Prompt}} {{.HelpName}} play/ \ + {{.Prompt}} {{.HelpName}} mysilo/ \ --policy finteam-policy --user bobfisher --group consulting `, } diff --git a/cmd/admin-policy-info.go b/cmd/admin-policy-info.go index cf46cac2b6..2d6c959bbd 100644 --- a/cmd/admin-policy-info.go +++ b/cmd/admin-policy-info.go @@ -48,17 +48,17 @@ USAGE: {{.HelpName}} TARGET POLICYNAME [OPTIONS...] POLICYNAME: - Name of the policy on the MinIO server. + Name of the policy on the Silo/MinIO server. FLAGS: {{range .VisibleFlags}}{{.}} {{end}} EXAMPLES: 1. Show information on a given policy. - {{.Prompt}} {{.HelpName}} myminio writeonly + {{.Prompt}} {{.HelpName}} mysilo writeonly 2. Show information on a given policy and write the policy JSON content to /tmp/policy.json. - {{.Prompt}} {{.HelpName}} myminio writeonly --policy-file /tmp/policy.json + {{.Prompt}} {{.HelpName}} mysilo writeonly --policy-file /tmp/policy.json `, } diff --git a/cmd/admin-policy-list.go b/cmd/admin-policy-list.go index db6de07493..34105cc650 100644 --- a/cmd/admin-policy-list.go +++ b/cmd/admin-policy-list.go @@ -42,8 +42,8 @@ FLAGS: {{range .VisibleFlags}}{{.}} {{end}} EXAMPLES: - 1. List all policies on MinIO server. - {{.Prompt}} {{.HelpName}} myminio + 1. List all policies on Silo/MinIO server. + {{.Prompt}} {{.HelpName}} mysilo `, } diff --git a/cmd/admin-policy-remove.go b/cmd/admin-policy-remove.go index 787fa4dece..b03a5dbf00 100644 --- a/cmd/admin-policy-remove.go +++ b/cmd/admin-policy-remove.go @@ -39,14 +39,14 @@ USAGE: {{.HelpName}} TARGET POLICYNAME POLICYNAME: - Name of the canned policy on MinIO server. + Name of the canned policy on Silo/MinIO server. FLAGS: {{range .VisibleFlags}}{{.}} {{end}} EXAMPLES: - 1. Remove 'writeonly' policy on MinIO server. - {{.Prompt}} {{.HelpName}} myminio writeonly + 1. Remove 'writeonly' policy on Silo/MinIO server. + {{.Prompt}} {{.HelpName}} mysilo writeonly `, } diff --git a/cmd/admin-policy.go b/cmd/admin-policy.go index 8f14f9b784..bcff2409cd 100644 --- a/cmd/admin-policy.go +++ b/cmd/admin-policy.go @@ -35,7 +35,7 @@ var adminPolicySubcommands = []cli.Command{ var adminPolicyCmd = cli.Command{ Name: "policy", - Usage: "manage policies defined in the MinIO server", + Usage: "manage policies defined in the Silo/MinIO server", Action: mainAdminPolicy, Before: setGlobalsFromContext, Flags: globalFlags, diff --git a/cmd/admin-prometheus-generate.go b/cmd/admin-prometheus-generate.go index 64faf5fd14..b1b3209b24 100644 --- a/cmd/admin-prometheus-generate.go +++ b/cmd/admin-prometheus-generate.go @@ -65,59 +65,59 @@ FLAGS: {{end}} EXAMPLES (v3): 1. Generate a default prometheus config. - {{.Prompt}} {{.HelpName}} play --api-version v3 + {{.Prompt}} {{.HelpName}} mysilo --api-version v3 2. Generate prometheus config for api metrics. - {{.Prompt}} {{.HelpName}} play api --api-version v3 + {{.Prompt}} {{.HelpName}} mysilo api --api-version v3 3. Generate prometheus config for api metrics of bucket 'mybucket'. - {{.Prompt}} {{.HelpName}} play api --bucket mybucket --api-version v3 + {{.Prompt}} {{.HelpName}} mysilo api --bucket mybucket --api-version v3 4. Generate prometheus config for system metrics. - {{.Prompt}} {{.HelpName}} play system --api-version v3 + {{.Prompt}} {{.HelpName}} mysilo system --api-version v3 5. Generate prometheus config for debug metrics. - {{.Prompt}} {{.HelpName}} play debug --api-version v3 + {{.Prompt}} {{.HelpName}} mysilo debug --api-version v3 6. Generate prometheus config for cluster metrics. - {{.Prompt}} {{.HelpName}} play cluster --api-version v3 + {{.Prompt}} {{.HelpName}} mysilo cluster --api-version v3 7. Generate prometheus config for ilm metrics. - {{.Prompt}} {{.HelpName}} play ilm --api-version v3 + {{.Prompt}} {{.HelpName}} mysilo ilm --api-version v3 8. Generate prometheus config for audit metrics. - {{.Prompt}} {{.HelpName}} play audit --api-version v3 + {{.Prompt}} {{.HelpName}} mysilo audit --api-version v3 9. Generate prometheus config for logger metrics. - {{.Prompt}} {{.HelpName}} play logger --api-version v3 + {{.Prompt}} {{.HelpName}} mysilo logger --api-version v3 10. Generate prometheus config for replication metrics. - {{.Prompt}} {{.HelpName}} play replication --api-version v3 + {{.Prompt}} {{.HelpName}} mysilo replication --api-version v3 11. Generate prometheus config for replication metrics of bucket 'mybucket'. - {{.Prompt}} {{.HelpName}} play replication --bucket mybucket --api-version v3 + {{.Prompt}} {{.HelpName}} mysilo replication --bucket mybucket --api-version v3 12. Generate prometheus config for notification metrics. - {{.Prompt}} {{.HelpName}} play notification --api-version v3 + {{.Prompt}} {{.HelpName}} mysilo notification --api-version v3 13. Generate prometheus config for scanner metrics. - {{.Prompt}} {{.HelpName}} play scanner --api-version v3 + {{.Prompt}} {{.HelpName}} mysilo scanner --api-version v3 EXAMPLES (v2): 1. Generate a default prometheus config. - {{.Prompt}} {{.HelpName}} play + {{.Prompt}} {{.HelpName}} mysilo 2. Generate prometheus config for node metrics. - {{.Prompt}} {{.HelpName}} play node + {{.Prompt}} {{.HelpName}} mysilo node 3. Generate prometheus config for bucket metrics. - {{.Prompt}} {{.HelpName}} play bucket + {{.Prompt}} {{.HelpName}} mysilo bucket 4. Generate prometheus config for resource metrics. - {{.Prompt}} {{.HelpName}} play resource + {{.Prompt}} {{.HelpName}} mysilo resource 5. Generate prometheus config for cluster metrics. - {{.Prompt}} {{.HelpName}} play cluster + {{.Prompt}} {{.HelpName}} mysilo cluster `, } diff --git a/cmd/admin-prometheus-metrics.go b/cmd/admin-prometheus-metrics.go index 5f9654eeaa..6b0b407ed8 100644 --- a/cmd/admin-prometheus-metrics.go +++ b/cmd/admin-prometheus-metrics.go @@ -63,53 +63,53 @@ FLAGS: {{end}} EXAMPLES (v3): 1. API metrics - {{.Prompt}} {{.HelpName}} play api --api-version v3 + {{.Prompt}} {{.HelpName}} mysilo api --api-version v3 2. API metrics for the bucket 'mybucket' - {{.Prompt}} {{.HelpName}} play api --bucket mybucket --api-version v3 + {{.Prompt}} {{.HelpName}} mysilo api --bucket mybucket --api-version v3 3. System metrics - {{.Prompt}} {{.HelpName}} play system --api-version v3 + {{.Prompt}} {{.HelpName}} mysilo system --api-version v3 4. Debug metrics - {{.Prompt}} {{.HelpName}} play debug --api-version v3 + {{.Prompt}} {{.HelpName}} mysilo debug --api-version v3 5. Cluster metrics - {{.Prompt}} {{.HelpName}} play cluster --api-version v3 + {{.Prompt}} {{.HelpName}} mysilo cluster --api-version v3 6. ILM metrics - {{.Prompt}} {{.HelpName}} play ilm --api-version v3 + {{.Prompt}} {{.HelpName}} mysilo ilm --api-version v3 7. Audit metrics - {{.Prompt}} {{.HelpName}} play audit --api-version v3 + {{.Prompt}} {{.HelpName}} mysilo audit --api-version v3 8. Logger metrics - {{.Prompt}} {{.HelpName}} play logger --api-version v3 + {{.Prompt}} {{.HelpName}} mysilo logger --api-version v3 9. Replication metrics - {{.Prompt}} {{.HelpName}} play replication --api-version v3 + {{.Prompt}} {{.HelpName}} mysilo replication --api-version v3 10. Replication metrics for the bucket 'mybucket' - {{.Prompt}} {{.HelpName}} play replication --bucket mybucket --api-version v3 + {{.Prompt}} {{.HelpName}} mysilo replication --bucket mybucket --api-version v3 11. Notification metrics - {{.Prompt}} {{.HelpName}} play notification --api-version v3 + {{.Prompt}} {{.HelpName}} mysilo notification --api-version v3 12. Scanner metrics - {{.Prompt}} {{.HelpName}} play scanner --api-version v3 + {{.Prompt}} {{.HelpName}} mysilo scanner --api-version v3 EXAMPLES (v2): 1. Metrics reported cluster wide. - {{.Prompt}} {{.HelpName}} play + {{.Prompt}} {{.HelpName}} mysilo 2. Metrics reported at node level. - {{.Prompt}} {{.HelpName}} play node + {{.Prompt}} {{.HelpName}} mysilo node 3. Metrics reported at bucket level. - {{.Prompt}} {{.HelpName}} play bucket + {{.Prompt}} {{.HelpName}} mysilo bucket 4. Resource metrics. - {{.Prompt}} {{.HelpName}} play resource + {{.Prompt}} {{.HelpName}} mysilo resource `, } diff --git a/cmd/admin-rebalance-main.go b/cmd/admin-rebalance-main.go index 14db042ee1..ce2e743adc 100644 --- a/cmd/admin-rebalance-main.go +++ b/cmd/admin-rebalance-main.go @@ -27,7 +27,7 @@ var adminRebalanceSubcommands = []cli.Command{ var adminRebalanceCmd = cli.Command{ Name: "rebalance", - Usage: "Manage MinIO rebalance", + Usage: "Manage Silo/MinIO rebalance", Action: mainAdminRebalance, Before: setGlobalsFromContext, Flags: globalFlags, diff --git a/cmd/admin-rebalance-start.go b/cmd/admin-rebalance-start.go index 7761ed2e11..997df8d0a4 100644 --- a/cmd/admin-rebalance-start.go +++ b/cmd/admin-rebalance-start.go @@ -44,8 +44,8 @@ FLAGS: {{range .VisibleFlags}}{{.}} {{end}} xEXAMPLES: - 1. Start rebalance on a MinIO deployment with alias myminio - {{.Prompt}} {{.HelpName}} myminio + 1. Start rebalance on a Silo/MinIO deployment with alias mysilo + {{.Prompt}} {{.HelpName}} mysilo `, } diff --git a/cmd/admin-rebalance-status.go b/cmd/admin-rebalance-status.go index 9102823e31..b869176a05 100644 --- a/cmd/admin-rebalance-status.go +++ b/cmd/admin-rebalance-status.go @@ -47,8 +47,8 @@ FLAGS: {{range .VisibleFlags}}{{.}} {{end}} EXAMPLES: - 1. Summarize ongoing rebalance on a MinIO deployment with alias myminio - {{.Prompt}} {{.HelpName}} myminio + 1. Summarize ongoing rebalance on a Silo/MinIO deployment with alias mysilo + {{.Prompt}} {{.HelpName}} mysilo `, } diff --git a/cmd/admin-rebalance-stop.go b/cmd/admin-rebalance-stop.go index d09d48d5b8..26e7aace65 100644 --- a/cmd/admin-rebalance-stop.go +++ b/cmd/admin-rebalance-stop.go @@ -44,8 +44,8 @@ FLAGS: {{range .VisibleFlags}}{{.}} {{end}} EXAMPLES: - 1. Stop an ongoing rebalance on a MinIO deployment with alias myminio - {{.Prompt}} {{.HelpName}} myminio + 1. Stop an ongoing rebalance on a Silo/MinIO deployment with alias mysilo + {{.Prompt}} {{.HelpName}} mysilo `, } diff --git a/cmd/admin-replicate-add.go b/cmd/admin-replicate-add.go index 973ae1e335..7bf9d424fe 100644 --- a/cmd/admin-replicate-add.go +++ b/cmd/admin-replicate-add.go @@ -54,10 +54,10 @@ FLAGS: EXAMPLES: 1. Add a site for cluster-level replication: - {{.Prompt}} {{.HelpName}} minio1 minio2 + {{.Prompt}} {{.HelpName}} silo1 silo2 2. Add a site for cluster-level replication with replication of ILM expiry rules: - {{.Prompt}} {{.HelpName}} minio1 minio2 --replicate-ilm-expiry + {{.Prompt}} {{.HelpName}} silo1 silo2 --replicate-ilm-expiry `, } diff --git a/cmd/admin-replicate-info.go b/cmd/admin-replicate-info.go index 4460a484e4..37e7f43bc6 100644 --- a/cmd/admin-replicate-info.go +++ b/cmd/admin-replicate-info.go @@ -50,7 +50,7 @@ FLAGS: EXAMPLES: 1. Get Site Replication information: - {{.Prompt}} {{.HelpName}} minio1 + {{.Prompt}} {{.HelpName}} silo1 `, } diff --git a/cmd/admin-replicate-remove.go b/cmd/admin-replicate-remove.go index 51d2761da1..3a440eb080 100644 --- a/cmd/admin-replicate-remove.go +++ b/cmd/admin-replicate-remove.go @@ -60,10 +60,10 @@ FLAGS: EXAMPLES: 1. Remove site replication for all sites: - {{.Prompt}} {{.HelpName}} minio2 --all --force + {{.Prompt}} {{.HelpName}} silo2 --all --force - 2. Remove site replication for site with site names alpha, baker from active cluster minio2: - {{.Prompt}} {{.HelpName}} minio2 alpha baker --force + 2. Remove site replication for site with site names alpha, baker from active cluster silo2: + {{.Prompt}} {{.HelpName}} silo2 alpha baker --force `, } diff --git a/cmd/admin-replicate-resync-cancel.go b/cmd/admin-replicate-resync-cancel.go index 852ebedb3b..7a61078b00 100644 --- a/cmd/admin-replicate-resync-cancel.go +++ b/cmd/admin-replicate-resync-cancel.go @@ -47,8 +47,8 @@ FLAGS: {{end}} EXAMPLES: - 1. Cancel ongoing resync of bucket data from minio1 to minio2 - {{.Prompt}} {{.HelpName}} minio1 minio2 + 1. Cancel ongoing resync of bucket data from silo1 to silo2 + {{.Prompt}} {{.HelpName}} silo1 silo2 `, } diff --git a/cmd/admin-replicate-resync-start.go b/cmd/admin-replicate-resync-start.go index f3a31e93dc..309077742b 100644 --- a/cmd/admin-replicate-resync-start.go +++ b/cmd/admin-replicate-resync-start.go @@ -48,8 +48,8 @@ FLAGS: {{end}} EXAMPLES: - 1. Resync bucket data from minio1 to minio2 - {{.Prompt}} {{.HelpName}} minio1 minio2 + 1. Resync bucket data from silo1 to silo2 + {{.Prompt}} {{.HelpName}} silo1 silo2 `, } diff --git a/cmd/admin-replicate-resync-status.go b/cmd/admin-replicate-resync-status.go index 5f0f0e4699..b504dd0acf 100644 --- a/cmd/admin-replicate-resync-status.go +++ b/cmd/admin-replicate-resync-status.go @@ -54,8 +54,8 @@ FLAGS: {{end}} EXAMPLES: - 1. Display status of resync from minio1 to minio2 - {{.Prompt}} {{.HelpName}} minio1 minio2 + 1. Display status of resync from silo1 to silo2 + {{.Prompt}} {{.HelpName}} silo1 silo2 `, } diff --git a/cmd/admin-replicate-status.go b/cmd/admin-replicate-status.go index 5bad53f65c..854b31553a 100644 --- a/cmd/admin-replicate-status.go +++ b/cmd/admin-replicate-status.go @@ -107,16 +107,16 @@ FLAGS: EXAMPLES: 1. Display overall site replication status: - {{.Prompt}} {{.HelpName}} minio1 + {{.Prompt}} {{.HelpName}} silo1 2. Display site replication status of buckets across sites - {{.Prompt}} {{.HelpName}} minio1 --buckets + {{.Prompt}} {{.HelpName}} silo1 --buckets 3. Drill down and view site replication status of bucket "bucket" - {{.Prompt}} {{.HelpName}} minio1 --bucket bucket + {{.Prompt}} {{.HelpName}} silo1 --bucket bucket 4. Drill down and view site replication status of user "foo" - {{.Prompt}} {{.HelpName}} minio1 --user foo + {{.Prompt}} {{.HelpName}} silo1 --user foo `, } diff --git a/cmd/admin-replicate-update.go b/cmd/admin-replicate-update.go index 7eb5dfed1c..a1eef087ba 100644 --- a/cmd/admin-replicate-update.go +++ b/cmd/admin-replicate-update.go @@ -84,16 +84,16 @@ FLAGS: EXAMPLES: 1. Edit a site endpoint participating in cluster-level replication: - {{.Prompt}} {{.HelpName}} myminio --deployment-id c1758167-4426-454f-9aae-5c3dfdf6df64 --endpoint https://minio2:9000 + {{.Prompt}} {{.HelpName}} mysilo --deployment-id c1758167-4426-454f-9aae-5c3dfdf6df64 --endpoint https://silo2:9000 - 2. Set default bucket bandwidth limit for replication from myminio to the peer cluster with deployment-id c1758167-4426-454f-9aae-5c3dfdf6df64 - {{.Prompt}} {{.HelpName}} myminio --deployment-id c1758167-4426-454f-9aae-5c3dfdf6df64 --bucket-bandwidth "2G" + 2. Set default bucket bandwidth limit for replication from mysilo to the peer cluster with deployment-id c1758167-4426-454f-9aae-5c3dfdf6df64 + {{.Prompt}} {{.HelpName}} mysilo --deployment-id c1758167-4426-454f-9aae-5c3dfdf6df64 --bucket-bandwidth "2G" 3. Disable replication of ILM expiry in cluster-level replication: - {{.Prompt}} {{.HelpName}} myminio --disable-ilm-expiry-replication + {{.Prompt}} {{.HelpName}} mysilo --disable-ilm-expiry-replication 4. Enable replication of ILM expiry in cluster-level replication: - {{.Prompt}} {{.HelpName}} myminio --enable-ilm-expiry-replication + {{.Prompt}} {{.HelpName}} mysilo --enable-ilm-expiry-replication `, } diff --git a/cmd/admin-replicate.go b/cmd/admin-replicate.go index 42ff76e18c..ca6f54764a 100644 --- a/cmd/admin-replicate.go +++ b/cmd/admin-replicate.go @@ -30,7 +30,7 @@ var adminReplicateSubcommands = []cli.Command{ var adminReplicateCmd = cli.Command{ Name: "replicate", - Usage: "manage MinIO site replication", + Usage: "manage Silo/MinIO site replication", Action: mainAdminReplicate, Before: setGlobalsFromContext, Flags: globalFlags, diff --git a/cmd/admin-scanner-status.go b/cmd/admin-scanner-status.go index 48f8b55d85..944848d0c5 100644 --- a/cmd/admin-scanner-status.go +++ b/cmd/admin-scanner-status.go @@ -78,7 +78,7 @@ var adminScannerInfo = cli.Command{ Name: "status", Aliases: []string{"info"}, HiddenAliases: true, - Usage: "summarize scanner events on MinIO server in real-time", + Usage: "summarize scanner events on Silo/MinIO server in real-time", Action: mainAdminScannerInfo, OnUsageError: onUsageError, Before: setGlobalsFromContext, @@ -95,7 +95,7 @@ FLAGS: {{end}} EXAMPLES: 1. Display current in-progress all scanner operations. - {{.Prompt}} {{.HelpName}} myminio/ + {{.Prompt}} {{.HelpName}} mysilo/ `, } diff --git a/cmd/admin-scanner-trace.go b/cmd/admin-scanner-trace.go index d27c2599cf..ab65ff3569 100644 --- a/cmd/admin-scanner-trace.go +++ b/cmd/admin-scanner-trace.go @@ -64,7 +64,7 @@ var adminScannerTraceFlags = []cli.Flag{ var adminScannerTraceCmd = cli.Command{ Name: "trace", - Usage: "show trace for MinIO scanner operations", + Usage: "show trace for Silo/MinIO scanner operations", Action: mainAdminScannerTrace, OnUsageError: onUsageError, Before: setGlobalsFromContext, @@ -88,26 +88,26 @@ UNITS also accepted. Without suffixes the unit is bytes. EXAMPLES: - 1. Show scanner trace for MinIO server - {{.Prompt}} {{.HelpName}} myminio + 1. Show scanner trace for Silo/MinIO server + {{.Prompt}} {{.HelpName}} mysilo 2. Show scanner trace for a specific path - {{.Prompt}} {{.HelpName}} --path my-bucket/my-prefix/* myminio + {{.Prompt}} {{.HelpName}} --path my-bucket/my-prefix/* mysilo 3. Show trace for only ScanObject operations - {{.Prompt}} {{.HelpName}} --funcname=scanner.ScanObject myminio + {{.Prompt}} {{.HelpName}} --funcname=scanner.ScanObject mysilo 4. Avoid printing replication related S3 requests - {{.Prompt}} {{.HelpName}} --request-header '!X-Minio-Source' myminio + {{.Prompt}} {{.HelpName}} --request-header '!X-Minio-Source' mysilo 5. Show trace only for ScanObject operations request bytes greater than 1MB - {{.Prompt}} {{.HelpName}} --filter-request --filter-size 1MB myminio + {{.Prompt}} {{.HelpName}} --filter-request --filter-size 1MB mysilo 6. Show trace only for ScanObject operations response bytes greater than 1MB - {{.Prompt}} {{.HelpName}} --filter-response --filter-size 1MB myminio + {{.Prompt}} {{.HelpName}} --filter-response --filter-size 1MB mysilo 7. Show trace only for requests operations duration greater than 5ms - {{.Prompt}} {{.HelpName}} --response-duration 5ms myminio + {{.Prompt}} {{.HelpName}} --response-duration 5ms mysilo `, } diff --git a/cmd/admin-scanner.go b/cmd/admin-scanner.go index ad95ff958b..063e257939 100644 --- a/cmd/admin-scanner.go +++ b/cmd/admin-scanner.go @@ -26,7 +26,7 @@ var adminScannerSubcommands = []cli.Command{ var adminScannerCmd = cli.Command{ Name: "scanner", - Usage: "provide MinIO scanner info", + Usage: "provide Silo/MinIO scanner info", Action: mainAdminScanner, Before: setGlobalsFromContext, Flags: globalFlags, diff --git a/cmd/admin-service-freeze.go b/cmd/admin-service-freeze.go index cd328a8f4a..a036a9527c 100644 --- a/cmd/admin-service-freeze.go +++ b/cmd/admin-service-freeze.go @@ -27,7 +27,7 @@ import ( var adminServiceFreezeCmd = cli.Command{ Name: "freeze", - Usage: "freeze S3 API calls on MinIO cluster", + Usage: "freeze S3 API calls on Silo/MinIO cluster", Action: mainAdminServiceFreeze, OnUsageError: onUsageError, Before: setGlobalsFromContext, @@ -43,8 +43,8 @@ FLAGS: {{range .VisibleFlags}}{{.}} {{end}} EXAMPLES: - 1. Freeze all S3 API calls on MinIO server at 'myminio/'. - {{.Prompt}} {{.HelpName}} myminio/ + 1. Freeze all S3 API calls on Silo/MinIO server at 'mysilo/'. + {{.Prompt}} {{.HelpName}} mysilo/ `, } @@ -89,7 +89,7 @@ func mainAdminServiceFreeze(ctx *cli.Context) error { client, err := newAdminClient(aliasedURL) fatalIf(err, "Unable to initialize admin connection.") - // Freeze the specified MinIO server + // Freeze the specified Silo/MinIO server fatalIf(probe.NewError(client.ServiceFreezeV2(globalContext)), "Unable to freeze the server.") // Success.. diff --git a/cmd/admin-service-restart.go b/cmd/admin-service-restart.go index 63f30a854d..cbd3e1963a 100644 --- a/cmd/admin-service-restart.go +++ b/cmd/admin-service-restart.go @@ -48,7 +48,7 @@ var serviceRestartFlag = []cli.Flag{ var adminServiceRestartCmd = cli.Command{ Name: "restart", - Usage: "restart a MinIO cluster", + Usage: "restart a Silo/MinIO cluster", Action: mainAdminServiceRestart, OnUsageError: onUsageError, Before: setGlobalsFromContext, @@ -63,8 +63,8 @@ FLAGS: {{range .VisibleFlags}}{{.}} {{end}} EXAMPLES: - 1. Restart MinIO server represented by its alias 'play'. - {{.Prompt}} {{.HelpName}} play/ + 1. Restart Silo/MinIO server represented by its alias 'mysilo'. + {{.Prompt}} {{.HelpName}} mysilo/ `, } @@ -262,7 +262,7 @@ func mainAdminServiceRestart(ctx *cli.Context) error { go func() { t := time.Now() - // Restart the specified MinIO server + // Restart the specified Silo/MinIO server result, e := client.ServiceAction(ctxt, madmin.ServiceActionOpts{ Action: madmin.ServiceActionRestart, DryRun: ctx.Bool("dry-run"), @@ -304,7 +304,7 @@ func mainAdminServiceRestart(ctx *cli.Context) error { for { healthCtx, healthCancel := context.WithTimeout(ctxt, 2*time.Second) - // Fetch the health status of the specified MinIO server + // Fetch the health status of the specified Silo/MinIO server healthResult, healthErr := anonClient.Healthy(healthCtx, madmin.HealthOpts{}) healthCancel() diff --git a/cmd/admin-service-stop.go b/cmd/admin-service-stop.go index 7ff93a8a06..61a3136e27 100644 --- a/cmd/admin-service-stop.go +++ b/cmd/admin-service-stop.go @@ -27,7 +27,7 @@ import ( var adminServiceStopCmd = cli.Command{ Name: "stop", - Usage: "stop a MinIO cluster", + Usage: "stop a Silo/MinIO cluster", Action: mainAdminServiceStop, OnUsageError: onUsageError, Before: setGlobalsFromContext, @@ -43,8 +43,8 @@ FLAGS: {{range .VisibleFlags}}{{.}} {{end}} EXAMPLES: - 1. Stop MinIO server represented by its alias 'play'. - {{.Prompt}} {{.HelpName}} play/ + 1. Stop Silo/MinIO server represented by its alias 'mysilo'. + {{.Prompt}} {{.HelpName}} mysilo/ `, } @@ -88,7 +88,7 @@ func mainAdminServiceStop(ctx *cli.Context) error { client, err := newAdminClient(aliasedURL) fatalIf(err, "Unable to initialize admin connection.") - // Stop the specified MinIO server + // Stop the specified Silo/MinIO server fatalIf(probe.NewError(client.ServiceStopV2(globalContext)), "Unable to stop the server.") // Success.. diff --git a/cmd/admin-service-unfreeze.go b/cmd/admin-service-unfreeze.go index 0f50f1399c..f16ed80d37 100644 --- a/cmd/admin-service-unfreeze.go +++ b/cmd/admin-service-unfreeze.go @@ -29,7 +29,7 @@ import ( var adminServiceUnfreezeCmd = cli.Command{ Name: "unfreeze", - Usage: "unfreeze S3 API calls on MinIO cluster", + Usage: "unfreeze S3 API calls on Silo/MinIO cluster", Action: mainAdminServiceUnfreeze, OnUsageError: onUsageError, Before: setGlobalsFromContext, @@ -44,8 +44,8 @@ FLAGS: {{range .VisibleFlags}}{{.}} {{end}} EXAMPLES: - 1. Unfreeze all S3 API calls on MinIO server at 'myminio/'. - {{.Prompt}} {{.HelpName}} myminio/ + 1. Unfreeze all S3 API calls on Silo/MinIO server at 'mysilo/'. + {{.Prompt}} {{.HelpName}} mysilo/ `, } @@ -93,7 +93,7 @@ func mainAdminServiceUnfreeze(ctx *cli.Context) error { ctxt, cancel := context.WithCancel(globalContext) defer cancel() - // Unfreeze the specified MinIO server + // Unfreeze the specified Silo/MinIO server e := client.ServiceUnfreezeV2(ctxt) if e != nil { // Attempt an older API server might be old @@ -101,7 +101,7 @@ func mainAdminServiceUnfreeze(ctx *cli.Context) error { // we need this fallback e = client.ServiceUnfreeze(ctxt) } - // Unfreeze the specified MinIO server + // Unfreeze the specified Silo/MinIO server fatalIf(probe.NewError(e), "Unable to unfreeze the server.") // Success.. diff --git a/cmd/admin-service.go b/cmd/admin-service.go index 0cd7b3777a..62aeeacbbd 100644 --- a/cmd/admin-service.go +++ b/cmd/admin-service.go @@ -28,7 +28,7 @@ var adminServiceSubcommands = []cli.Command{ var adminServiceCmd = cli.Command{ Name: "service", - Usage: "restart or unfreeze a MinIO cluster", + Usage: "restart or unfreeze a Silo/MinIO cluster", Action: mainAdminService, Before: setGlobalsFromContext, Flags: globalFlags, diff --git a/cmd/admin-subnet-register.go b/cmd/admin-subnet-register.go index 12de8a1cef..5f09a820f9 100644 --- a/cmd/admin-subnet-register.go +++ b/cmd/admin-subnet-register.go @@ -23,7 +23,7 @@ import ( var adminSubnetRegisterCmd = cli.Command{ Name: "register", - Usage: "Register the MinIO Cluster with SUBNET", + Usage: "Register the Silo/MinIO Cluster with SUBNET", OnUsageError: onUsageError, Action: mainAdminRegister, Before: setGlobalsFromContext, diff --git a/cmd/admin-tier-deprecated.go b/cmd/admin-tier-deprecated.go index ae4f025acb..66e311fe26 100644 --- a/cmd/admin-tier-deprecated.go +++ b/cmd/admin-tier-deprecated.go @@ -48,11 +48,11 @@ FLAGS: {{end}} EXAMPLES: - 1. Prints per-tier statistics of all remote tier targets configured on 'myminio': - {{.Prompt}} {{.HelpName}} myminio + 1. Prints per-tier statistics of all remote tier targets configured on 'mysilo': + {{.Prompt}} {{.HelpName}} mysilo - 2. Print per-tier statistics of given tier name 'MINIOTIER-1': - {{.Prompt}} {{.HelpName}} myminio MINIOTIER-1 + 2. Print per-tier statistics of given tier name 'SILOTIER-1': + {{.Prompt}} {{.HelpName}} mysilo SILOTIER-1 `, } @@ -75,8 +75,8 @@ FLAGS: {{end}} EXAMPLES: - 1. List remote tier targets configured on 'myminio': - {{.Prompt}} {{.HelpName}} myminio + 1. List remote tier targets configured on 'mysilo': + {{.Prompt}} {{.HelpName}} mysilo `, } @@ -104,21 +104,21 @@ FLAGS: {{range .VisibleFlags}}{{.}} {{end}} EXAMPLES: - 1. Configure a new remote tier which transitions objects to a bucket in a MinIO deployment: - {{.Prompt}} {{.HelpName}} minio myminio WARM-MINIO-TIER --endpoint https://warm-minio.com \ + 1. Configure a new remote tier which transitions objects to a bucket in a Silo/MinIO deployment: + {{.Prompt}} {{.HelpName}} minio mysilo WARM-SILO-TIER --endpoint https://warm-silo.com \ --access-key ACCESSKEY --secret-key SECRETKEY --bucket mybucket --prefix myprefix/ 2. Configure a new remote tier which transitions objects to a bucket in Azure Blob Storage: - {{.Prompt}} {{.HelpName}} azure myminio AZTIER --account-name ACCOUNT-NAME --account-key ACCOUNT-KEY \ + {{.Prompt}} {{.HelpName}} azure mysilo AZTIER --account-name ACCOUNT-NAME --account-key ACCOUNT-KEY \ --bucket myazurebucket --prefix myazureprefix/ 3. Configure a new remote tier which transitions objects to a bucket in AWS S3 with STANDARD storage class: - {{.Prompt}} {{.HelpName}} s3 myminio S3TIER --endpoint https://s3.amazonaws.com \ + {{.Prompt}} {{.HelpName}} s3 mysilo S3TIER --endpoint https://s3.amazonaws.com \ --access-key ACCESSKEY --secret-key SECRETKEY --bucket mys3bucket --prefix mys3prefix/ \ --storage-class "STANDARD" --region us-west-2 4. Configure a new remote tier which transitions objects to a bucket in Google Cloud Storage: - {{.Prompt}} {{.HelpName}} gcs myminio GCSTIER --credentials-file /path/to/credentials.json \ + {{.Prompt}} {{.HelpName}} gcs mysilo GCSTIER --credentials-file /path/to/credentials.json \ --bucket mygcsbucket --prefix mygcsprefix/ `, } @@ -144,13 +144,13 @@ FLAGS: {{end}} EXAMPLES: 1. Update credentials for an existing Azure Blob Storage remote tier: - {{.Prompt}} {{.HelpName}} myminio AZTIER --account-key ACCOUNT-KEY + {{.Prompt}} {{.HelpName}} mysilo AZTIER --account-key ACCOUNT-KEY 2. Update credentials for an existing AWS S3 compatible remote tier: - {{.Prompt}} {{.HelpName}} myminio S3TIER --access-key ACCESS-KEY --secret-key SECRET-KEY + {{.Prompt}} {{.HelpName}} mysilo S3TIER --access-key ACCESS-KEY --secret-key SECRET-KEY 3. Update credentials for an existing Google Cloud Storage remote tier: - {{.Prompt}} {{.HelpName}} myminio GCSTIER --credentials-file /path/to/credentials.json + {{.Prompt}} {{.HelpName}} mysilo GCSTIER --credentials-file /path/to/credentials.json `, } @@ -176,7 +176,7 @@ FLAGS: {{end}} EXAMPLES: 1. Verify if a tier config is valid. - {{.Prompt}} {{.HelpName}} myminio WARM-TIER + {{.Prompt}} {{.HelpName}} mysilo WARM-TIER `, } @@ -202,7 +202,7 @@ FLAGS: {{end}} EXAMPLES: 1. Remove an empty tier by name 'WARM-TIER': - {{.Prompt}} {{.HelpName}} myminio WARM-TIER + {{.Prompt}} {{.HelpName}} mysilo WARM-TIER `, } ) diff --git a/cmd/admin-top-api.go b/cmd/admin-top-api.go index 96fdb5ff20..aa2534f492 100644 --- a/cmd/admin-top-api.go +++ b/cmd/admin-top-api.go @@ -42,7 +42,7 @@ var adminTopAPIFlags = []cli.Flag{ var adminTopAPICmd = cli.Command{ Name: "api", - Usage: "summarize API events on MinIO server in real-time", + Usage: "summarize API events on Silo/MinIO server in real-time", Action: mainAdminTopAPI, OnUsageError: onUsageError, Before: setGlobalsFromContext, diff --git a/cmd/admin-top-locks.go b/cmd/admin-top-locks.go index c79f7eacf7..f207497026 100644 --- a/cmd/admin-top-locks.go +++ b/cmd/admin-top-locks.go @@ -36,7 +36,7 @@ var topLocksFlag = []cli.Flag{ var adminTopLocksCmd = cli.Command{ Name: "locks", - Usage: "get a list of the 10 oldest locks on a MinIO cluster.", + Usage: "get a list of the 10 oldest locks on a Silo/MinIO cluster.", Before: setGlobalsFromContext, Action: mainAdminTopLocks, OnUsageError: onUsageError, diff --git a/cmd/admin-top.go b/cmd/admin-top.go index 338448bd5e..dc4b5a31fe 100644 --- a/cmd/admin-top.go +++ b/cmd/admin-top.go @@ -26,7 +26,7 @@ var adminTopSubcommands = []cli.Command{ var adminTopCmd = cli.Command{ Name: "top", - Usage: "provide top like statistics for MinIO", + Usage: "provide top like statistics for Silo/MinIO", Action: mainAdminTop, Before: setGlobalsFromContext, Flags: globalFlags, diff --git a/cmd/admin-trace.go b/cmd/admin-trace.go index febb0e0203..a2167441f1 100644 --- a/cmd/admin-trace.go +++ b/cmd/admin-trace.go @@ -190,7 +190,7 @@ func traceCallsHelp() string { var adminTraceCmd = cli.Command{ Name: "trace", - Usage: "Show HTTP call trace for all incoming and internode on MinIO", + Usage: "Show HTTP call trace for all incoming and internode on Silo/MinIO", Action: mainAdminTrace, OnUsageError: onUsageError, Before: setGlobalsFromContext, @@ -216,29 +216,29 @@ UNITS also accepted. Without suffixes the unit is bytes. EXAMPLES: - 1. Show verbose console trace for MinIO server - {{.Prompt}} {{.HelpName}} -v -a myminio + 1. Show verbose console trace for Silo/MinIO server + {{.Prompt}} {{.HelpName}} -v -a mysilo - 2. Show trace only for failed requests for MinIO server - {{.Prompt}} {{.HelpName}} -v -e myminio + 2. Show trace only for failed requests for Silo/MinIO server + {{.Prompt}} {{.HelpName}} -v -e mysilo 3. Show verbose console trace for requests with '503' status code - {{.Prompt}} {{.HelpName}} -v --status-code 503 myminio + {{.Prompt}} {{.HelpName}} -v --status-code 503 mysilo 4. Show console trace for a specific path - {{.Prompt}} {{.HelpName}} --path my-bucket/my-prefix/* myminio + {{.Prompt}} {{.HelpName}} --path my-bucket/my-prefix/* mysilo 5. Show console trace for requests with '404' and '503' status code - {{.Prompt}} {{.HelpName}} --status-code 404 --status-code 503 myminio + {{.Prompt}} {{.HelpName}} --status-code 404 --status-code 503 mysilo 6. Show trace only for requests bytes greater than 1MB - {{.Prompt}} {{.HelpName}} --filter-request --filter-size 1MB myminio + {{.Prompt}} {{.HelpName}} --filter-request --filter-size 1MB mysilo 7. Show trace only for response bytes greater than 1MB - {{.Prompt}} {{.HelpName}} --filter-response --filter-size 1MB myminio + {{.Prompt}} {{.HelpName}} --filter-response --filter-size 1MB mysilo 8. Show trace only for requests operations duration greater than 5ms - {{.Prompt}} {{.HelpName}} --response-duration 5ms myminio + {{.Prompt}} {{.HelpName}} --response-duration 5ms mysilo `, } diff --git a/cmd/admin-update.go b/cmd/admin-update.go index 3e41a2b861..ccf9ed35a3 100644 --- a/cmd/admin-update.go +++ b/cmd/admin-update.go @@ -42,7 +42,7 @@ var adminUpdateFlags = []cli.Flag{ var adminServerUpdateCmd = cli.Command{ Name: "update", - Usage: "update all MinIO servers", + Usage: "update all Silo/MinIO servers", Action: mainAdminServerUpdate, OnUsageError: onUsageError, Before: setGlobalsFromContext, @@ -57,10 +57,10 @@ FLAGS: {{range .VisibleFlags}}{{.}} {{end}} EXAMPLES: - 1. Update MinIO server represented by its alias 'play'. - {{.Prompt}} {{.HelpName}} play/ + 1. Update Silo/MinIO server represented by its alias 'mysilo'. + {{.Prompt}} {{.HelpName}} mysilo/ - 2. Update all MinIO servers in a distributed setup, represented by its alias 'mydist'. + 2. Update all Silo/MinIO servers in a distributed setup, represented by its alias 'mydist'. {{.Prompt}} {{.HelpName}} mydist/ `, } @@ -134,7 +134,7 @@ func mainAdminServerUpdate(ctx *cli.Context) error { autoConfirm := ctx.Bool("yes") if isTerminal() && !autoConfirm { - fmt.Printf("You are about to upgrade *MinIO Server*, please confirm [y/N]: ") + fmt.Printf("You are about to upgrade *Silo/MinIO Server*, please confirm [y/N]: ") answer, e := bufio.NewReader(os.Stdin).ReadString('\n') fatalIf(probe.NewError(e), "Unable to parse user input.") answer = strings.TrimSpace(answer) @@ -144,7 +144,7 @@ func mainAdminServerUpdate(ctx *cli.Context) error { } } - // Update the specified MinIO server, optionally also + // Update the specified Silo/MinIO server, optionally also // with the provided update URL. us, e := client.ServerUpdateV2(globalContext, madmin.ServerUpdateOpts{ DryRun: ctx.Bool("dry-run"), diff --git a/cmd/admin-user-add.go b/cmd/admin-user-add.go index 98d5684a9a..6336ac6b06 100644 --- a/cmd/admin-user-add.go +++ b/cmd/admin-user-add.go @@ -54,24 +54,24 @@ FLAGS: {{range .VisibleFlags}}{{.}} {{end}} EXAMPLES: - 1. Add a new user 'foobar' to MinIO server. + 1. Add a new user 'foobar' to Silo/MinIO server. {{.DisableHistory}} - {{.Prompt}} {{.HelpName}} myminio foobar foo12345 + {{.Prompt}} {{.HelpName}} mysilo foobar foo12345 {{.EnableHistory}} - 2. Add a new user 'foobar' to MinIO server, prompting for keys. - {{.Prompt}} {{.HelpName}} myminio + 2. Add a new user 'foobar' to Silo/MinIO server, prompting for keys. + {{.Prompt}} {{.HelpName}} mysilo Enter Access Key: foobar Enter Secret Key: foobar12345 - 3. Add a new user 'foobar' to MinIO server using piped keys. + 3. Add a new user 'foobar' to Silo/MinIO server using piped keys. {{.DisableHistory}} - {{.Prompt}} echo -e "foobar\nfoobar12345" | {{.HelpName}} myminio + {{.Prompt}} echo -e "foobar\nfoobar12345" | {{.HelpName}} mysilo {{.EnableHistory}} - 4. Add a new user 'foobar' to MinIO server, then attach IAM policy "writeonly". - {{.Prompt}} {{.HelpName}} myminio foobar foo12345 - {{.Prompt}} mc admin policy attach myminio writeonly --user foobar + 4. Add a new user 'foobar' to Silo/MinIO server, then attach IAM policy "writeonly". + {{.Prompt}} {{.HelpName}} mysilo foobar foo12345 + {{.Prompt}} mc admin policy attach mysilo writeonly --user foobar `, } diff --git a/cmd/admin-user-disable.go b/cmd/admin-user-disable.go index 916ca657af..8b03cf2b4b 100644 --- a/cmd/admin-user-disable.go +++ b/cmd/admin-user-disable.go @@ -42,8 +42,8 @@ FLAGS: {{range .VisibleFlags}}{{.}} {{end}} EXAMPLES: - 1. Disable a user 'foobar' on MinIO server. - {{.Prompt}} {{.HelpName}} myminio foobar + 1. Disable a user 'foobar' on Silo/MinIO server. + {{.Prompt}} {{.HelpName}} mysilo foobar `, } diff --git a/cmd/admin-user-enable.go b/cmd/admin-user-enable.go index 03c3643fd8..28bd247b96 100644 --- a/cmd/admin-user-enable.go +++ b/cmd/admin-user-enable.go @@ -42,8 +42,8 @@ FLAGS: {{range .VisibleFlags}}{{.}} {{end}} EXAMPLES: - 1. Enable a disabled user 'foobar' on MinIO server. - {{.Prompt}} {{.HelpName}} myminio foobar + 1. Enable a disabled user 'foobar' on Silo/MinIO server. + {{.Prompt}} {{.HelpName}} mysilo foobar `, } diff --git a/cmd/admin-user-info.go b/cmd/admin-user-info.go index c184b30284..4f65da2800 100644 --- a/cmd/admin-user-info.go +++ b/cmd/admin-user-info.go @@ -46,7 +46,7 @@ FLAGS: {{end}} EXAMPLES: 1. Display the info of a user "foobar". - {{.Prompt}} {{.HelpName}} myminio foobar + {{.Prompt}} {{.HelpName}} mysilo foobar `, } diff --git a/cmd/admin-user-list.go b/cmd/admin-user-list.go index 13bafc3244..da61f7076b 100644 --- a/cmd/admin-user-list.go +++ b/cmd/admin-user-list.go @@ -44,8 +44,8 @@ FLAGS: {{range .VisibleFlags}}{{.}} {{end}} EXAMPLES: - 1. List all users on MinIO server. - {{.Prompt}} {{.HelpName}} myminio + 1. List all users on Silo/MinIO server. + {{.Prompt}} {{.HelpName}} mysilo `, } diff --git a/cmd/admin-user-policy.go b/cmd/admin-user-policy.go index b894d5495c..ac5ee31739 100644 --- a/cmd/admin-user-policy.go +++ b/cmd/admin-user-policy.go @@ -46,7 +46,7 @@ FLAGS: {{end}} EXAMPLES: 1. Display the policy document of a user "foobar" in JSON format. - {{.Prompt}} {{.HelpName}} myminio foobar + {{.Prompt}} {{.HelpName}} mysilo foobar `, } diff --git a/cmd/admin-user-remove.go b/cmd/admin-user-remove.go index 855366e2d8..c429ac8f96 100644 --- a/cmd/admin-user-remove.go +++ b/cmd/admin-user-remove.go @@ -42,8 +42,8 @@ FLAGS: {{range .VisibleFlags}}{{.}} {{end}} EXAMPLES: - 1. Remove a user 'foobar' on MinIO server. - {{.Prompt}} {{.HelpName}} myminio foobar + 1. Remove a user 'foobar' on Silo/MinIO server. + {{.Prompt}} {{.HelpName}} mysilo foobar `, } diff --git a/cmd/admin-user-sts-info.go b/cmd/admin-user-sts-info.go index 37a17a4a38..6368ee23a4 100644 --- a/cmd/admin-user-sts-info.go +++ b/cmd/admin-user-sts-info.go @@ -74,7 +74,7 @@ FLAGS: {{end}} EXAMPLES: 1. Display information for the temporary account 'J123C4ZXEQN8RK6ND35I' - {{.Prompt}} {{.HelpName}} myminio/ J123C4ZXEQN8RK6ND35I + {{.Prompt}} {{.HelpName}} mysilo/ J123C4ZXEQN8RK6ND35I `, } diff --git a/cmd/admin-user-svcacct-add.go b/cmd/admin-user-svcacct-add.go index c9f3c138c4..cb329ace50 100644 --- a/cmd/admin-user-svcacct-add.go +++ b/cmd/admin-user-svcacct-add.go @@ -82,26 +82,26 @@ USAGE: {{.HelpName}} ALIAS ACCOUNT [FLAGS] ACCOUNT: - An account could be a regular MinIO user, STS or LDAP user. + An account could be a regular Silo/MinIO user, STS or LDAP user. FLAGS: {{range .VisibleFlags}}{{.}} {{end}} EXAMPLES: - 1. Add a new service account for user 'foobar' to MinIO server with a name and description. - {{.Prompt}} {{.HelpName}} myminio foobar --name uploaderKey --description "foobar uploader scripts" + 1. Add a new service account for user 'foobar' to Silo/MinIO server with a name and description. + {{.Prompt}} {{.HelpName}} mysilo foobar --name uploaderKey --description "foobar uploader scripts" - 2. Add a new service account to MinIO server with specified access key and secret key for user 'foobar'. - {{.Prompt}} {{.HelpName}} myminio foobar --access-key "myaccesskey" --secret-key "mysecretkey" + 2. Add a new service account to Silo/MinIO server with specified access key and secret key for user 'foobar'. + {{.Prompt}} {{.HelpName}} mysilo foobar --access-key "myaccesskey" --secret-key "mysecretkey" - 3. Add a new service account to MinIO server with specified access key and random secret key for user 'foobar'. - {{.Prompt}} {{.HelpName}} myminio foobar --access-key "myaccesskey" + 3. Add a new service account to Silo/MinIO server with specified access key and random secret key for user 'foobar'. + {{.Prompt}} {{.HelpName}} mysilo foobar --access-key "myaccesskey" - 4. Add a new service account to MinIO server with specified secret key and random access key for user 'foobar'. - {{.Prompt}} {{.HelpName}} myminio foobar --secret-key "mysecretkey" + 4. Add a new service account to Silo/MinIO server with specified secret key and random access key for user 'foobar'. + {{.Prompt}} {{.HelpName}} mysilo foobar --secret-key "mysecretkey" - 5. Add a new service account to MinIO server with specified expiry date in the future for user 'foobar'. - {{.Prompt}} {{.HelpName}} myminio foobar --expiry 2023-06-24T10:00:00-07:00 + 5. Add a new service account to Silo/MinIO server with specified expiry date in the future for user 'foobar'. + {{.Prompt}} {{.HelpName}} mysilo foobar --expiry 2023-06-24T10:00:00-07:00 `, } diff --git a/cmd/admin-user-svcacct-disable.go b/cmd/admin-user-svcacct-disable.go index 626426c80c..3098db8bd6 100644 --- a/cmd/admin-user-svcacct-disable.go +++ b/cmd/admin-user-svcacct-disable.go @@ -42,8 +42,8 @@ FLAGS: {{range .VisibleFlags}}{{.}} {{end}} EXAMPLES: - 1. Disable a service account 'J123C4ZXEQN8RK6ND35I' on MinIO server. - {{.Prompt}} {{.HelpName}} myminio/ J123C4ZXEQN8RK6ND35I + 1. Disable a service account 'J123C4ZXEQN8RK6ND35I' on Silo/MinIO server. + {{.Prompt}} {{.HelpName}} mysilo/ J123C4ZXEQN8RK6ND35I `, } diff --git a/cmd/admin-user-svcacct-enable.go b/cmd/admin-user-svcacct-enable.go index a19404e651..01ccd2fefd 100644 --- a/cmd/admin-user-svcacct-enable.go +++ b/cmd/admin-user-svcacct-enable.go @@ -42,8 +42,8 @@ FLAGS: {{range .VisibleFlags}}{{.}} {{end}} EXAMPLES: - 1. Enable a service account 'J123C4ZXEQN8RK6ND35I' on MinIO server. - {{.Prompt}} {{.HelpName}} myminio/ J123C4ZXEQN8RK6ND35I + 1. Enable a service account 'J123C4ZXEQN8RK6ND35I' on Silo/MinIO server. + {{.Prompt}} {{.HelpName}} mysilo/ J123C4ZXEQN8RK6ND35I `, } diff --git a/cmd/admin-user-svcacct-info.go b/cmd/admin-user-svcacct-info.go index 8dd14e1495..6f027e1c9d 100644 --- a/cmd/admin-user-svcacct-info.go +++ b/cmd/admin-user-svcacct-info.go @@ -54,7 +54,7 @@ FLAGS: {{end}} EXAMPLES: 1. Display information for service account 'J123C4ZXEQN8RK6ND35I' - {{.Prompt}} {{.HelpName}} myminio/ J123C4ZXEQN8RK6ND35I + {{.Prompt}} {{.HelpName}} mysilo/ J123C4ZXEQN8RK6ND35I `, } diff --git a/cmd/admin-user-svcacct-list.go b/cmd/admin-user-svcacct-list.go index e9857a3c1e..fba01a8b4a 100644 --- a/cmd/admin-user-svcacct-list.go +++ b/cmd/admin-user-svcacct-list.go @@ -39,14 +39,14 @@ USAGE: {{.HelpName}} ALIAS TARGET-ACCOUNT TARGET-ACCOUNT: - Is either a MinIO user, LDAP account. + Is either a Silo/MinIO user, LDAP account. FLAGS: {{range .VisibleFlags}}{{.}} {{end}} EXAMPLES: 1. List all service accounts for user 'foobar'. - {{.Prompt}} {{.HelpName}} myminio/ foobar + {{.Prompt}} {{.HelpName}} mysilo/ foobar `, } diff --git a/cmd/admin-user-svcacct-remove.go b/cmd/admin-user-svcacct-remove.go index bd894b6170..46dcc87b02 100644 --- a/cmd/admin-user-svcacct-remove.go +++ b/cmd/admin-user-svcacct-remove.go @@ -42,8 +42,8 @@ FLAGS: {{range .VisibleFlags}}{{.}} {{end}} EXAMPLES: - 1. Remove a service account 'J123C4ZXEQN8RK6ND35I' from MinIO server. - {{.Prompt}} {{.HelpName}} myminio/ J123C4ZXEQN8RK6ND35I + 1. Remove a service account 'J123C4ZXEQN8RK6ND35I' from Silo/MinIO server. + {{.Prompt}} {{.HelpName}} mysilo/ J123C4ZXEQN8RK6ND35I `, } diff --git a/cmd/admin-user-svcacct-set.go b/cmd/admin-user-svcacct-set.go index 0135ff0e9c..b65ec9c6be 100644 --- a/cmd/admin-user-svcacct-set.go +++ b/cmd/admin-user-svcacct-set.go @@ -70,11 +70,11 @@ FLAGS: {{range .VisibleFlags}}{{.}} {{end}} EXAMPLES: - 1. Change the secret key of the service account 'J123C4ZXEQN8RK6ND35I' in MinIO server. - {{.Prompt}} {{.HelpName}} myminio/ 'J123C4ZXEQN8RK6ND35I' --secret-key 'xxxxxxx' + 1. Change the secret key of the service account 'J123C4ZXEQN8RK6ND35I' in Silo/MinIO server. + {{.Prompt}} {{.HelpName}} mysilo/ 'J123C4ZXEQN8RK6ND35I' --secret-key 'xxxxxxx' - 2. Change the expiry of the service account 'J123C4ZXEQN8RK6ND35I' in MinIO server. - {{.Prompt}} {{.HelpName}} myminio/ 'J123C4ZXEQN8RK6ND35I' --expiry 2023-06-24T10:00:00-07:00 + 2. Change the expiry of the service account 'J123C4ZXEQN8RK6ND35I' in Silo/MinIO server. + {{.Prompt}} {{.HelpName}} mysilo/ 'J123C4ZXEQN8RK6ND35I' --expiry 2023-06-24T10:00:00-07:00 `, } diff --git a/cmd/alias-export.go b/cmd/alias-export.go index 9b822c6023..d7da0b1db8 100644 --- a/cmd/alias-export.go +++ b/cmd/alias-export.go @@ -37,7 +37,7 @@ FLAGS: {{end}} EXAMPLES: 1. Export the provided 'alias' to credentials.json file: - {{ .Prompt }} {{ .HelpName }} myminio/ > credentials.json + {{ .Prompt }} {{ .HelpName }} mysilo/ > credentials.json 2. Export the credentials to standard output and pipe it to import command {{ .Prompt }} {{ .HelpName }} alias1/ | mc alias import alias2/ diff --git a/cmd/alias-import.go b/cmd/alias-import.go index 3f18ff961e..06a585ad4d 100644 --- a/cmd/alias-import.go +++ b/cmd/alias-import.go @@ -55,11 +55,11 @@ FLAGS: {{range .VisibleFlags}}{{.}} {{end}} EXAMPLES: - 1. Import the provided credentials.json file as 'myminio' to the config: - {{ .Prompt }} {{ .HelpName }} myminio/ ./credentials.json + 1. Import the provided credentials.json file as 'mysilo' to the config: + {{ .Prompt }} {{ .HelpName }} mysilo/ ./credentials.json - 2. Import the credentials through standard input as 'myminio' to the config: - {{ .Prompt }} cat credentials.json | {{ .HelpName }} myminio/ + 2. Import the credentials through standard input as 'mysilo' to the config: + {{ .Prompt }} cat credentials.json | {{ .HelpName }} mysilo/ `, } diff --git a/cmd/alias-main.go b/cmd/alias-main.go index 4f976fabfb..f89cd11016 100644 --- a/cmd/alias-main.go +++ b/cmd/alias-main.go @@ -24,7 +24,7 @@ import ( "github.com/minio/pkg/v3/console" ) -// Configure an alias in MinIO Client +// Configure an alias in Silo/MinIO Client // // ---- // NOTE: that the alias command only writes values to the config file. diff --git a/cmd/alias-set.go b/cmd/alias-set.go index 977a9cfce4..7862b46ed9 100644 --- a/cmd/alias-set.go +++ b/cmd/alias-set.go @@ -72,14 +72,14 @@ FLAGS: {{range .VisibleFlags}}{{.}} {{end}} EXAMPLES: - 1. Add MinIO service under "myminio" alias. For security reasons turn off bash history momentarily. + 1. Add a Silo/MinIO service under "mysilo" alias. For security reasons turn off bash history momentarily. {{.DisableHistory}} - {{.Prompt}} {{.HelpName}} myminio http://localhost:9000 minio minio123 + {{.Prompt}} {{.HelpName}} mysilo http://localhost:9000 myaccesskey mysecretkey {{.EnableHistory}} - 2. Add MinIO service under "myminio" alias, to use dns style bucket lookup. For security reasons + 2. Add a Silo/MinIO service under "mysilo" alias, to use dns style bucket lookup. For security reasons turn off bash history momentarily. {{.DisableHistory}} - {{.Prompt}} {{.HelpName}} myminio http://localhost:9000 minio minio123 --api "s3v4" --path "off" + {{.Prompt}} {{.HelpName}} mysilo http://localhost:9000 myaccesskey mysecretkey --api "s3v4" --path "off" {{.EnableHistory}} 3. Add Amazon S3 storage service under "mys3" alias. For security reasons turn off bash history momentarily. {{.DisableHistory}} diff --git a/cmd/batch-cancel.go b/cmd/batch-cancel.go index 3f576e1966..73b628a01b 100644 --- a/cmd/batch-cancel.go +++ b/cmd/batch-cancel.go @@ -53,7 +53,7 @@ FLAGS: {{end}} EXAMPLES: 1. Cancel ongoing batch job: - {{.Prompt}} {{.HelpName}} myminio + {{.Prompt}} {{.HelpName}} mysilo `, } diff --git a/cmd/batch-describe.go b/cmd/batch-describe.go index 3c72d6932d..80526cf489 100644 --- a/cmd/batch-describe.go +++ b/cmd/batch-describe.go @@ -43,7 +43,7 @@ FLAGS: {{end}} EXAMPLES: 1. Describe current batch job definition: - {{.Prompt}} {{.HelpName}} myminio KwSysDpxcBU9FNhGkn2dCf + {{.Prompt}} {{.HelpName}} mysilo KwSysDpxcBU9FNhGkn2dCf `, } diff --git a/cmd/batch-generate.go b/cmd/batch-generate.go index 5c767102a6..7351b51f62 100644 --- a/cmd/batch-generate.go +++ b/cmd/batch-generate.go @@ -50,9 +50,9 @@ FLAGS: {{end}} EXAMPLES: 1. Generate a new batch 'replication' job definition: - {{.Prompt}} {{.HelpName}} myminio replicate > replication.yaml + {{.Prompt}} {{.HelpName}} mysilo replicate > replication.yaml 2. List all supported job types: - {{.Prompt}} {{.HelpName}} myminio list + {{.Prompt}} {{.HelpName}} mysilo list `, } diff --git a/cmd/batch-list.go b/cmd/batch-list.go index 158a49d48a..302fb0a6b5 100644 --- a/cmd/batch-list.go +++ b/cmd/batch-list.go @@ -55,10 +55,10 @@ FLAGS: {{end}} EXAMPLES: 1. List all current batch jobs: - {{.Prompt}} {{.HelpName}} myminio + {{.Prompt}} {{.HelpName}} mysilo 2. List all current batch jobs of type 'replicate': - {{.Prompt}} {{.HelpName}} myminio/ --type "replicate" + {{.Prompt}} {{.HelpName}} mysilo/ --type "replicate" `, } diff --git a/cmd/batch-start.go b/cmd/batch-start.go index 2014d6c48b..f63ab5fa66 100644 --- a/cmd/batch-start.go +++ b/cmd/batch-start.go @@ -48,7 +48,7 @@ FLAGS: {{end}} EXAMPLES: 1. Start a new batch 'replication' job: - {{.Prompt}} {{.HelpName}} myminio ./replication.yaml + {{.Prompt}} {{.HelpName}} mysilo ./replication.yaml `, } diff --git a/cmd/batch-status.go b/cmd/batch-status.go index e01de3eefa..c94c90f7fd 100644 --- a/cmd/batch-status.go +++ b/cmd/batch-status.go @@ -21,7 +21,7 @@ import ( var batchStatusCmd = cli.Command{ Name: "status", - Usage: "summarize job events on MinIO server in real-time", + Usage: "summarize job events on Silo/MinIO server in real-time", Action: mainBatchStatus, OnUsageError: onUsageError, Before: setGlobalsFromContext, @@ -38,7 +38,7 @@ FLAGS: {{end}} EXAMPLES: 1. Display current in-progress JOB events. - {{.Prompt}} {{.HelpName}} myminio/ KwSysDpxcBU9FNhGkn2dCf + {{.Prompt}} {{.HelpName}} mysilo/ KwSysDpxcBU9FNhGkn2dCf `, } diff --git a/cmd/cat-main.go b/cmd/cat-main.go index 22c8ce5750..8420bc65a3 100644 --- a/cmd/cat-main.go +++ b/cmd/cat-main.go @@ -45,7 +45,7 @@ var catFlags = []cli.Flag{ }, cli.BoolFlag{ Name: "zip", - Usage: "extract from remote zip file (MinIO server source only)", + Usage: "extract from remote zip file (Silo/MinIO server source only)", }, cli.Int64Flag{ Name: "offset", @@ -90,17 +90,17 @@ EXAMPLES: {{.Prompt}} {{.HelpName}} part.* > complete.img 4. Save an encrypted object from Amazon S3 cloud storage to a local file. - {{.Prompt}} {{.HelpName}} --enc-c "play/my-bucket/=MDEyMzQ1Njc4OTAxMjM0NTY3ODkwMTIzNDU2Nzg5MDA" s3/mysql-backups/backups-201810.gz > /mnt/data/recent.gz + {{.Prompt}} {{.HelpName}} --enc-c "mysilo/my-bucket/=MDEyMzQ1Njc4OTAxMjM0NTY3ODkwMTIzNDU2Nzg5MDA" s3/mysql-backups/backups-201810.gz > /mnt/data/recent.gz 5. Display the content of encrypted object. In case the encryption key contains non-printable character like tab, pass the base64 encoded string as key. - {{.Prompt}} {{.HelpName}} --enc-c "play/my-bucket/=MDEyMzQ1Njc4OTAxMjM0NTY3ODkwMTIzNDU2Nzg5MDA" play/my-bucket/my-object + {{.Prompt}} {{.HelpName}} --enc-c "mysilo/my-bucket/=MDEyMzQ1Njc4OTAxMjM0NTY3ODkwMTIzNDU2Nzg5MDA" mysilo/my-bucket/my-object 6. Display the content of an object 10 days earlier - {{.Prompt}} {{.HelpName}} --rewind 10d play/my-bucket/my-object + {{.Prompt}} {{.HelpName}} --rewind 10d mysilo/my-bucket/my-object 7. Display the content of a particular object version - {{.Prompt}} {{.HelpName}} --vid "3ddac055-89a7-40fa-8cd3-530a5581b6b8" play/my-bucket/my-object + {{.Prompt}} {{.HelpName}} --vid "3ddac055-89a7-40fa-8cd3-530a5581b6b8" mysilo/my-bucket/my-object `, } diff --git a/cmd/certs.go b/cmd/certs.go index 4b23eefea1..dcaa4e50c1 100644 --- a/cmd/certs.go +++ b/cmd/certs.go @@ -96,7 +96,7 @@ func createCAsDir() *probe.Error { return nil } -// loadRootCAs fetches CA files provided in MinIO config and adds them to globalRootCAs +// loadRootCAs fetches CA files provided in Silo/MinIO config and adds them to globalRootCAs // Currently under Windows, there is no way to load system + user CAs at the same time func loadRootCAs() { var e error diff --git a/cmd/config-old.go b/cmd/config-old.go index a73d9d6edf..96bc355828 100644 --- a/cmd/config-old.go +++ b/cmd/config-old.go @@ -185,7 +185,7 @@ func newConfigV7() *configV7 { } func (c *configV7) loadDefaults() { - // MinIO server running locally. + // Silo/MinIO server running locally. c.setHost("local", hostConfigV7{ URL: "http://localhost:9000", AccessKey: "", @@ -273,7 +273,7 @@ func (c *configV8) setHost(alias string, cfg hostConfigV8) { // load default values for missing entries. func (c *configV8) loadDefaults() { - // MinIO server running locally. + // Silo/MinIO server running locally. c.setHost("local", hostConfigV8{ URL: "http://localhost:9000", AccessKey: "", diff --git a/cmd/cors-get.go b/cmd/cors-get.go index 447c843008..4466326f4d 100644 --- a/cmd/cors-get.go +++ b/cmd/cors-get.go @@ -41,7 +41,7 @@ FLAGS: {{end}} EXAMPLES: 1. Get the CORS configuration for the bucket 'mybucket': - {{.Prompt}} {{.HelpName}} myminio/mybucket + {{.Prompt}} {{.HelpName}} mysilo/mybucket `, } diff --git a/cmd/cors-remove.go b/cmd/cors-remove.go index ca36ac8086..dd5d432bb4 100644 --- a/cmd/cors-remove.go +++ b/cmd/cors-remove.go @@ -41,7 +41,7 @@ FLAGS: {{end}} EXAMPLES: 1. Remove the CORS configuration for the bucket 'mybucket': - {{.Prompt}} {{.HelpName}} myminio/mybucket + {{.Prompt}} {{.HelpName}} mysilo/mybucket `, } diff --git a/cmd/cors-set.go b/cmd/cors-set.go index 5165913efe..1614078146 100644 --- a/cmd/cors-set.go +++ b/cmd/cors-set.go @@ -50,10 +50,10 @@ FLAGS: {{end}} EXAMPLES: 1. Set the CORS configuration for the bucket 'mybucket': - {{.Prompt}} {{.HelpName}} myminio/mybucket /path/to/cors.xml + {{.Prompt}} {{.HelpName}} mysilo/mybucket /path/to/cors.xml 2. Set the CORS configuration for the bucket 'mybucket' using stdin: - {{.Prompt}} {{.HelpName}} myminio/mybucket - + {{.Prompt}} {{.HelpName}} mysilo/mybucket - `, } diff --git a/cmd/cp-main.go b/cmd/cp-main.go index 754eef1189..a5349844c9 100644 --- a/cmd/cp-main.go +++ b/cmd/cp-main.go @@ -96,7 +96,7 @@ var ( }, cli.BoolFlag{ Name: "zip", - Usage: "Extract from remote zip file (MinIO server source only)", + Usage: "Extract from remote zip file (Silo/MinIO server source only)", }, cli.IntFlag{ Name: "max-workers", @@ -141,59 +141,59 @@ EXAMPLES: 01. Copy a list of objects from local file system to Amazon S3 cloud storage. {{.Prompt}} {{.HelpName}} Music/*.ogg s3/jukebox/ - 02. Copy a folder recursively from MinIO cloud storage to Amazon S3 cloud storage. - {{.Prompt}} {{.HelpName}} --recursive play/mybucket/myfolder/ s3/mybucket/ + 02. Copy a folder recursively from Silo/MinIO cloud storage to Amazon S3 cloud storage. + {{.Prompt}} {{.HelpName}} --recursive mysilo/mybucket/myfolder/ s3/mybucket/ - 03. Copy multiple local folders recursively to MinIO cloud storage. - {{.Prompt}} {{.HelpName}} --recursive backup/2014/ backup/2015/ play/archive/ + 03. Copy multiple local folders recursively to Silo/MinIO cloud storage. + {{.Prompt}} {{.HelpName}} --recursive backup/2014/ backup/2015/ mysilo/archive/ 04. Copy a bucket recursively from aliased Amazon S3 cloud storage to local filesystem on Windows. {{.Prompt}} {{.HelpName}} --recursive s3\documents\2014\ C:\Backups\2014 - 05. Copy files older than 7 days and 10 hours from MinIO cloud storage to Amazon S3 cloud storage. - {{.Prompt}} {{.HelpName}} --older-than 7d10h play/mybucket/myfolder/ s3/mybucket/ + 05. Copy files older than 7 days and 10 hours from Silo/MinIO cloud storage to Amazon S3 cloud storage. + {{.Prompt}} {{.HelpName}} --older-than 7d10h mysilo/mybucket/myfolder/ s3/mybucket/ - 06. Copy files newer than 7 days and 10 hours from MinIO cloud storage to a local path. - {{.Prompt}} {{.HelpName}} --newer-than 7d10h play/mybucket/myfolder/ ~/latest/ + 06. Copy files newer than 7 days and 10 hours from Silo/MinIO cloud storage to a local path. + {{.Prompt}} {{.HelpName}} --newer-than 7d10h mysilo/mybucket/myfolder/ ~/latest/ 07. Copy an object with name containing unicode characters to Amazon S3 cloud storage. {{.Prompt}} {{.HelpName}} 本語 s3/andoria/ 08. Copy a local folder with space separated characters to Amazon S3 cloud storage. - {{.Prompt}} {{.HelpName}} --recursive 'workdir/documents/May 2014/' s3/miniocloud + {{.Prompt}} {{.HelpName}} --recursive 'workdir/documents/May 2014/' s3/mycloud - 09. Copy a folder with encrypted objects recursively from Amazon S3 to MinIO cloud storage using s3 encryption. - {{.Prompt}} {{.HelpName}} --recursive --enc-s3 "s3/documents" --enc-s3 "myminio/documents" s3/documents/ myminio/documents/ + 09. Copy a folder with encrypted objects recursively from Amazon S3 to Silo/MinIO cloud storage using s3 encryption. + {{.Prompt}} {{.HelpName}} --recursive --enc-s3 "s3/documents" --enc-s3 "mysilo/documents" s3/documents/ mysilo/documents/ - 10. Copy a folder with encrypted objects recursively from Amazon S3 to MinIO cloud storage. - {{.Prompt}} {{.HelpName}} --recursive --enc-c "s3/documents/=MDEyMzQ1Njc4OTAxMjM0NTY3ODkwMTIzNDU2Nzg5MDA" --enc-c "myminio/documents/=MDEyMzQ1Njc4OTAxMjM0NTY3ODkwMTIzNDU2Nzg5BBB" s3/documents/ myminio/documents/ + 10. Copy a folder with encrypted objects recursively from Amazon S3 to Silo/MinIO cloud storage. + {{.Prompt}} {{.HelpName}} --recursive --enc-c "s3/documents/=MDEyMzQ1Njc4OTAxMjM0NTY3ODkwMTIzNDU2Nzg5MDA" --enc-c "mysilo/documents/=MDEyMzQ1Njc4OTAxMjM0NTY3ODkwMTIzNDU2Nzg5BBB" s3/documents/ mysilo/documents/ - 11. Copy a list of objects from local file system to MinIO cloud storage with specified metadata, separated by ";" - {{.Prompt}} {{.HelpName}} --attr "key1=value1;key2=value2" Music/*.mp4 play/mybucket/ + 11. Copy a list of objects from local file system to Silo/MinIO cloud storage with specified metadata, separated by ";" + {{.Prompt}} {{.HelpName}} --attr "key1=value1;key2=value2" Music/*.mp4 mysilo/mybucket/ - 12. Copy a folder recursively from MinIO cloud storage to Amazon S3 cloud storage with Cache-Control and custom metadata, separated by ";". - {{.Prompt}} {{.HelpName}} --attr "Cache-Control=max-age=90000,min-fresh=9000;key1=value1;key2=value2" --recursive play/mybucket/myfolder/ s3/mybucket/ + 12. Copy a folder recursively from Silo/MinIO cloud storage to Amazon S3 cloud storage with Cache-Control and custom metadata, separated by ";". + {{.Prompt}} {{.HelpName}} --attr "Cache-Control=max-age=90000,min-fresh=9000;key1=value1;key2=value2" --recursive mysilo/mybucket/myfolder/ s3/mybucket/ 13. Copy a text file to an object storage and assign REDUCED_REDUNDANCY storage-class to the uploaded object. - {{.Prompt}} {{.HelpName}} --storage-class REDUCED_REDUNDANCY myobject.txt play/mybucket + {{.Prompt}} {{.HelpName}} --storage-class REDUCED_REDUNDANCY myobject.txt mysilo/mybucket 14. Copy a text file to an object storage and preserve the file system attribute as metadata. - {{.Prompt}} {{.HelpName}} -a myobject.txt play/mybucket + {{.Prompt}} {{.HelpName}} -a myobject.txt mysilo/mybucket 15. Copy a text file to an object storage with object lock mode set to 'GOVERNANCE' with retention duration 1 day. - {{.Prompt}} {{.HelpName}} --retention-mode governance --retention-duration 1d locked.txt play/locked-bucket/ + {{.Prompt}} {{.HelpName}} --retention-mode governance --retention-duration 1d locked.txt mysilo/locked-bucket/ 16. Copy a text file to an object storage with legal-hold enabled. - {{.Prompt}} {{.HelpName}} --legal-hold on locked.txt play/locked-bucket/ + {{.Prompt}} {{.HelpName}} --legal-hold on locked.txt mysilo/locked-bucket/ 17. Copy a text file to an object storage and disable multipart upload feature. - {{.Prompt}} {{.HelpName}} --disable-multipart myobject.txt play/mybucket + {{.Prompt}} {{.HelpName}} --disable-multipart myobject.txt mysilo/mybucket 18. Roll back 10 days in the past to copy the content of 'mybucket' - {{.Prompt}} {{.HelpName}} --rewind 10d -r play/mybucket/ /tmp/dest/ + {{.Prompt}} {{.HelpName}} --rewind 10d -r mysilo/mybucket/ /tmp/dest/ 19. Set tags to the uploaded objects - {{.Prompt}} {{.HelpName}} -r --tags "category=prod&type=backup" ./data/ play/another-bucket/ + {{.Prompt}} {{.HelpName}} -r --tags "category=prod&type=backup" ./data/ mysilo/another-bucket/ `, } diff --git a/cmd/encrypt-clear.go b/cmd/encrypt-clear.go index d798739387..a6e6f3bc06 100644 --- a/cmd/encrypt-clear.go +++ b/cmd/encrypt-clear.go @@ -45,8 +45,8 @@ FLAGS: {{range .VisibleFlags}}{{.}} {{end}} EXAMPLES: - 1. Remove auto encryption config on bucket "mybucket" for alias "myminio". - {{.Prompt}} {{.HelpName}} myminio/mybucket + 1. Remove auto encryption config on bucket "mybucket" for alias "mysilo". + {{.Prompt}} {{.HelpName}} mysilo/mybucket `, } diff --git a/cmd/encrypt-info.go b/cmd/encrypt-info.go index da4d3be1b7..736079d3c0 100644 --- a/cmd/encrypt-info.go +++ b/cmd/encrypt-info.go @@ -46,7 +46,7 @@ FLAGS: {{end}} EXAMPLES: 1. Display bucket encryption status for bucket "mybucket". - {{.Prompt}} {{.HelpName}} myminio/mybucket + {{.Prompt}} {{.HelpName}} mysilo/mybucket `, } diff --git a/cmd/encrypt-set.go b/cmd/encrypt-set.go index ef4b6bf78c..99f3c172b7 100644 --- a/cmd/encrypt-set.go +++ b/cmd/encrypt-set.go @@ -46,8 +46,8 @@ FLAGS: {{range .VisibleFlags}}{{.}} {{end}} EXAMPLES: - 1. Enable SSE-KMS auto encryption with KMS key on bucket "mybucket" for alias "myminio". - {{.Prompt}} {{.HelpName}} sse-kms my-minio-key myminio/mybucket + 1. Enable SSE-KMS auto encryption with KMS key on bucket "mybucket" for alias "mysilo". + {{.Prompt}} {{.HelpName}} sse-kms my-silo-key mysilo/mybucket 2. Enable SSE-KMS auto encryption with KMS key on bucket "mybucket" for alias "s3". {{.Prompt}} {{.HelpName}} sse-kms arn:aws:kms:us-east-1:xxx:key/xxx s3/mybucket diff --git a/cmd/event-add.go b/cmd/event-add.go index d1b15652db..1eb249ee82 100644 --- a/cmd/event-add.go +++ b/cmd/event-add.go @@ -66,7 +66,7 @@ FLAGS: {{end}} EXAMPLES: 1. Enable bucket notification with a specific ARN - {{.Prompt}} {{.HelpName}} myminio/mybucket arn:aws:sqs:us-west-2:444455556666:your-queue + {{.Prompt}} {{.HelpName}} mysilo/mybucket arn:aws:sqs:us-west-2:444455556666:your-queue 2. Enable bucket notification with filters parameters {{.Prompt}} {{.HelpName}} s3/mybucket arn:aws:sqs:us-west-2:444455556666:your-queue --event put,delete,get --prefix photos/ --suffix .jpg @@ -75,7 +75,7 @@ EXAMPLES: {{.Prompt}} {{.HelpName}} s3/mybucket arn:aws:sqs:us-west-2:444455556666:your-queue -p --event put,delete,get --prefix photos/ --suffix .jpg 4. Enable bucket notification for Replication and ILM transition events to a specific ARN - {{.Prompt}} {{.HelpName}} myminio/mysourcebucket arn:aws:sqs:us-west-2:444455556666:your-queue --event replica,ilm + {{.Prompt}} {{.HelpName}} mysilo/mysourcebucket arn:aws:sqs:us-west-2:444455556666:your-queue --event replica,ilm `, } diff --git a/cmd/event-list.go b/cmd/event-list.go index 9356c851a0..1af510a1db 100644 --- a/cmd/event-list.go +++ b/cmd/event-list.go @@ -49,7 +49,7 @@ FLAGS: {{end}} EXAMPLES: 1. List notification configurations associated to a specific arn - {{.Prompt}} {{.HelpName}} myminio/mybucket arn:aws:sqs:us-west-2:444455556666:your-queue + {{.Prompt}} {{.HelpName}} mysilo/mybucket arn:aws:sqs:us-west-2:444455556666:your-queue 2. List all notification configurations {{.Prompt}} {{.HelpName}} s3/mybucket diff --git a/cmd/event-remove.go b/cmd/event-remove.go index 1f2fde40b0..5b4832b511 100644 --- a/cmd/event-remove.go +++ b/cmd/event-remove.go @@ -67,10 +67,10 @@ FLAGS: {{end}} EXAMPLES: 1. Remove bucket notification associated to a specific arn - {{.Prompt}} {{.HelpName}} myminio/mybucket arn:aws:sqs:us-west-2:444455556666:your-queue + {{.Prompt}} {{.HelpName}} mysilo/mybucket arn:aws:sqs:us-west-2:444455556666:your-queue 2. Remove all bucket notifications. --force flag is mandatory here - {{.Prompt}} {{.HelpName}} myminio/mybucket --force + {{.Prompt}} {{.HelpName}} mysilo/mybucket --force `, } diff --git a/cmd/find-main.go b/cmd/find-main.go index 4a7d66d7a6..843cc84965 100644 --- a/cmd/find-main.go +++ b/cmd/find-main.go @@ -87,11 +87,11 @@ var ( }, cli.StringSliceFlag{ Name: "metadata", - Usage: "match metadata with RE2 regex pattern. Specify each with key=regex. MinIO server only.", + Usage: "match metadata with RE2 regex pattern. Specify each with key=regex. Silo/MinIO server only.", }, cli.StringSliceFlag{ Name: "tags", - Usage: "match tags with RE2 regex pattern. Specify each with key=regex. MinIO server only.", + Usage: "match tags with RE2 regex pattern. Specify each with key=regex. Silo/MinIO server only.", }, } ) @@ -153,8 +153,8 @@ EXAMPLES: 05. Find all images with ".jpg", ".png", and ".gif" extensions, using regex under "s3/photos". {{.Prompt}} {{.HelpName}} s3/photos --regex "(?i)\.(jpg|png|gif)$" - 06. Find all images with ".jpg" extension under "s3/bucket" and copy to "play/bucket" *continuously*. - {{.Prompt}} {{.HelpName}} s3/bucket --name "*.jpg" --watch --exec "mc cp {} play/bucket" + 06. Find all images with ".jpg" extension under "s3/bucket" and copy to "mysilo/bucket" *continuously*. + {{.Prompt}} {{.HelpName}} s3/bucket --name "*.jpg" --watch --exec "mc cp {} mysilo/bucket" 07. Find and generate public URLs valid for 7 days, for all objects between 64 MB, and 1 GB in size under "s3" account. {{.Prompt}} {{.HelpName}} s3 --larger 64MB --smaller 1GB --print {url} @@ -193,7 +193,7 @@ func checkFindSyntax(ctx context.Context, cliCtx *cli.Context, encKeyDB map[stri for _, url := range args { _, _, err := url2Stat(ctx, url2StatOptions{urlStr: url, versionID: "", fileAttr: false, encKeyDB: encKeyDB, timeRef: time.Time{}, isZip: false, ignoreBucketExistsCheck: false}) if err != nil { - // Bucket name empty is a valid error for 'find myminio' unless we are using watch, treat it as such. + // Bucket name empty is a valid error for 'find mysilo' unless we are using watch, treat it as such. if _, ok := err.ToGoError().(BucketNameEmpty); ok && !cliCtx.Bool("watch") { continue } diff --git a/cmd/find.go b/cmd/find.go index 8d0ca7f1b8..ecdae98024 100644 --- a/cmd/find.go +++ b/cmd/find.go @@ -108,7 +108,7 @@ func patternMatch(pattern, match string) bool { // supports '*' and '?' wildcards in the pattern string. // unlike path.Match(), considers a path as a flat name space // while matching the pattern. The difference is illustrated in -// the example here https://play.golang.org/p/Ega9qgD4Qz . +// the example here https://mysilo.golang.org/p/Ega9qgD4Qz . func pathMatch(pattern, path string) bool { return wildcard.Match(pattern, path) } diff --git a/cmd/flags.go b/cmd/flags.go index 1dd3c27f51..d2047c8c01 100644 --- a/cmd/flags.go +++ b/cmd/flags.go @@ -66,7 +66,7 @@ var globalFlags = []cli.Flag{ }, cli.StringSliceFlag{ Name: "resolve", - Usage: "resolves HOST[:PORT] to an IP address. Example: minio.local:9000=10.10.75.1", + Usage: "resolves HOST[:PORT] to an IP address. Example: silo.local:9000=10.10.75.1", EnvVar: envPrefix + "RESOLVE", }, cli.BoolFlag{ diff --git a/cmd/get-main.go b/cmd/get-main.go index 43060a1e16..bd4c2c1931 100644 --- a/cmd/get-main.go +++ b/cmd/get-main.go @@ -54,11 +54,11 @@ FLAGS: {{end}} EXAMPLES: - 1. Get an object from MinIO storage to local file system - {{.Prompt}} {{.HelpName}} play/mybucket/object path-to/object + 1. Get an object from Silo/MinIO storage to local file system + {{.Prompt}} {{.HelpName}} mysilo/mybucket/object path-to/object - 2. Get an object from MinIO storage using encryption - {{.Prompt}} {{.HelpName}} --enc-c "play/mybucket/object=MDEyMzQ1Njc4OTAxMjM0NTY3ODkwMTIzNDU2Nzg5MDA" play/mybucket/object path-to/object + 2. Get an object from Silo/MinIO storage using encryption + {{.Prompt}} {{.HelpName}} --enc-c "mysilo/mybucket/object=MDEyMzQ1Njc4OTAxMjM0NTY3ODkwMTIzNDU2Nzg5MDA" mysilo/mybucket/object path-to/object `, } diff --git a/cmd/head-main.go b/cmd/head-main.go index 1b1f811d98..08ed210752 100644 --- a/cmd/head-main.go +++ b/cmd/head-main.go @@ -49,7 +49,7 @@ var headFlags = []cli.Flag{ }, cli.BoolFlag{ Name: "zip", - Usage: "extract from remote zip file (MinIO server source only)", + Usage: "extract from remote zip file (Silo/MinIO server source only)", }, } diff --git a/cmd/health_v1.go b/cmd/health_v1.go index 2704a44545..1880c8a62f 100644 --- a/cmd/health_v1.go +++ b/cmd/health_v1.go @@ -92,7 +92,7 @@ type SwInfoV1 struct { OsInfo []madmin.ServerOsInfo `json:"osinfos,omitempty"` } -// MinioHealthInfoV1 - Health info of the MinIO cluster +// MinioHealthInfoV1 - Health info of the Silo/MinIO cluster type MinioHealthInfoV1 struct { Info madmin.InfoMessage `json:"info,omitempty"` Config any `json:"config,omitempty"` diff --git a/cmd/idp-ldap-accesskey-create-with-login.go b/cmd/idp-ldap-accesskey-create-with-login.go index b6d7b19406..e02dec3b85 100644 --- a/cmd/idp-ldap-accesskey-create-with-login.go +++ b/cmd/idp-ldap-accesskey-create-with-login.go @@ -62,8 +62,8 @@ FLAGS: {{range .VisibleFlags}}{{.}} {{end}} EXAMPLES: - 1. Create a new access key pair for https://minio.example.com by logging in with LDAP credentials - {{.Prompt}} {{.HelpName}} https://minio.example.com + 1. Create a new access key pair for https://silo.example.com by logging in with LDAP credentials + {{.Prompt}} {{.HelpName}} https://silo.example.com 2. Create a new access key pair for http://localhost:9000 via login with custom access key and secret key {{.Prompt}} {{.HelpName}} http://localhost:9000 --access-key myaccesskey --secret-key mysecretkey diff --git a/cmd/idp-ldap-accesskey-disable.go b/cmd/idp-ldap-accesskey-disable.go index 511da3afaf..a3cbc54ad0 100644 --- a/cmd/idp-ldap-accesskey-disable.go +++ b/cmd/idp-ldap-accesskey-disable.go @@ -39,7 +39,7 @@ FLAGS: {{end}} EXAMPLES: 1. Disable LDAP access key - {{.Prompt}} {{.HelpName}} myminio myaccesskey + {{.Prompt}} {{.HelpName}} mysilo myaccesskey `, } diff --git a/cmd/idp-ldap-accesskey-edit.go b/cmd/idp-ldap-accesskey-edit.go index 2944bf5794..b3f023c08d 100644 --- a/cmd/idp-ldap-accesskey-edit.go +++ b/cmd/idp-ldap-accesskey-edit.go @@ -75,9 +75,9 @@ FLAGS: {{end}} EXAMPLES: 1. Change the secret key for the access key "testkey" - {{.Prompt}} {{.HelpName}} myminio/ testkey --secret-key 'xxxxxxx' + {{.Prompt}} {{.HelpName}} mysilo/ testkey --secret-key 'xxxxxxx' 2. Change the expiry duration for the access key "testkey" - {{.Prompt}} {{.HelpName}} myminio/ testkey ---expiry-duration 24h + {{.Prompt}} {{.HelpName}} mysilo/ testkey ---expiry-duration 24h `, } diff --git a/cmd/idp-ldap-accesskey-enable.go b/cmd/idp-ldap-accesskey-enable.go index a1afd21454..9b8f8b04b6 100644 --- a/cmd/idp-ldap-accesskey-enable.go +++ b/cmd/idp-ldap-accesskey-enable.go @@ -41,7 +41,7 @@ FLAGS: {{end}} EXAMPLES: 1. Enable LDAP access key - {{.Prompt}} {{.HelpName}} myminio myaccesskey + {{.Prompt}} {{.HelpName}} mysilo myaccesskey `, } diff --git a/cmd/idp-ldap-accesskey-list.go b/cmd/idp-ldap-accesskey-list.go index 9f67e60b2b..02b748cbb1 100644 --- a/cmd/idp-ldap-accesskey-list.go +++ b/cmd/idp-ldap-accesskey-list.go @@ -73,17 +73,17 @@ EXAMPLES: 2. Get list of LDAP users in local server (if admin) {{.Prompt}} {{.HelpName}} local/ --users-only - 3. Get list of all users and associated temporary access keys in play server (if admin) - {{.Prompt}} {{.HelpName}} play/ --temp-only + 3. Get list of all users and associated temporary access keys in mysilo server (if admin) + {{.Prompt}} {{.HelpName}} mysilo/ --temp-only 4. Get list of access keys associated with user 'bobfisher' - {{.Prompt}} {{.HelpName}} play/ uid=bobfisher,dc=min,dc=io + {{.Prompt}} {{.HelpName}} mysilo/ uid=bobfisher,dc=example,dc=com 5. Get list of access keys associated with user 'bobfisher' (alt) - {{.Prompt}} {{.HelpName}} play/ bobfisher + {{.Prompt}} {{.HelpName}} mysilo/ bobfisher 6. Get list of access keys associated with users 'bobfisher' and 'cody3' - {{.Prompt}} {{.HelpName}} play/ uid=bobfisher,dc=min,dc=io uid=cody3,dc=min,dc=io + {{.Prompt}} {{.HelpName}} mysilo/ uid=bobfisher,dc=example,dc=com uid=cody3,dc=example,dc=com 7. Get authenticated user and associated access keys in local server (if not admin) {{.Prompt}} {{.HelpName}} local/ diff --git a/cmd/idp-ldap-accesskey-sts-revoke.go b/cmd/idp-ldap-accesskey-sts-revoke.go index 7fccf763b6..20169d21ac 100644 --- a/cmd/idp-ldap-accesskey-sts-revoke.go +++ b/cmd/idp-ldap-accesskey-sts-revoke.go @@ -43,19 +43,19 @@ FLAGS: {{end}} EXAMPLES: 1. Revoke all STS accounts for LDAP user 'bobfisher' - {{.Prompt}} {{.HelpName}} myminio uid=bobfisher,ou=people,ou=hwengg,dc=min,dc=io --all + {{.Prompt}} {{.HelpName}} mysilo uid=bobfisher,ou=people,ou=hwengg,dc=example,dc=com --all 2. Revoke all STS accounts for LDAP user 'bobfisher' (alt) - {{.Prompt}} {{.HelpName}} myminio bobfisher --all + {{.Prompt}} {{.HelpName}} mysilo bobfisher --all 3. Revoke STS accounts of a token type 'app-1' for user 'user1' - {{.Prompt}} {{.HelpName}} myminio user1 --token-type app-1 + {{.Prompt}} {{.HelpName}} mysilo user1 --token-type app-1 4. Revoke all STS accounts for the authenticated user (must be LDAP service account) - {{.Prompt}} {{.HelpName}} myminio --self + {{.Prompt}} {{.HelpName}} mysilo --self 5. Revoke STS accounts of a token type 'app-1' for the authenticated user (must be LDAP service account) - {{.Prompt}} {{.HelpName}} myminio --self --token-type app-1 + {{.Prompt}} {{.HelpName}} mysilo --self --token-type app-1 `, } diff --git a/cmd/idp-ldap-policy-subcommands.go b/cmd/idp-ldap-policy-subcommands.go index c58a82bb2c..eecf1cc435 100644 --- a/cmd/idp-ldap-policy-subcommands.go +++ b/cmd/idp-ldap-policy-subcommands.go @@ -58,16 +58,16 @@ USAGE: Exactly one "--user" or "--group" flag is required. POLICY: - Name of a policy on the MinIO server. + Name of a policy on the Silo/MinIO server. FLAGS: {{range .VisibleFlags}}{{.}} {{end}} EXAMPLES: 1. Attach policy "mypolicy" to a user - {{.Prompt}} {{.HelpName}} play/ mypolicy --user='uid=bobfisher,ou=people,ou=hwengg,dc=min,dc=io' + {{.Prompt}} {{.HelpName}} mysilo/ mypolicy --user='uid=bobfisher,ou=people,ou=hwengg,dc=example,dc=com' 2. Attach policies "policy1" and "policy2" to a group - {{.Prompt}} {{.HelpName}} play/ policy1 policy2 --group='cn=projectb,ou=groups,ou=swengg,dc=min,dc=io' + {{.Prompt}} {{.HelpName}} mysilo/ policy1 policy2 --group='cn=projectb,ou=groups,ou=swengg,dc=example,dc=com' `, } @@ -184,16 +184,16 @@ USAGE: Exactly one of "--user" or "--group" is required. POLICY: - Name of a policy on the MinIO server. + Name of a policy on the Silo/MinIO server. FLAGS: {{range .VisibleFlags}}{{.}} {{end}} EXAMPLES: 1. Detach policy "mypolicy" from a user - {{.Prompt}} {{.HelpName}} play/ mypolicy --user='uid=bobfisher,ou=people,ou=hwengg,dc=min,dc=io' + {{.Prompt}} {{.HelpName}} mysilo/ mypolicy --user='uid=bobfisher,ou=people,ou=hwengg,dc=example,dc=com' 2. Detach policies "policy1" and "policy2" from a group - {{.Prompt}} {{.HelpName}} play/ policy1 policy2 --group='cn=projectb,ou=groups,ou=swengg,dc=min,dc=io' + {{.Prompt}} {{.HelpName}} mysilo/ policy1 policy2 --group='cn=projectb,ou=groups,ou=swengg,dc=example,dc=com' `, } @@ -280,22 +280,22 @@ FLAGS: {{end}} EXAMPLES: 1. List all LDAP entities associated with all policies - {{.Prompt}} {{.HelpName}} play/ + {{.Prompt}} {{.HelpName}} mysilo/ 2. List all LDAP entities associated with the policies 'finteam-policy' and 'mlteam-policy' - {{.Prompt}} {{.HelpName}} play/ --policy finteam-policy --policy mlteam-policy + {{.Prompt}} {{.HelpName}} mysilo/ --policy finteam-policy --policy mlteam-policy 3. List all policies associated with a pair of User LDAP entities - {{.Prompt}} {{.HelpName}} play/ \ - --user 'uid=bobfisher,ou=people,ou=hwengg,dc=min,dc=io' \ - --user 'uid=fahim,ou=people,ou=swengg,dc=min,dc=io' + {{.Prompt}} {{.HelpName}} mysilo/ \ + --user 'uid=bobfisher,ou=people,ou=hwengg,dc=example,dc=com' \ + --user 'uid=fahim,ou=people,ou=swengg,dc=example,dc=com' 4. List all policies associated with a pair of Group LDAP entities - {{.Prompt}} {{.HelpName}} play/ \ - --group 'cn=projecta,ou=groups,ou=swengg,dc=min,dc=io' \ - --group 'cn=projectb,ou=groups,ou=swengg,dc=min,dc=io' + {{.Prompt}} {{.HelpName}} mysilo/ \ + --group 'cn=projecta,ou=groups,ou=swengg,dc=example,dc=com' \ + --group 'cn=projectb,ou=groups,ou=swengg,dc=example,dc=com' 5. List all entities associated with a policy, group and user - {{.Prompt}} {{.HelpName}} play/ \ + {{.Prompt}} {{.HelpName}} mysilo/ \ --policy finteam-policy - --user 'uid=bobfisher,ou=people,ou=hwengg,dc=min,dc=io' \ - --group 'cn=projectb,ou=groups,ou=swengg,dc=min,dc=io' + --user 'uid=bobfisher,ou=people,ou=hwengg,dc=example,dc=com' \ + --group 'cn=projectb,ou=groups,ou=swengg,dc=example,dc=com' `, } diff --git a/cmd/idp-ldap-subcommands.go b/cmd/idp-ldap-subcommands.go index 708375b477..aab21c23cc 100644 --- a/cmd/idp-ldap-subcommands.go +++ b/cmd/idp-ldap-subcommands.go @@ -44,13 +44,13 @@ FLAGS: {{end}} EXAMPLES: 1. Create LDAP IDentity Provider configuration. - {{.Prompt}} {{.HelpName}} myminio/ \ + {{.Prompt}} {{.HelpName}} mysilo/ \ server_addr=myldapserver:636 \ - lookup_bind_dn=cn=admin,dc=min,dc=io \ + lookup_bind_dn=cn=admin,dc=example,dc=com \ lookup_bind_password=somesecret \ - user_dn_search_base_dn=dc=min,dc=io \ + user_dn_search_base_dn=dc=example,dc=com \ user_dn_search_filter="(uid=%s)" \ - group_search_base_dn=ou=swengg,dc=min,dc=io \ + group_search_base_dn=ou=swengg,dc=example,dc=com \ group_search_filter="(&(objectclass=groupofnames)(member=%d))" `, } @@ -112,8 +112,8 @@ FLAGS: {{end}} EXAMPLES: 1. Update the LDAP IDP configuration. - {{.Prompt}} {{.HelpName}} play/ \ - lookup_bind_dn=cn=admin,dc=min,dc=io \ + {{.Prompt}} {{.HelpName}} mysilo/ \ + lookup_bind_dn=cn=admin,dc=example,dc=com \ lookup_bind_password=somesecret `, } @@ -176,7 +176,7 @@ FLAGS: {{end}} EXAMPLES: 1. Remove the default LDAP IDP configuration. - {{.Prompt}} {{.HelpName}} play/ + {{.Prompt}} {{.HelpName}} mysilo/ `, } @@ -208,7 +208,7 @@ FLAGS: {{end}} EXAMPLES: 1. List configurations for LDAP IDP. - {{.Prompt}} {{.HelpName}} play/ + {{.Prompt}} {{.HelpName}} mysilo/ `, } @@ -238,7 +238,7 @@ FLAGS: {{end}} EXAMPLES: 1. Get configuration info on the LDAP IDP configuration. - {{.Prompt}} {{.HelpName}} play/ + {{.Prompt}} {{.HelpName}} mysilo/ `, } @@ -269,7 +269,7 @@ FLAGS: {{end}} EXAMPLES: 1. Enable the LDAP IDP configuration. - {{.Prompt}} {{.HelpName}} play/ + {{.Prompt}} {{.HelpName}} mysilo/ `, } @@ -300,7 +300,7 @@ FLAGS: {{end}} EXAMPLES: 1. Disable the default LDAP IDP configuration. - {{.Prompt}} {{.HelpName}} play/ + {{.Prompt}} {{.HelpName}} mysilo/ `, } diff --git a/cmd/idp-openid-accesskey-disable.go b/cmd/idp-openid-accesskey-disable.go index ebb57ba6d1..bf83112d17 100644 --- a/cmd/idp-openid-accesskey-disable.go +++ b/cmd/idp-openid-accesskey-disable.go @@ -39,7 +39,7 @@ FLAGS: {{end}} EXAMPLES: 1. Disable LDAP access key - {{.Prompt}} {{.HelpName}} myminio myaccesskey + {{.Prompt}} {{.HelpName}} mysilo myaccesskey `, } diff --git a/cmd/idp-openid-accesskey-edit.go b/cmd/idp-openid-accesskey-edit.go index 042edd4555..1f57e82830 100644 --- a/cmd/idp-openid-accesskey-edit.go +++ b/cmd/idp-openid-accesskey-edit.go @@ -66,9 +66,9 @@ FLAGS: {{end}} EXAMPLES: 1. Change the secret key for the access key "testkey" - {{.Prompt}} {{.HelpName}} myminio/ testkey --secret-key 'xxxxxxx' + {{.Prompt}} {{.HelpName}} mysilo/ testkey --secret-key 'xxxxxxx' 2. Change the expiry duration for the access key "testkey" - {{.Prompt}} {{.HelpName}} myminio/ testkey --expiry-duration 24h + {{.Prompt}} {{.HelpName}} mysilo/ testkey --expiry-duration 24h `, } diff --git a/cmd/idp-openid-accesskey-enable.go b/cmd/idp-openid-accesskey-enable.go index 892d522516..d693e4012b 100644 --- a/cmd/idp-openid-accesskey-enable.go +++ b/cmd/idp-openid-accesskey-enable.go @@ -39,7 +39,7 @@ FLAGS: {{end}} EXAMPLES: 1. Enable LDAP access key - {{.Prompt}} {{.HelpName}} myminio myaccesskey + {{.Prompt}} {{.HelpName}} mysilo myaccesskey `, } diff --git a/cmd/idp-openid-accesskey-list.go b/cmd/idp-openid-accesskey-list.go index c7d65b6685..99606b56f3 100644 --- a/cmd/idp-openid-accesskey-list.go +++ b/cmd/idp-openid-accesskey-list.go @@ -79,14 +79,14 @@ EXAMPLES: 2. Get list of OpenID users in local server (if admin) {{.Prompt}} {{.HelpName}} local/ --users-only - 3. Get list of all users and associated temporary access keys in play server (if admin) - {{.Prompt}} {{.HelpName}} play/ --temp-only + 3. Get list of all users and associated temporary access keys in mysilo server (if admin) + {{.Prompt}} {{.HelpName}} mysilo/ --temp-only 4. Get list of access keys associated with internal name 'openidinternalname' - {{.Prompt}} {{.HelpName}} play/ openidinternalname + {{.Prompt}} {{.HelpName}} mysilo/ openidinternalname 5. Get list of access keys associated with ID claim 'openidsub' (default claim is sub) - {{.Prompt}} {{.HelpName}} play/ openidsub + {{.Prompt}} {{.HelpName}} mysilo/ openidsub 7. Get authenticated user and associated access keys in local server (if not admin) {{.Prompt}} {{.HelpName}} local/ diff --git a/cmd/idp-openid-subcommands.go b/cmd/idp-openid-subcommands.go index 3d678b3f42..bd959e7edd 100644 --- a/cmd/idp-openid-subcommands.go +++ b/cmd/idp-openid-subcommands.go @@ -46,17 +46,17 @@ FLAGS: {{end}} EXAMPLES: 1. Create a default OpenID IDP configuration (CFG_NAME is omitted). - {{.Prompt}} {{.HelpName}} play/ \ - client_id=minio-client-app \ - client_secret=minio-client-app-secret \ + {{.Prompt}} {{.HelpName}} mysilo/ \ + client_id=silo-client-app \ + client_secret=silo-client-app-secret \ config_url="http://localhost:5556/dex/.well-known/openid-configuration" \ scopes="openid,groups" \ redirect_uri="http://127.0.0.1:10000/oauth_callback" \ role_policy="consoleAdmin" 2. Create OpenID IDP configuration named "dex_test". - {{.Prompt}} {{.HelpName}} play/ dex_test \ - client_id=minio-client-app \ - client_secret=minio-client-app-secret \ + {{.Prompt}} {{.HelpName}} mysilo/ dex_test \ + client_id=silo-client-app \ + client_secret=silo-client-app-secret \ config_url="http://localhost:5556/dex/.well-known/openid-configuration" \ scopes="openid,groups" \ redirect_uri="http://127.0.0.1:10000/oauth_callback" \ @@ -120,11 +120,11 @@ FLAGS: {{end}} EXAMPLES: 1. Update the default OpenID IDP configuration (CFG_NAME is omitted). - {{.Prompt}} {{.HelpName}} play/ + {{.Prompt}} {{.HelpName}} mysilo/ scopes="openid,groups" \ role_policy="consoleAdmin" 2. Update configuration for OpenID IDP configuration named "dex_test". - {{.Prompt}} {{.HelpName}} play/ dex_test \ + {{.Prompt}} {{.HelpName}} mysilo/ dex_test \ scopes="openid,groups" \ role_policy="consoleAdmin" `, @@ -153,9 +153,9 @@ FLAGS: {{end}} EXAMPLES: 1. Remove the default OpenID IDP configuration (CFG_NAME is omitted). - {{.Prompt}} {{.HelpName}} play/ + {{.Prompt}} {{.HelpName}} mysilo/ 2. Remove OpenID IDP configuration named "dex_test". - {{.Prompt}} {{.HelpName}} play/ dex_test + {{.Prompt}} {{.HelpName}} mysilo/ dex_test `, } @@ -216,7 +216,7 @@ FLAGS: {{end}} EXAMPLES: 1. List configurations for OpenID IDP. - {{.Prompt}} {{.HelpName}} play/ + {{.Prompt}} {{.HelpName}} mysilo/ `, } @@ -360,9 +360,9 @@ FLAGS: {{end}} EXAMPLES: 1. Get configuration info on the default OpenID IDP configuration (CFG_NAME is omitted). - {{.Prompt}} {{.HelpName}} play/ + {{.Prompt}} {{.HelpName}} mysilo/ 2. Get configuration info on OpenID IDP configuration named "dex_test". - {{.Prompt}} {{.HelpName}} play/ dex_test + {{.Prompt}} {{.HelpName}} mysilo/ dex_test `, } @@ -488,9 +488,9 @@ FLAGS: {{end}} EXAMPLES: 1. Enable the default OpenID IDP configuration (CFG_NAME is omitted). - {{.Prompt}} {{.HelpName}} play/ + {{.Prompt}} {{.HelpName}} mysilo/ 2. Enable OpenID IDP configuration named "dex_test". - {{.Prompt}} {{.HelpName}} play/ dex_test + {{.Prompt}} {{.HelpName}} mysilo/ dex_test `, } @@ -554,9 +554,9 @@ FLAGS: {{end}} EXAMPLES: 1. Disable the default OpenID IDP configuration (CFG_NAME is omitted). - {{.Prompt}} {{.HelpName}} play/ + {{.Prompt}} {{.HelpName}} mysilo/ 2. Disable OpenID IDP configuration named "dex_test". - {{.Prompt}} {{.HelpName}} play/ dex_test + {{.Prompt}} {{.HelpName}} mysilo/ dex_test `, } diff --git a/cmd/idp.go b/cmd/idp.go index 6c29f75f72..b9aee7866b 100644 --- a/cmd/idp.go +++ b/cmd/idp.go @@ -26,7 +26,7 @@ var idpSubcommands = []cli.Command{ var idpCmd = cli.Command{ Name: "idp", - Usage: "manage MinIO IDentity Provider server configuration", + Usage: "manage Silo/MinIO IDentity Provider server configuration", Action: mainIDP, Before: setGlobalsFromContext, Flags: globalFlags, diff --git a/cmd/ilm-deprecated-cmds.go b/cmd/ilm-deprecated-cmds.go index 8cdb6015fd..a6823b1b8a 100644 --- a/cmd/ilm-deprecated-cmds.go +++ b/cmd/ilm-deprecated-cmds.go @@ -51,23 +51,23 @@ DESCRIPTION: EXAMPLES: 1. Add a lifecycle rule with an expiration action for all objects in mybucket. - {{.Prompt}} {{.HelpName}} --expire-days "200" myminio/mybucket + {{.Prompt}} {{.HelpName}} --expire-days "200" mysilo/mybucket 2. Add a lifecycle rule with a transition and a noncurrent version transition action for objects with prefix doc/ in mybucket. - Tiers must exist in MinIO. Use existing tiers or add new tiers. - {{.Prompt}} mc tier add minio myminio MINIOTIER-1 --endpoint https://warm-minio-1.com \ + Tiers must exist in Silo/MinIO. Use existing tiers or add new tiers. + {{.Prompt}} mc tier add minio mysilo SILOTIER-1 --endpoint https://warm-silo-1.com \ --access-key ACCESSKEY --secret-key SECRETKEY --bucket bucket1 --prefix prefix1 - {{.Prompt}} mc tier add minio myminio MINIOTIER-2 --endpoint https://warm-minio-2.com \ + {{.Prompt}} mc tier add minio mysilo SILOTIER-2 --endpoint https://warm-silo-2.com \ --access-key ACCESSKEY --secret-key SECRETKEY --bucket bucket2 --prefix prefix2 - {{.Prompt}} {{.HelpName}} --prefix "doc/" --transition-days "90" --transition-tier "MINIOTIER-1" \ - --noncurrent-transition-days "45" --noncurrent-transition-tier "MINIOTIER-2" \ - myminio/mybucket/ + {{.Prompt}} {{.HelpName}} --prefix "doc/" --transition-days "90" --transition-tier "SILOTIER-1" \ + --noncurrent-transition-days "45" --noncurrent-transition-tier "SILOTIER-2" \ + mysilo/mybucket/ 3. Add a lifecycle rule with an expiration and a noncurrent version expiration action for all objects with prefix doc/ in mybucket. {{.Prompt}} {{.HelpName}} --prefix "doc/" --expire-days "300" --noncurrent-expire-days "100" \ - myminio/mybucket/ + mysilo/mybucket/ `, } ilmDepRmCmd = cli.Command{ @@ -92,12 +92,12 @@ DESCRIPTION: all the lifecycle rules on a bucket with '--all --force' option. EXAMPLES: - 1. Remove the lifecycle management configuration rule given by ID "bgrt1ghju" for mybucket on alias 'myminio'. ID is case sensitive. - {{.Prompt}} {{.HelpName}} --id "bgrt1ghju" myminio/mybucket + 1. Remove the lifecycle management configuration rule given by ID "bgrt1ghju" for mybucket on alias 'mysilo'. ID is case sensitive. + {{.Prompt}} {{.HelpName}} --id "bgrt1ghju" mysilo/mybucket - 2. Remove ALL the lifecycle management configuration rules for mybucket on alias 'myminio'. + 2. Remove ALL the lifecycle management configuration rules for mybucket on alias 'mysilo'. Because the result is complete removal, the use of --force flag is enforced. - {{.Prompt}} {{.HelpName}} --all --force myminio/mybucket + {{.Prompt}} {{.HelpName}} --all --force mysilo/mybucket `, } @@ -156,17 +156,17 @@ DESCRIPTION: List lifecycle configuration rules set on a bucket. EXAMPLES: - 1. List the lifecycle management rules (all fields) for mybucket on alias 'myminio'. - {{.Prompt}} {{.HelpName}} myminio/mybucket + 1. List the lifecycle management rules (all fields) for mybucket on alias 'mysilo'. + {{.Prompt}} {{.HelpName}} mysilo/mybucket - 2. List the lifecycle management rules (expration date/days fields) for mybucket on alias 'myminio'. - {{.Prompt}} {{.HelpName}} --expiry myminio/mybucket + 2. List the lifecycle management rules (expration date/days fields) for mybucket on alias 'mysilo'. + {{.Prompt}} {{.HelpName}} --expiry mysilo/mybucket - 3. List the lifecycle management rules (transition date/days, storage class fields) for mybucket on alias 'myminio'. - {{.Prompt}} {{.HelpName}} --transition myminio/mybucket + 3. List the lifecycle management rules (transition date/days, storage class fields) for mybucket on alias 'mysilo'. + {{.Prompt}} {{.HelpName}} --transition mysilo/mybucket - 4. List the lifecycle management rules in JSON format for mybucket on alias 'myminio'. - {{.Prompt}} {{.HelpName}} --json myminio/mybucket + 4. List the lifecycle management rules in JSON format for mybucket on alias 'mysilo'. + {{.Prompt}} {{.HelpName}} --json mysilo/mybucket `, } @@ -189,10 +189,10 @@ DESCRIPTION: EXAMPLES: 1. Export lifecycle configuration for 'mybucket' to 'lifecycle.json' file. - {{.Prompt}} {{.HelpName}} myminio/mybucket > lifecycle.json + {{.Prompt}} {{.HelpName}} mysilo/mybucket > lifecycle.json 2. Print lifecycle configuration for 'mybucket' to STDOUT. - {{.Prompt}} {{.HelpName}} play/mybucket + {{.Prompt}} {{.HelpName}} mysilo/mybucket `, } @@ -214,11 +214,11 @@ DESCRIPTION: Import entire lifecycle configuration from STDIN, input file is expected to be in JSON format. EXAMPLES: - 1. Set lifecycle configuration for the mybucket on alias 'myminio' to the rules imported from lifecycle.json - {{.Prompt}} {{.HelpName}} myminio/mybucket < lifecycle.json + 1. Set lifecycle configuration for the mybucket on alias 'mysilo' to the rules imported from lifecycle.json + {{.Prompt}} {{.HelpName}} mysilo/mybucket < lifecycle.json - 2. Set lifecycle configuration for the mybucket on alias 'myminio'. User is expected to enter the JSON contents on STDIN - {{.Prompt}} {{.HelpName}} myminio/mybucket + 2. Set lifecycle configuration for the mybucket on alias 'mysilo'. User is expected to enter the JSON contents on STDIN + {{.Prompt}} {{.HelpName}} mysilo/mybucket `, } ) diff --git a/cmd/ilm-remove.go b/cmd/ilm-remove.go index d02c0effdc..39f756ed19 100644 --- a/cmd/ilm-remove.go +++ b/cmd/ilm-remove.go @@ -64,12 +64,12 @@ DESCRIPTION: all the lifecycle rules on a bucket with '--all --force' option. EXAMPLES: - 1. Remove the lifecycle management configuration rule given by ID "bgrt1ghju" for mybucket on alias 'myminio'. ID is case sensitive. - {{.Prompt}} {{.HelpName}} --id "bgrt1ghju" myminio/mybucket + 1. Remove the lifecycle management configuration rule given by ID "bgrt1ghju" for mybucket on alias 'mysilo'. ID is case sensitive. + {{.Prompt}} {{.HelpName}} --id "bgrt1ghju" mysilo/mybucket - 2. Remove ALL the lifecycle management configuration rules for mybucket on alias 'myminio'. + 2. Remove ALL the lifecycle management configuration rules for mybucket on alias 'mysilo'. Because the result is complete removal, the use of --force flag is enforced. - {{.Prompt}} {{.HelpName}} --all --force myminio/mybucket + {{.Prompt}} {{.HelpName}} --all --force mysilo/mybucket `, } diff --git a/cmd/ilm-restore.go b/cmd/ilm-restore.go index 57b2fd240c..7a7a08e365 100644 --- a/cmd/ilm-restore.go +++ b/cmd/ilm-restore.go @@ -74,19 +74,19 @@ FLAGS: EXAMPLES: 1. Restore one specific object - {{.Prompt}} {{.HelpName}} myminio/mybucket/path/to/object + {{.Prompt}} {{.HelpName}} mysilo/mybucket/path/to/object 2. Restore a specific object version - {{.Prompt}} {{.HelpName}} --vid "CL3sWgdSN2pNntSf6UnZAuh2kcu8E8si" myminio/mybucket/path/to/object + {{.Prompt}} {{.HelpName}} --vid "CL3sWgdSN2pNntSf6UnZAuh2kcu8E8si" mysilo/mybucket/path/to/object 3. Restore all objects under a specific prefix - {{.Prompt}} {{.HelpName}} --recursive myminio/mybucket/dir/ + {{.Prompt}} {{.HelpName}} --recursive mysilo/mybucket/dir/ 4. Restore all objects with all versions under a specific prefix - {{.Prompt}} {{.HelpName}} --recursive --versions myminio/mybucket/dir/ + {{.Prompt}} {{.HelpName}} --recursive --versions mysilo/mybucket/dir/ 5. Restore an SSE-C encrypted object. - {{.Prompt}} {{.HelpName}} --enc-c "myminio/mybucket/=MDEyMzQ1Njc4OTAxMjM0NTY3ODkwMTIzNDU2Nzg5MDA" myminio/mybucket/myobject.txt + {{.Prompt}} {{.HelpName}} --enc-c "mysilo/mybucket/=MDEyMzQ1Njc4OTAxMjM0NTY3ODkwMTIzNDU2Nzg5MDA" mysilo/mybucket/myobject.txt `, } diff --git a/cmd/ilm-rule-add.go b/cmd/ilm-rule-add.go index c6aabb0e24..a666f18009 100644 --- a/cmd/ilm-rule-add.go +++ b/cmd/ilm-rule-add.go @@ -50,21 +50,21 @@ DESCRIPTION: EXAMPLES: 1. Add a lifecycle rule with a transition and a noncurrent version transition action for objects with prefix doc/ whose size is greater than 1MiB in mybucket. - Tiers must exist in MinIO. Use existing tiers or add new tiers. + Tiers must exist in Silo/MinIO. Use existing tiers or add new tiers. - {{.Prompt}} mc ilm tier add minio myminio MINIOTIER-1 --endpoint https://warm-minio-1.com \ + {{.Prompt}} mc ilm tier add minio mysilo SILOTIER-1 --endpoint https://warm-silo-1.com \ --access-key ACCESSKEY --secret-key SECRETKEY --bucket bucket1 --prefix prefix1 - {{.Prompt}} {{.HelpName}} --prefix "doc/" --size-gt 1MiB --transition-days "90" --transition-tier "MINIOTIER-1" \ - --noncurrent-transition-days "45" --noncurrent-transition-tier "MINIOTIER-1" \ - myminio/mybucket/ + {{.Prompt}} {{.HelpName}} --prefix "doc/" --size-gt 1MiB --transition-days "90" --transition-tier "SILOTIER-1" \ + --noncurrent-transition-days "45" --noncurrent-transition-tier "SILOTIER-1" \ + mysilo/mybucket/ 2. Add a lifecycle rule with an expiration action for all objects in mybucket. - {{.Prompt}} {{.HelpName}} --expire-days "200" myminio/mybucket + {{.Prompt}} {{.HelpName}} --expire-days "200" mysilo/mybucket 3. Add a lifecycle rule with an expiration and a noncurrent version expiration action for all objects with prefix doc/ in mybucket. {{.Prompt}} {{.HelpName}} --prefix "doc/" --expire-days "300" --noncurrent-expire-days "100" \ - myminio/mybucket/ + mysilo/mybucket/ `, } @@ -119,7 +119,7 @@ var ilmAddFlags = []cli.Flag{ }, cli.StringFlag{ Name: "storage-class", - Usage: "storage class for current version to transition into. MinIO supports tiers configured via `mc-admin-tier-add`.", + Usage: "storage class for current version to transition into. Silo/MinIO supports tiers configured via `mc-admin-tier-add`.", Hidden: true, }, cli.StringFlag{ diff --git a/cmd/ilm-rule-export.go b/cmd/ilm-rule-export.go index b2509c1d5b..a9356da7d1 100644 --- a/cmd/ilm-rule-export.go +++ b/cmd/ilm-rule-export.go @@ -46,10 +46,10 @@ DESCRIPTION: EXAMPLES: 1. Export lifecycle configuration for 'mybucket' to 'lifecycle.json' file. - {{.Prompt}} {{.HelpName}} myminio/mybucket > lifecycle.json + {{.Prompt}} {{.HelpName}} mysilo/mybucket > lifecycle.json 2. Print lifecycle configuration for 'mybucket' to STDOUT. - {{.Prompt}} {{.HelpName}} play/mybucket + {{.Prompt}} {{.HelpName}} mysilo/mybucket `, } diff --git a/cmd/ilm-rule-import.go b/cmd/ilm-rule-import.go index bc613c868e..6f4e44b93e 100644 --- a/cmd/ilm-rule-import.go +++ b/cmd/ilm-rule-import.go @@ -45,11 +45,11 @@ DESCRIPTION: Import entire lifecycle configuration from STDIN, input file is expected to be in JSON format. EXAMPLES: - 1. Set lifecycle configuration for the mybucket on alias 'myminio' to the rules imported from lifecycle.json - {{.Prompt}} {{.HelpName}} myminio/mybucket < lifecycle.json + 1. Set lifecycle configuration for the mybucket on alias 'mysilo' to the rules imported from lifecycle.json + {{.Prompt}} {{.HelpName}} mysilo/mybucket < lifecycle.json - 2. Set lifecycle configuration for the mybucket on alias 'myminio'. User is expected to enter the JSON contents on STDIN - {{.Prompt}} {{.HelpName}} myminio/mybucket + 2. Set lifecycle configuration for the mybucket on alias 'mysilo'. User is expected to enter the JSON contents on STDIN + {{.Prompt}} {{.HelpName}} mysilo/mybucket `, } diff --git a/cmd/ilm-rule-list.go b/cmd/ilm-rule-list.go index 813a7988e0..b6aaf556a6 100644 --- a/cmd/ilm-rule-list.go +++ b/cmd/ilm-rule-list.go @@ -64,17 +64,17 @@ DESCRIPTION: List lifecycle configuration rules set on a bucket. EXAMPLES: - 1. List the lifecycle management rules (all fields) for mybucket on alias 'myminio'. - {{.Prompt}} {{.HelpName}} myminio/mybucket + 1. List the lifecycle management rules (all fields) for mybucket on alias 'mysilo'. + {{.Prompt}} {{.HelpName}} mysilo/mybucket - 2. List the lifecycle management rules (expration date/days fields) for mybucket on alias 'myminio'. - {{.Prompt}} {{.HelpName}} --expiry myminio/mybucket + 2. List the lifecycle management rules (expration date/days fields) for mybucket on alias 'mysilo'. + {{.Prompt}} {{.HelpName}} --expiry mysilo/mybucket - 3. List the lifecycle management rules (transition date/days, storage class fields) for mybucket on alias 'myminio'. - {{.Prompt}} {{.HelpName}} --transition myminio/mybucket + 3. List the lifecycle management rules (transition date/days, storage class fields) for mybucket on alias 'mysilo'. + {{.Prompt}} {{.HelpName}} --transition mysilo/mybucket - 4. List the lifecycle management rules in JSON format for mybucket on alias 'myminio'. - {{.Prompt}} {{.HelpName}} --json myminio/mybucket + 4. List the lifecycle management rules in JSON format for mybucket on alias 'mysilo'. + {{.Prompt}} {{.HelpName}} --json mysilo/mybucket `, } diff --git a/cmd/ilm-tier-add.go b/cmd/ilm-tier-add.go index 17d10fac59..001a42fcf7 100644 --- a/cmd/ilm-tier-add.go +++ b/cmd/ilm-tier-add.go @@ -139,21 +139,21 @@ FLAGS: {{range .VisibleFlags}}{{.}} {{end}} EXAMPLES: - 1. Configure a new remote tier which transitions objects to a bucket in a MinIO deployment: - {{.Prompt}} {{.HelpName}} minio myminio WARM-MINIO-TIER --endpoint https://warm-minio.com \ + 1. Configure a new remote tier which transitions objects to a bucket in a Silo/MinIO deployment: + {{.Prompt}} {{.HelpName}} minio mysilo WARM-SILO-TIER --endpoint https://warm-silo.com \ --access-key ACCESSKEY --secret-key SECRETKEY --bucket mybucket --prefix myprefix/ 2. Configure a new remote tier which transitions objects to a bucket in Azure Blob Storage: - {{.Prompt}} {{.HelpName}} azure myminio AZTIER --account-name ACCOUNT-NAME --account-key ACCOUNT-KEY \ + {{.Prompt}} {{.HelpName}} azure mysilo AZTIER --account-name ACCOUNT-NAME --account-key ACCOUNT-KEY \ --bucket myazurebucket --prefix myazureprefix/ 3. Configure a new remote tier which transitions objects to a bucket in AWS S3 with STANDARD storage class: - {{.Prompt}} {{.HelpName}} s3 myminio S3TIER --endpoint https://s3.amazonaws.com \ + {{.Prompt}} {{.HelpName}} s3 mysilo S3TIER --endpoint https://s3.amazonaws.com \ --access-key ACCESSKEY --secret-key SECRETKEY --bucket mys3bucket --prefix mys3prefix/ \ --storage-class "STANDARD" --region us-west-2 4. Configure a new remote tier which transitions objects to a bucket in Google Cloud Storage: - {{.Prompt}} {{.HelpName}} gcs myminio GCSTIER --credentials-file /path/to/credentials.json \ + {{.Prompt}} {{.HelpName}} gcs mysilo GCSTIER --credentials-file /path/to/credentials.json \ --bucket mygcsbucket --prefix mygcsprefix/ `, } diff --git a/cmd/ilm-tier-check.go b/cmd/ilm-tier-check.go index 20d4a11361..961e2128a5 100644 --- a/cmd/ilm-tier-check.go +++ b/cmd/ilm-tier-check.go @@ -40,6 +40,6 @@ FLAGS: {{end}} EXAMPLES: 1. Validate a tier config given by name. - {{.Prompt}} {{.HelpName}} myminio WARM-TIER + {{.Prompt}} {{.HelpName}} mysilo WARM-TIER `, } diff --git a/cmd/ilm-tier-edit.go b/cmd/ilm-tier-edit.go index d62c93443a..88ff3d28d0 100644 --- a/cmd/ilm-tier-edit.go +++ b/cmd/ilm-tier-edit.go @@ -91,13 +91,13 @@ FLAGS: {{end}} EXAMPLES: 1. Update credentials for an existing Azure Blob Storage remote tier: - {{.Prompt}} {{.HelpName}} myminio AZTIER --account-key ACCOUNT-KEY + {{.Prompt}} {{.HelpName}} mysilo AZTIER --account-key ACCOUNT-KEY 2. Update credentials for an existing AWS S3 compatible remote tier: - {{.Prompt}} {{.HelpName}} myminio S3TIER --access-key ACCESS-KEY --secret-key SECRET-KEY + {{.Prompt}} {{.HelpName}} mysilo S3TIER --access-key ACCESS-KEY --secret-key SECRET-KEY 3. Update credentials for an existing Google Cloud Storage remote tier: - {{.Prompt}} {{.HelpName}} myminio GCSTIER --credentials-file /path/to/credentials.json + {{.Prompt}} {{.HelpName}} mysilo GCSTIER --credentials-file /path/to/credentials.json `, } diff --git a/cmd/ilm-tier-info.go b/cmd/ilm-tier-info.go index 7e1bca35eb..01f391819c 100644 --- a/cmd/ilm-tier-info.go +++ b/cmd/ilm-tier-info.go @@ -49,11 +49,11 @@ FLAGS: {{end}} EXAMPLES: - 1. Prints per-tier statistics of all remote tier targets configured on 'myminio': - {{.Prompt}} {{.HelpName}} myminio + 1. Prints per-tier statistics of all remote tier targets configured on 'mysilo': + {{.Prompt}} {{.HelpName}} mysilo - 2. Print per-tier statistics of given tier name 'MINIOTIER-1': - {{.Prompt}} {{.HelpName}} myminio MINIOTIER-1 + 2. Print per-tier statistics of given tier name 'SILOTIER-1': + {{.Prompt}} {{.HelpName}} mysilo SILOTIER-1 `, } diff --git a/cmd/ilm-tier-list.go b/cmd/ilm-tier-list.go index 9401c348ac..ad46ac52e4 100644 --- a/cmd/ilm-tier-list.go +++ b/cmd/ilm-tier-list.go @@ -50,8 +50,8 @@ FLAGS: {{end}} EXAMPLES: - 1. List remote tier targets configured on 'myminio': - {{.Prompt}} {{.HelpName}} myminio + 1. List remote tier targets configured on 'mysilo': + {{.Prompt}} {{.HelpName}} mysilo `, } diff --git a/cmd/ilm-tier-remove.go b/cmd/ilm-tier-remove.go index 5a26dae8f4..25208aae39 100644 --- a/cmd/ilm-tier-remove.go +++ b/cmd/ilm-tier-remove.go @@ -58,7 +58,7 @@ FLAGS: {{end}} EXAMPLES: 1. Remove an empty tier by name 'WARM-TIER': - {{.Prompt}} {{.HelpName}} myminio WARM-TIER + {{.Prompt}} {{.HelpName}} mysilo WARM-TIER `, } diff --git a/cmd/ilm-tier-update.go b/cmd/ilm-tier-update.go index 007fab0226..b5b54da588 100644 --- a/cmd/ilm-tier-update.go +++ b/cmd/ilm-tier-update.go @@ -40,12 +40,12 @@ FLAGS: {{end}} EXAMPLES: 1. Update credentials for an existing Azure Blob Storage remote tier: - {{.Prompt}} {{.HelpName}} myminio AZTIER --account-key ACCOUNT-KEY + {{.Prompt}} {{.HelpName}} mysilo AZTIER --account-key ACCOUNT-KEY 2. Update credentials for an existing AWS S3 compatible remote tier: - {{.Prompt}} {{.HelpName}} myminio S3TIER --access-key ACCESS-KEY --secret-key SECRET-KEY + {{.Prompt}} {{.HelpName}} mysilo S3TIER --access-key ACCESS-KEY --secret-key SECRET-KEY 3. Update credentials for an existing Google Cloud Storage remote tier: - {{.Prompt}} {{.HelpName}} myminio GCSTIER --credentials-file /path/to/credentials.json + {{.Prompt}} {{.HelpName}} mysilo GCSTIER --credentials-file /path/to/credentials.json `, } diff --git a/cmd/ilm-tier-verify.go b/cmd/ilm-tier-verify.go index 0cd044dda9..be8a4e6fe9 100644 --- a/cmd/ilm-tier-verify.go +++ b/cmd/ilm-tier-verify.go @@ -44,7 +44,7 @@ FLAGS: {{end}} EXAMPLES: 1. Verify if a tier config is valid. - {{.Prompt}} {{.HelpName}} myminio WARM-TIER + {{.Prompt}} {{.HelpName}} mysilo WARM-TIER `, } diff --git a/cmd/legalhold-clear.go b/cmd/legalhold-clear.go index d6817900e3..181f610937 100644 --- a/cmd/legalhold-clear.go +++ b/cmd/legalhold-clear.go @@ -65,16 +65,16 @@ FLAGS: EXAMPLES: 1. Disable legal hold on a specific object - $ {{.HelpName}} myminio/mybucket/prefix/obj.csv + $ {{.HelpName}} mysilo/mybucket/prefix/obj.csv 2. Disable legal hold on a specific object version - $ {{.HelpName}} myminio/mybucket/prefix/obj.csv --version-id "HiMFUTOowG6ylfNi4LKxD3ieHbgfgrvC" + $ {{.HelpName}} mysilo/mybucket/prefix/obj.csv --version-id "HiMFUTOowG6ylfNi4LKxD3ieHbgfgrvC" 3. Disable object legal hold recursively for all objects at a prefix - $ {{.HelpName}} myminio/mybucket/prefix --recursive + $ {{.HelpName}} mysilo/mybucket/prefix --recursive 4. Disable object legal hold recursively for all objects versions older than one year - $ {{.HelpName}} myminio/mybucket/prefix --recursive --rewind 365d --versions + $ {{.HelpName}} mysilo/mybucket/prefix --recursive --rewind 365d --versions `, } diff --git a/cmd/legalhold-info.go b/cmd/legalhold-info.go index a031f65b17..fa7d66a81e 100644 --- a/cmd/legalhold-info.go +++ b/cmd/legalhold-info.go @@ -70,16 +70,16 @@ FLAGS: EXAMPLES: 1. Show legal hold on a specific object - $ {{.HelpName}} myminio/mybucket/prefix/obj.csv + $ {{.HelpName}} mysilo/mybucket/prefix/obj.csv 2. Show legal hold on a specific object version - $ {{.HelpName}} myminio/mybucket/prefix/obj.csv --version-id "HiMFUTOowG6ylfNi4LKxD3ieHbgfgrvC" + $ {{.HelpName}} mysilo/mybucket/prefix/obj.csv --version-id "HiMFUTOowG6ylfNi4LKxD3ieHbgfgrvC" 3. Show object legal hold recursively for all objects at a prefix - $ {{.HelpName}} myminio/mybucket/prefix --recursive + $ {{.HelpName}} mysilo/mybucket/prefix --recursive 4. Show object legal hold recursively for all objects versions older than one year - $ {{.HelpName}} myminio/mybucket/prefix --recursive --rewind 365d --versions + $ {{.HelpName}} mysilo/mybucket/prefix --recursive --rewind 365d --versions `, } diff --git a/cmd/legalhold-set.go b/cmd/legalhold-set.go index 6732976d35..9bacdcdcb5 100644 --- a/cmd/legalhold-set.go +++ b/cmd/legalhold-set.go @@ -68,16 +68,16 @@ FLAGS: EXAMPLES: 1. Enable legal hold on a specific object - $ {{.HelpName}} myminio/mybucket/prefix/obj.csv + $ {{.HelpName}} mysilo/mybucket/prefix/obj.csv 2. Enable legal hold on a specific object version - $ {{.HelpName}} myminio/mybucket/prefix/obj.csv --version-id "HiMFUTOowG6ylfNi4LKxD3ieHbgfgrvC" + $ {{.HelpName}} mysilo/mybucket/prefix/obj.csv --version-id "HiMFUTOowG6ylfNi4LKxD3ieHbgfgrvC" 3. Enable object legal hold recursively for all objects at a prefix - $ {{.HelpName}} myminio/mybucket/prefix --recursive + $ {{.HelpName}} mysilo/mybucket/prefix --recursive 4. Enable object legal hold recursively for all objects versions older than one year - $ {{.HelpName}} myminio/mybucket/prefix --recursive --rewind 365d --versions + $ {{.HelpName}} mysilo/mybucket/prefix --recursive --rewind 365d --versions `, } diff --git a/cmd/ls-main.go b/cmd/ls-main.go index f6e6d46c8a..072a23ce39 100644 --- a/cmd/ls-main.go +++ b/cmd/ls-main.go @@ -58,7 +58,7 @@ var ( }, cli.BoolFlag{ Name: "zip", - Usage: "list files inside zip archive (MinIO servers only)", + Usage: "list files inside zip archive (Silo/MinIO servers only)", }, } ) diff --git a/cmd/main.go b/cmd/main.go index 4edf1c383f..e0bc5a76ba 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -442,6 +442,7 @@ var appCmds = []cli.Command{ func printMCVersion(c *cli.Context) { fmt.Fprintf(c.App.Writer, "%s version %s (commit-id=%s)\n", c.App.Name, c.App.Version, CommitID) + fmt.Fprintf(c.App.Writer, "Silo object storage client, based on MinIO technology\n") fmt.Fprintf(c.App.Writer, "Runtime: %s %s/%s\n", runtime.Version(), runtime.GOOS, runtime.GOARCH) fmt.Fprintf(c.App.Writer, "Copyright (c) 2015-%s MinIO, Inc.\n", CopyrightYear) fmt.Fprintf(c.App.Writer, "License GNU AGPLv3 \n") @@ -475,9 +476,9 @@ func registerApp(name string) *cli.App { app.Before = registerBefore app.HideHelpCommand = true - app.Usage = "MinIO Client for object storage and filesystems." + app.Usage = "Silo client for object storage and filesystems." app.Commands = appCmds - app.Author = "MinIO, Inc." + app.Author = "The Silo Project (upstream client by MinIO, Inc.)" app.Version = ReleaseTag app.Flags = append(mcFlags, globalFlags...) app.CustomAppHelpTemplate = mcHelpTemplate diff --git a/cmd/mb-main.go b/cmd/mb-main.go index cf10db04f3..cf960bd925 100644 --- a/cmd/mb-main.go +++ b/cmd/mb-main.go @@ -69,7 +69,7 @@ EXAMPLES: {{.Prompt}} {{.HelpName}} s3/mynewbucket 2. Create a new bucket on Google Cloud Storage. - {{.Prompt}} {{.HelpName}} gcs/miniocloud + {{.Prompt}} {{.HelpName}} gcs/mycloud 3. Create a new bucket on Amazon S3 cloud storage in region 'us-west-2'. {{.Prompt}} {{.HelpName}} --region=us-west-2 s3/myregionbucket @@ -81,13 +81,13 @@ EXAMPLES: {{.Prompt}} {{.HelpName}} /mnt/sdb/mydisk /mnt/sdc/mydisk /mnt/sdd/mydisk 6. Ignore if bucket/directory already exists. - {{.Prompt}} {{.HelpName}} --ignore-existing myminio/mynewbucket + {{.Prompt}} {{.HelpName}} --ignore-existing mysilo/mynewbucket 7. Create a new bucket on Amazon S3 cloud storage in region 'us-west-2' with object lock enabled. {{.Prompt}} {{.HelpName}} --with-lock --region=us-west-2 s3/myregionbucket - 8. Create a new bucket on MinIO with versioning enabled. - {{.Prompt}} {{.HelpName}} --with-versioning myminio/myversionedbucket + 8. Create a new bucket on Silo/MinIO with versioning enabled. + {{.Prompt}} {{.HelpName}} --with-versioning mysilo/myversionedbucket `, } diff --git a/cmd/mirror-main.go b/cmd/mirror-main.go index 1d4a192bb8..76985a42df 100644 --- a/cmd/mirror-main.go +++ b/cmd/mirror-main.go @@ -176,8 +176,8 @@ ENVIRONMENT VARIABLES: MC_ENC_S3: S3 encryption key in the form of (alias/prefix=key). EXAMPLES: - 01. Mirror a bucket recursively from MinIO cloud storage to a bucket on Amazon S3 cloud storage. - {{.Prompt}} {{.HelpName}} play/photos/2014 s3/backup-photos + 01. Mirror a bucket recursively from Silo/MinIO cloud storage to a bucket on Amazon S3 cloud storage. + {{.Prompt}} {{.HelpName}} mysilo/photos/2014 s3/backup-photos 02. Mirror a local folder recursively to Amazon S3 cloud storage. {{.Prompt}} {{.HelpName}} backup/ s3/archive @@ -189,15 +189,15 @@ EXAMPLES: {{.Prompt}} {{.HelpName}} s3\documents\2014\ C:\backup\2014 05. Mirror a bucket from aliased Amazon S3 cloud storage to a local folder use '--overwrite' to overwrite destination. - {{.Prompt}} {{.HelpName}} --overwrite s3/miniocloud miniocloud-backup + {{.Prompt}} {{.HelpName}} --overwrite s3/mycloud mycloud-backup - 06. Mirror a bucket from MinIO cloud storage to a bucket on Amazon S3 cloud storage and remove any extraneous + 06. Mirror a bucket from Silo/MinIO cloud storage to a bucket on Amazon S3 cloud storage and remove any extraneous files on Amazon S3 cloud storage. - {{.Prompt}} {{.HelpName}} --remove play/photos/2014 s3/backup-photos/2014 + {{.Prompt}} {{.HelpName}} --remove mysilo/photos/2014 s3/backup-photos/2014 - 07. Continuously mirror a local folder recursively to MinIO cloud storage. '--watch' continuously watches for + 07. Continuously mirror a local folder recursively to Silo/MinIO cloud storage. '--watch' continuously watches for new objects, uploads and removes extraneous files on Amazon S3 cloud storage. - {{.Prompt}} {{.HelpName}} --remove --watch /var/lib/backups play/backups + {{.Prompt}} {{.HelpName}} --remove --watch /var/lib/backups mysilo/backups 08. Continuously mirror all buckets and objects from site 1 to site 2, removed buckets and objects will be reflected as well. {{.Prompt}} {{.HelpName}} --remove --watch site1-alias/ site2-alias/ @@ -217,10 +217,10 @@ EXAMPLES: {{.Prompt}} {{.HelpName}} --older-than 30d s3/test ~/test 13. Mirror server encrypted objects from Amazon S3 cloud storage to a bucket on Amazon S3 cloud storage - {{.Prompt}} {{.HelpName}} --enc-c "minio/archive=MDEyMzQ1Njc4OTAxMjM0NTY3ODkwMTIzNDU2Nzg5MDA" --enc-c "s3/archive=MDEyMzQ1Njc4OTAxMjM0NTY3ODkwMTIzNDU2Nzg5BBB" s3/archive/ minio/archive/ + {{.Prompt}} {{.HelpName}} --enc-c "mysilo/archive=MDEyMzQ1Njc4OTAxMjM0NTY3ODkwMTIzNDU2Nzg5MDA" --enc-c "s3/archive=MDEyMzQ1Njc4OTAxMjM0NTY3ODkwMTIzNDU2Nzg5BBB" s3/archive/ mysilo/archive/ 14. Update 'Cache-Control' header on all existing objects recursively. - {{.Prompt}} {{.HelpName}} --attr "Cache-Control=max-age=90000,min-fresh=9000" myminio/video-files myminio/video-files + {{.Prompt}} {{.HelpName}} --attr "Cache-Control=max-age=90000,min-fresh=9000" mysilo/video-files mysilo/video-files 15. Mirror a local folder recursively to Amazon S3 cloud storage and preserve all local file attributes. {{.Prompt}} {{.HelpName}} -a backup/ s3/archive diff --git a/cmd/mv-main.go b/cmd/mv-main.go index a490b6571c..4e77cee11a 100644 --- a/cmd/mv-main.go +++ b/cmd/mv-main.go @@ -93,53 +93,53 @@ EXAMPLES: 01. Move a list of objects from local file system to Amazon S3 cloud storage. {{.Prompt}} {{.HelpName}} Music/*.ogg s3/jukebox/ - 02. Move a folder recursively from MinIO cloud storage to Amazon S3 cloud storage. - {{.Prompt}} {{.HelpName}} --recursive play/mybucket/ s3/mybucket/ + 02. Move a folder recursively from Silo/MinIO cloud storage to Amazon S3 cloud storage. + {{.Prompt}} {{.HelpName}} --recursive mysilo/mybucket/ s3/mybucket/ - 03. Move multiple local folders recursively to MinIO cloud storage. - {{.Prompt}} {{.HelpName}} --recursive backup/2014/ backup/2015/ play/archive/ + 03. Move multiple local folders recursively to Silo/MinIO cloud storage. + {{.Prompt}} {{.HelpName}} --recursive backup/2014/ backup/2015/ mysilo/archive/ 04. Move a bucket recursively from aliased Amazon S3 cloud storage to local filesystem on Windows. {{.Prompt}} {{.HelpName}} --recursive s3\documents\2014\ C:\Backups\2014 - 05. Move files older than 7 days and 10 hours from MinIO cloud storage to Amazon S3 cloud storage. - {{.Prompt}} {{.HelpName}} --older-than 7d10h play/mybucket/myfolder/ s3/mybucket/ + 05. Move files older than 7 days and 10 hours from Silo/MinIO cloud storage to Amazon S3 cloud storage. + {{.Prompt}} {{.HelpName}} --older-than 7d10h mysilo/mybucket/myfolder/ s3/mybucket/ - 06. Move files newer than 7 days and 10 hours from MinIO cloud storage to a local path. - {{.Prompt}} {{.HelpName}} --newer-than 7d10h play/mybucket/myfolder/ ~/latest/ + 06. Move files newer than 7 days and 10 hours from Silo/MinIO cloud storage to a local path. + {{.Prompt}} {{.HelpName}} --newer-than 7d10h mysilo/mybucket/myfolder/ ~/latest/ 07. Move an object with name containing unicode characters to Amazon S3 cloud storage. {{.Prompt}} {{.HelpName}} 本語 s3/andoria/ 08. Move a local folder with space separated characters to Amazon S3 cloud storage. - {{.Prompt}} {{.HelpName}} --recursive 'workdir/documents/May 2014/' s3/miniocloud + {{.Prompt}} {{.HelpName}} --recursive 'workdir/documents/May 2014/' s3/mycloud - 09. Move a list of objects from local file system to MinIO cloud storage with specified metadata, separated by ";" - {{.Prompt}} {{.HelpName}} --attr "key1=value1;key2=value2" Music/*.mp4 play/mybucket/ + 09. Move a list of objects from local file system to Silo/MinIO cloud storage with specified metadata, separated by ";" + {{.Prompt}} {{.HelpName}} --attr "key1=value1;key2=value2" Music/*.mp4 mysilo/mybucket/ - 10. Move a list of objects from local file system to MinIO cloud storage and set tags to the uploaded objects - {{.Prompt}} {{.HelpName}} --tag "key1=value1" Music/*.mp4 play/mybucket/ + 10. Move a list of objects from local file system to Silo/MinIO cloud storage and set tags to the uploaded objects + {{.Prompt}} {{.HelpName}} --tag "key1=value1" Music/*.mp4 mysilo/mybucket/ - 11. Move a folder recursively from MinIO cloud storage to Amazon S3 cloud storage with Cache-Control and custom metadata, separated by ";". - {{.Prompt}} {{.HelpName}} --attr "Cache-Control=max-age=90000,min-fresh=9000;key1=value1;key2=value2" --recursive play/mybucket/myfolder/ s3/mybucket/ + 11. Move a folder recursively from Silo/MinIO cloud storage to Amazon S3 cloud storage with Cache-Control and custom metadata, separated by ";". + {{.Prompt}} {{.HelpName}} --attr "Cache-Control=max-age=90000,min-fresh=9000;key1=value1;key2=value2" --recursive mysilo/mybucket/myfolder/ s3/mybucket/ 12. Move a text file to an object storage and assign REDUCED_REDUNDANCY storage-class to the uploaded object. - {{.Prompt}} {{.HelpName}} --storage-class REDUCED_REDUNDANCY myobject.txt play/mybucket + {{.Prompt}} {{.HelpName}} --storage-class REDUCED_REDUNDANCY myobject.txt mysilo/mybucket 13. Move a text file to an object storage and preserve the file system attribute as metadata. - {{.Prompt}} {{.HelpName}} -a myobject.txt play/mybucket + {{.Prompt}} {{.HelpName}} -a myobject.txt mysilo/mybucket 14. Move a text file to an object storage and disable multipart upload feature. - {{.Prompt}} {{.HelpName}} --disable-multipart myobject.txt play/mybucket + {{.Prompt}} {{.HelpName}} --disable-multipart myobject.txt mysilo/mybucket - 15. Move a folder using client provided encryption keys from Amazon S3 to MinIO cloud storage. - {{.Prompt}} {{.HelpName}} --r --enc-c "s3/documents/=MDEyMzQ1Njc4OTAxMjM0NTY3ODkwMTIzNDU2Nzg5MBB" --enc-c "myminio/documents/=MDEyMzQ1Njc4OTAxMjM0NTY3ODkwMTIzNDU2Nzg5MDA" s3/documents/ myminio/documents/ + 15. Move a folder using client provided encryption keys from Amazon S3 to Silo/MinIO cloud storage. + {{.Prompt}} {{.HelpName}} --r --enc-c "s3/documents/=MDEyMzQ1Njc4OTAxMjM0NTY3ODkwMTIzNDU2Nzg5MBB" --enc-c "mysilo/documents/=MDEyMzQ1Njc4OTAxMjM0NTY3ODkwMTIzNDU2Nzg5MDA" s3/documents/ mysilo/documents/ - 16. Move a folder using specific server managed encryption keys from Amazon S3 to MinIO cloud storage. - {{.Prompt}} {{.HelpName}} --r --enc-s3 "s3/documents" --enc-s3 "myminio/documents" s3/documents/ myminio/documents/ + 16. Move a folder using specific server managed encryption keys from Amazon S3 to Silo/MinIO cloud storage. + {{.Prompt}} {{.HelpName}} --r --enc-s3 "s3/documents" --enc-s3 "mysilo/documents" s3/documents/ mysilo/documents/ - 17. Add SHA256 checksum to move a text file to MinIO cloud storage. - {{.Prompt}} {{.HelpName}} --checksum SHA256 myobject.txt play/mybucket + 17. Add SHA256 checksum to move a text file to Silo/MinIO cloud storage. + {{.Prompt}} {{.HelpName}} --checksum SHA256 myobject.txt mysilo/mybucket `, } diff --git a/cmd/od-main.go b/cmd/od-main.go index 36a9f2e8fb..dbf5d514e4 100644 --- a/cmd/od-main.go +++ b/cmd/od-main.go @@ -56,13 +56,13 @@ FLAGS: {{end}}{{end}} EXAMPLES: 1. Upload 200MiB of a file to a bucket in 5 parts of size 40MiB. - {{.HelpName}} if=file.txt of=play/my-bucket/file.txt size=40MiB parts=5 + {{.HelpName}} if=file.txt of=mysilo/my-bucket/file.txt size=40MiB parts=5 2. Upload a full file to a bucket with 40MiB parts. - {{.HelpName}} if=file.txt of=play/my-bucket/file.txt size=40MiB + {{.HelpName}} if=file.txt of=mysilo/my-bucket/file.txt size=40MiB 3. Upload a full file to a bucket in 5 parts. - {{.HelpName}} if=file.txt of=play/my-bucket/file.txt parts=5 + {{.HelpName}} if=file.txt of=mysilo/my-bucket/file.txt parts=5 `, } diff --git a/cmd/ping.go b/cmd/ping.go index 516bff07f7..5bf83cd99f 100644 --- a/cmd/ping.go +++ b/cmd/ping.go @@ -87,16 +87,16 @@ FLAGS: {{end}}{{end}} EXAMPLES: 1. Return Latency and liveness probe. - {{.Prompt}} {{.HelpName}} myminio + {{.Prompt}} {{.HelpName}} mysilo 2. Return Latency and liveness probe 5 number of times. - {{.Prompt}} {{.HelpName}} --count 5 myminio + {{.Prompt}} {{.HelpName}} --count 5 mysilo 3. Return Latency and liveness with wait interval set to 30 seconds. - {{.Prompt}} {{.HelpName}} --interval 30 myminio + {{.Prompt}} {{.HelpName}} --interval 30 mysilo 4. Stop pinging when error count > 20. - {{.Prompt}} {{.HelpName}} --error-count 20 myminio + {{.Prompt}} {{.HelpName}} --error-count 20 mysilo `, } @@ -236,7 +236,7 @@ type ServerStats struct { func fetchAdminInfo(admClnt *madmin.AdminClient) (madmin.InfoMessage, error) { ctx, cancel := context.WithTimeout(globalContext, 3*time.Second) - // Fetch the service status of the specified MinIO server + // Fetch the service status of the specified Silo/MinIO server info, e := admClnt.ServerInfo(ctx) cancel() if e == nil { diff --git a/cmd/pipe-main.go b/cmd/pipe-main.go index 5f87884696..198d9713bc 100644 --- a/cmd/pipe-main.go +++ b/cmd/pipe-main.go @@ -100,8 +100,8 @@ EXAMPLES: 3. Copy an ISO image to an object on Amazon S3 cloud storage. {{.Prompt}} cat debian-8.2.iso | {{.HelpName}} s3/opensource-isos/gnuos.iso - 4. Copy an ISO image to an object on minio storage using KMS encryption. - {{.Prompt}} cat debian-8.2.iso | {{.HelpName}} --enc-kms="minio/opensource-isos=my-key-name" minio/opensource-isos/gnuos.iso + 4. Copy an ISO image to an object on Silo/MinIO storage using KMS encryption. + {{.Prompt}} cat debian-8.2.iso | {{.HelpName}} --enc-kms="mysilo/opensource-isos=my-key-name" mysilo/opensource-isos/gnuos.iso 5. Stream MySQL database dump to Amazon S3 directly. {{.Prompt}} mysqldump -u root -p ******* accountsdb | {{.HelpName}} s3/sql-backups/backups/accountsdb-oct-9-2015.sql @@ -109,11 +109,11 @@ EXAMPLES: 6. Write contents of stdin to an object on Amazon S3 cloud storage and assign REDUCED_REDUNDANCY storage-class to the uploaded object. {{.Prompt}} {{.HelpName}} --storage-class REDUCED_REDUNDANCY s3/personalbuck/meeting-notes.txt - 7. Copy to MinIO cloud storage with specified metadata, separated by ";" - {{.Prompt}} cat music.mp3 | {{.HelpName}} --attr "Cache-Control=max-age=90000,min-fresh=9000;Artist=Unknown" play/mybucket/music.mp3 + 7. Copy to Silo/MinIO cloud storage with specified metadata, separated by ";" + {{.Prompt}} cat music.mp3 | {{.HelpName}} --attr "Cache-Control=max-age=90000,min-fresh=9000;Artist=Unknown" mysilo/mybucket/music.mp3 8. Set tags to the uploaded objects - {{.Prompt}} tar cvf - . | {{.HelpName}} --tags "category=prod&type=backup" play/mybucket/backup.tar + {{.Prompt}} tar cvf - . | {{.HelpName}} --tags "category=prod&type=backup" mysilo/mybucket/backup.tar `, } diff --git a/cmd/put-main.go b/cmd/put-main.go index 14c4c3e94e..c895d9e76c 100644 --- a/cmd/put-main.go +++ b/cmd/put-main.go @@ -82,22 +82,22 @@ ENVIRONMENT VARIABLES: EXAMPLES: 1. Put an object from local file system to S3 storage - {{.Prompt}} {{.HelpName}} path-to/object play/mybucket + {{.Prompt}} {{.HelpName}} path-to/object mysilo/mybucket 2. Put an object from local file system to S3 bucket with name - {{.Prompt}} {{.HelpName}} path-to/object play/mybucket/object + {{.Prompt}} {{.HelpName}} path-to/object mysilo/mybucket/object 3. Put an object from local file system to S3 bucket under a prefix - {{.Prompt}} {{.HelpName}} path-to/object play/mybucket/object-prefix/ + {{.Prompt}} {{.HelpName}} path-to/object mysilo/mybucket/object-prefix/ - 4. Put an object to MinIO storage using sse-c encryption - {{.Prompt}} {{.HelpName}} --enc-c "play/mybucket/object=MDEyMzQ1Njc4OTAxMjM0NTY3ODkwMTIzNDU2Nzg5MDA" path-to/object play/mybucket/object + 4. Put an object to Silo/MinIO storage using sse-c encryption + {{.Prompt}} {{.HelpName}} --enc-c "mysilo/mybucket/object=MDEyMzQ1Njc4OTAxMjM0NTY3ODkwMTIzNDU2Nzg5MDA" path-to/object mysilo/mybucket/object - 5. Put an object to MinIO storage using sse-kms encryption - {{.Prompt}} {{.HelpName}} --enc-kms path-to/object play/mybucket/object + 5. Put an object to Silo/MinIO storage using sse-kms encryption + {{.Prompt}} {{.HelpName}} --enc-kms path-to/object mysilo/mybucket/object - 6. Put an object to MinIO storage and assign REDUCED_REDUNDANCY storage-class to the uploaded object. - {{.Prompt}} {{.HelpName}} --storage-class REDUCED_REDUNDANCY myobject.txt play/mybucket + 6. Put an object to Silo/MinIO storage and assign REDUCED_REDUNDANCY storage-class to the uploaded object. + {{.Prompt}} {{.HelpName}} --storage-class REDUCED_REDUNDANCY myobject.txt mysilo/mybucket `, } diff --git a/cmd/quota-clear.go b/cmd/quota-clear.go index 70067e7e39..36d2cbc8b9 100644 --- a/cmd/quota-clear.go +++ b/cmd/quota-clear.go @@ -42,8 +42,8 @@ FLAGS: {{range .VisibleFlags}}{{.}} {{end}} EXAMPLES: - 1. Clear bucket quota configured for bucket "mybucket" on MinIO. - {{.Prompt}} {{.HelpName}} myminio/mybucket + 1. Clear bucket quota configured for bucket "mybucket" on Silo/MinIO. + {{.Prompt}} {{.HelpName}} mysilo/mybucket `, } diff --git a/cmd/quota-info.go b/cmd/quota-info.go index 6084bbbd43..1a14c687de 100644 --- a/cmd/quota-info.go +++ b/cmd/quota-info.go @@ -41,8 +41,8 @@ FLAGS: {{range .VisibleFlags}}{{.}} {{end}} EXAMPLES: - 1. Display bucket quota configured for "mybucket" on MinIO. - {{.Prompt}} {{.HelpName}} myminio/mybucket + 1. Display bucket quota configured for "mybucket" on Silo/MinIO. + {{.Prompt}} {{.HelpName}} mysilo/mybucket `, } diff --git a/cmd/quota-set.go b/cmd/quota-set.go index a89688727a..5a7d5c63ff 100644 --- a/cmd/quota-set.go +++ b/cmd/quota-set.go @@ -56,8 +56,8 @@ QUOTA units, so that "gi" refers to "gibibyte" or "GiB". A "b" at the end is also accepted. Without suffixes the unit is bytes. - The MinIO object scanner checks a bucket's quota each time it is scanned. - If the scanner determines a bucket has met or exceeded its quota, MinIO + The Silo/MinIO object scanner checks a bucket's quota each time it is scanned. + If the scanner determines a bucket has met or exceeded its quota, Silo/MinIO rejects subsequent object write requests until the scanner determines the bucket no longer exceeds its quota. @@ -65,8 +65,8 @@ FLAGS: {{range .VisibleFlags}}{{.}} {{end}} EXAMPLES: - 1. Set hard quota of 1gb for a bucket "mybucket" on MinIO. - {{.Prompt}} {{.HelpName}} myminio/mybucket --size 1GB + 1. Set hard quota of 1gb for a bucket "mybucket" on Silo/MinIO. + {{.Prompt}} {{.HelpName}} mysilo/mybucket --size 1GB `, } diff --git a/cmd/ready-main.go b/cmd/ready-main.go index d3eb89c866..eb7ef021b8 100644 --- a/cmd/ready-main.go +++ b/cmd/ready-main.go @@ -63,13 +63,13 @@ FLAGS: {{end}}{{end}} EXAMPLES: 1. Check if the cluster is ready or not - {{.Prompt}} {{.HelpName}} myminio + {{.Prompt}} {{.HelpName}} mysilo 2. Check if the cluster has enough read quorum - {{.Prompt}} {{.HelpName}} myminio --cluster-read + {{.Prompt}} {{.HelpName}} mysilo --cluster-read 3. Check if the cluster is taken down for maintenance - {{.Prompt}} {{.HelpName}} myminio --maintenance + {{.Prompt}} {{.HelpName}} mysilo --maintenance `, } diff --git a/cmd/replicate-add.go b/cmd/replicate-add.go index 8cb2695c21..077b296c19 100644 --- a/cmd/replicate-add.go +++ b/cmd/replicate-add.go @@ -117,28 +117,28 @@ FLAGS: {{range .VisibleFlags}}{{.}} {{end}} EXAMPLES: - 1. Add replication configuration rule on bucket "sourcebucket" for alias "sourceminio" with alias "targetminio" to replicate all operations in an active-active replication setup. - {{.Prompt}} {{.HelpName}} sourceminio/sourcebucket --remote-bucket targetminio/targetbucket \ + 1. Add replication configuration rule on bucket "sourcebucket" for alias "sourcesilo" with alias "targetsilo" to replicate all operations in an active-active replication setup. + {{.Prompt}} {{.HelpName}} sourcesilo/sourcebucket --remote-bucket targetsilo/targetbucket \ --priority 1 - 2. Add replication configuration rule on bucket "mybucket" for alias "myminio" to replicate all operations in an active-active replication setup. - {{.Prompt}} {{.HelpName}} myminio/mybucket --remote-bucket https://foobar:foo12345@minio.siteb.example.com/targetbucket \ + 2. Add replication configuration rule on bucket "mybucket" for alias "mysilo" to replicate all operations in an active-active replication setup. + {{.Prompt}} {{.HelpName}} mysilo/mybucket --remote-bucket https://foobar:foo12345@silo.siteb.example.com/targetbucket \ --priority 1 - 3. Add replication configuration rule on bucket "mybucket" for alias "myminio" to replicate all objects with tags + 3. Add replication configuration rule on bucket "mybucket" for alias "mysilo" to replicate all objects with tags "key1=value1, key2=value2" to targetbucket synchronously with bandwidth set to 2 gigabits per second. - {{.Prompt}} {{.HelpName}} myminio/mybucket --remote-bucket https://foobar:foo12345@minio.siteb.example.com/targetbucket \ + {{.Prompt}} {{.HelpName}} mysilo/mybucket --remote-bucket https://foobar:foo12345@silo.siteb.example.com/targetbucket \ --tags "key1=value1&key2=value2" --bandwidth "2G" --sync \ --priority 1 - 4. Disable a replication configuration rule on bucket "mybucket" for alias "myminio". - {{.Prompt}} {{.HelpName}} myminio/mybucket --remote-bucket https://foobar:foo12345@minio.siteb.example.com/targetbucket \ + 4. Disable a replication configuration rule on bucket "mybucket" for alias "mysilo". + {{.Prompt}} {{.HelpName}} mysilo/mybucket --remote-bucket https://foobar:foo12345@silo.siteb.example.com/targetbucket \ --tags "key1=value1&key2=value2" \ --priority 1 --disable 5. Add replication configuration rule with existing object replication, delete marker replication and versioned deletes - enabled on bucket "mybucket" for alias "myminio". - {{.Prompt}} {{.HelpName}} myminio/mybucket --remote-bucket https://foobar:foo12345@minio.siteb.example.com/targetbucket \ + enabled on bucket "mybucket" for alias "mysilo". + {{.Prompt}} {{.HelpName}} mysilo/mybucket --remote-bucket https://foobar:foo12345@silo.siteb.example.com/targetbucket \ --replicate "existing-objects,delete,delete-marker" \ --priority 1 `, diff --git a/cmd/replicate-backlog.go b/cmd/replicate-backlog.go index e36380b7e0..f68964b0a0 100644 --- a/cmd/replicate-backlog.go +++ b/cmd/replicate-backlog.go @@ -79,12 +79,12 @@ FLAGS: {{range .VisibleFlags}}{{.}} {{end}} EXAMPLES: - 1. Show most recent replication failures on "myminio" alias for objects in bucket "mybucket" - {{.Prompt}} {{.HelpName}} myminio/mybucket + 1. Show most recent replication failures on "mysilo" alias for objects in bucket "mybucket" + {{.Prompt}} {{.HelpName}} mysilo/mybucket - 2. Show all unreplicated objects on "myminio" alias for objects in prefix "path/to/prefix" of "mybucket" for all targets. + 2. Show all unreplicated objects on "mysilo" alias for objects in prefix "path/to/prefix" of "mybucket" for all targets. This will perform full listing of all objects in the prefix to find unreplicated objects. - {{.Prompt}} {{.HelpName}} myminio/mybucket/path/to/prefix --full + {{.Prompt}} {{.HelpName}} mysilo/mybucket/path/to/prefix --full `, } diff --git a/cmd/replicate-export.go b/cmd/replicate-export.go index f3e9cbcaf6..dbb261fd9d 100644 --- a/cmd/replicate-export.go +++ b/cmd/replicate-export.go @@ -45,11 +45,11 @@ FLAGS: {{range .VisibleFlags}}{{.}} {{end}} EXAMPLES: - 1. Print replication configuration on bucket "mybucket" for alias "myminio" to STDOUT. - {{.Prompt}} {{.HelpName}} myminio/mybucket + 1. Print replication configuration on bucket "mybucket" for alias "mysilo" to STDOUT. + {{.Prompt}} {{.HelpName}} mysilo/mybucket - 2. Export replication configuration on bucket "mybucket" for alias "myminio" to '/data/replicate/config'. - {{.Prompt}} {{.HelpName}} myminio/mybucket > /data/replicate/config + 2. Export replication configuration on bucket "mybucket" for alias "mysilo" to '/data/replicate/config'. + {{.Prompt}} {{.HelpName}} mysilo/mybucket > /data/replicate/config `, } diff --git a/cmd/replicate-import.go b/cmd/replicate-import.go index 18ac0a9ff6..167391f155 100644 --- a/cmd/replicate-import.go +++ b/cmd/replicate-import.go @@ -46,11 +46,11 @@ FLAGS: {{range .VisibleFlags}}{{.}} {{end}} EXAMPLES: - 1. Set replication configuration from '/data/replication/config' on bucket "mybucket" for alias "myminio". - {{.Prompt}} {{.HelpName}} myminio/mybucket < '/data/replication/config' + 1. Set replication configuration from '/data/replication/config' on bucket "mybucket" for alias "mysilo". + {{.Prompt}} {{.HelpName}} mysilo/mybucket < '/data/replication/config' - 2. Import replication configuration for bucket "mybucket" on alias "myminio" from STDIN. - {{.Prompt}} {{.HelpName}} myminio/mybucket + 2. Import replication configuration for bucket "mybucket" on alias "mysilo" from STDIN. + {{.Prompt}} {{.HelpName}} mysilo/mybucket `, } diff --git a/cmd/replicate-list.go b/cmd/replicate-list.go index 6e45d7b98d..fcdc63f9f9 100644 --- a/cmd/replicate-list.go +++ b/cmd/replicate-list.go @@ -57,8 +57,8 @@ FLAGS: {{range .VisibleFlags}}{{.}} {{end}} EXAMPLES: - 1. List server side replication configuration rules on bucket "mybucket" for alias "myminio". - {{.Prompt}} {{.HelpName}} myminio/mybucket + 1. List server side replication configuration rules on bucket "mybucket" for alias "mysilo". + {{.Prompt}} {{.HelpName}} mysilo/mybucket `, } diff --git a/cmd/replicate-remove.go b/cmd/replicate-remove.go index 5c16ab0f05..549730641f 100644 --- a/cmd/replicate-remove.go +++ b/cmd/replicate-remove.go @@ -61,11 +61,11 @@ FLAGS: {{range .VisibleFlags}}{{.}} {{end}} EXAMPLES: - 1. Remove replication configuration rule on bucket "mybucket" for alias "myminio" with rule id "bsib5mgt874bi56l0fmg". - {{.Prompt}} {{.HelpName}} --id "bsib5mgt874bi56l0fmg" myminio/mybucket + 1. Remove replication configuration rule on bucket "mybucket" for alias "mysilo" with rule id "bsib5mgt874bi56l0fmg". + {{.Prompt}} {{.HelpName}} --id "bsib5mgt874bi56l0fmg" mysilo/mybucket - 2. Remove all the replication configuration rules on bucket "mybucket" for alias "myminio". --force flag is required. - {{.Prompt}} {{.HelpName}} --all --force myminio/mybucket + 2. Remove all the replication configuration rules on bucket "mybucket" for alias "mysilo". --force flag is required. + {{.Prompt}} {{.HelpName}} --all --force mysilo/mybucket `, } diff --git a/cmd/replicate-reset-start.go b/cmd/replicate-reset-start.go index e828b98e9f..67f3a357b3 100644 --- a/cmd/replicate-reset-start.go +++ b/cmd/replicate-reset-start.go @@ -59,11 +59,11 @@ FLAGS: {{range .VisibleFlags}}{{.}} {{end}} EXAMPLES: - 1. Re-replicate previously replicated objects in bucket "mybucket" for alias "myminio" for remote target. - {{.Prompt}} {{.HelpName}} myminio/mybucket --remote-bucket "arn:minio:replication::xxx:mybucket" + 1. Re-replicate previously replicated objects in bucket "mybucket" for alias "mysilo" for remote target. + {{.Prompt}} {{.HelpName}} mysilo/mybucket --remote-bucket "arn:minio:replication::xxx:mybucket" 2. Re-replicate all objects older than 60 days in bucket "mybucket" for remote bucket target. - {{.Prompt}} {{.HelpName}} myminio/mybucket --older-than 60d --remote-bucket "arn:minio:replication::xxx:mybucket" + {{.Prompt}} {{.HelpName}} mysilo/mybucket --older-than 60d --remote-bucket "arn:minio:replication::xxx:mybucket" `, } diff --git a/cmd/replicate-reset-status.go b/cmd/replicate-reset-status.go index 47915c9ef8..063075f9e8 100644 --- a/cmd/replicate-reset-status.go +++ b/cmd/replicate-reset-status.go @@ -54,11 +54,11 @@ FLAGS: {{range .VisibleFlags}}{{.}} {{end}} EXAMPLES: - 1. Status of replication resync in bucket "mybucket" under alias "myminio" for all targets. - {{.Prompt}} {{.HelpName}} myminio/mybucket + 1. Status of replication resync in bucket "mybucket" under alias "mysilo" for all targets. + {{.Prompt}} {{.HelpName}} mysilo/mybucket 2. Status of replication resync in bucket "mybucket" under specific remote bucket target. - {{.Prompt}} {{.HelpName}} myminio/mybucket --remote-bucket "arn:minio:replication::xxx:mybucket" + {{.Prompt}} {{.HelpName}} mysilo/mybucket --remote-bucket "arn:minio:replication::xxx:mybucket" `, } diff --git a/cmd/replicate-status.go b/cmd/replicate-status.go index e9b6cfd2a1..62a655adf9 100644 --- a/cmd/replicate-status.go +++ b/cmd/replicate-status.go @@ -66,11 +66,11 @@ FLAGS: {{range .VisibleFlags}}{{.}} {{end}} EXAMPLES: - 1. Get server side replication metrics for bucket "mybucket" for alias "myminio". - {{.Prompt}} {{.HelpName}} myminio/mybucket + 1. Get server side replication metrics for bucket "mybucket" for alias "mysilo". + {{.Prompt}} {{.HelpName}} mysilo/mybucket - 2. Get replication speed across nodes for bucket "mybucket" for alias "myminio". - {{.Prompt}} {{.HelpName}} --nodes myminio/mybucket + 2. Get replication speed across nodes for bucket "mybucket" for alias "mysilo". + {{.Prompt}} {{.HelpName}} --nodes mysilo/mybucket `, } diff --git a/cmd/replicate-update.go b/cmd/replicate-update.go index 1ce2fe6a26..a61bb66ef1 100644 --- a/cmd/replicate-update.go +++ b/cmd/replicate-update.go @@ -109,35 +109,35 @@ FLAGS: {{range .VisibleFlags}}{{.}} {{end}} EXAMPLES: - 1. Change priority of rule with rule ID "bsibgh8t874dnjst8hkg" on bucket "mybucket" for alias "myminio". - {{.Prompt}} {{.HelpName}} myminio/mybucket --id "bsibgh8t874dnjst8hkg" --priority 3 + 1. Change priority of rule with rule ID "bsibgh8t874dnjst8hkg" on bucket "mybucket" for alias "mysilo". + {{.Prompt}} {{.HelpName}} mysilo/mybucket --id "bsibgh8t874dnjst8hkg" --priority 3 - 2. Disable a replication configuration rule with rule ID "bsibgh8t874dnjst8hkg" on target myminio/bucket - {{.Prompt}} {{.HelpName}} myminio/mybucket --id "bsibgh8t874dnjst8hkg" --state disable + 2. Disable a replication configuration rule with rule ID "bsibgh8t874dnjst8hkg" on target mysilo/bucket + {{.Prompt}} {{.HelpName}} mysilo/mybucket --id "bsibgh8t874dnjst8hkg" --state disable - 3. Set tags and storage class on a replication configuration with rule ID "kMYD.491" on target myminio/bucket/prefix. - {{.Prompt}} {{.HelpName}} myminio/mybucket --id "kMYD.491" --tags "key1=value1&key2=value2" \ + 3. Set tags and storage class on a replication configuration with rule ID "kMYD.491" on target mysilo/bucket/prefix. + {{.Prompt}} {{.HelpName}} mysilo/mybucket --id "kMYD.491" --tags "key1=value1&key2=value2" \ --storage-class "STANDARD" --priority 2 - 4. Clear tags for replication configuration rule with ID "kMYD.491" on a target myminio/bucket. - {{.Prompt}} {{.HelpName}} myminio/mybucket --id "kMYD.491" --tags "" + 4. Clear tags for replication configuration rule with ID "kMYD.491" on a target mysilo/bucket. + {{.Prompt}} {{.HelpName}} mysilo/mybucket --id "kMYD.491" --tags "" - 5. Enable delete marker replication on a replication configuration rule with ID "kxYD.491" on a target myminio/bucket. - {{.Prompt}} {{.HelpName}} myminio/mybucket --id "kxYD.491" --replicate "delete-marker" + 5. Enable delete marker replication on a replication configuration rule with ID "kxYD.491" on a target mysilo/bucket. + {{.Prompt}} {{.HelpName}} mysilo/mybucket --id "kxYD.491" --replicate "delete-marker" - 6. Disable delete marker and versioned delete replication on a replication configuration rule with ID "kxYD.491" on a target myminio/bucket. - {{.Prompt}} {{.HelpName}} myminio/mybucket --id "kxYD.491" --replicate "" + 6. Disable delete marker and versioned delete replication on a replication configuration rule with ID "kxYD.491" on a target mysilo/bucket. + {{.Prompt}} {{.HelpName}} mysilo/mybucket --id "kxYD.491" --replicate "" - 7. Enable existing object replication on a configuration rule with ID "kxYD.491" on a target myminio/bucket. Rule previously had enabled delete marker and versioned delete replication. - {{.Prompt}} {{.HelpName}} myminio/mybucket --id "kxYD.491" --replicate "existing-objects,delete-marker,delete" + 7. Enable existing object replication on a configuration rule with ID "kxYD.491" on a target mysilo/bucket. Rule previously had enabled delete marker and versioned delete replication. + {{.Prompt}} {{.HelpName}} mysilo/mybucket --id "kxYD.491" --replicate "existing-objects,delete-marker,delete" 8. Edit credentials for remote target with replication rule ID kxYD.491 - {{.Prompt}} {{.HelpName}} myminio/mybucket --id "kxYD.491" --remote-bucket https://foobar:newpassword@minio.siteb.example.com/targetbucket + {{.Prompt}} {{.HelpName}} mysilo/mybucket --id "kxYD.491" --remote-bucket https://foobar:newpassword@silo.siteb.example.com/targetbucket - 9. Edit credentials with alias "targetminio" for remote target with replication rule ID kxYD.491 - {{.Prompt}} {{.HelpName}} myminio/mybucket --id "kxYD.491" --remote-bucket targetminio/targetbucket + 9. Edit credentials with alias "targetsilo" for remote target with replication rule ID kxYD.491 + {{.Prompt}} {{.HelpName}} mysilo/mybucket --id "kxYD.491" --remote-bucket targetsilo/targetbucket 10. Disable proxying and enable synchronous replication for remote target of bucket mybucket with rule ID kxYD.492 - {{.Prompt}} {{.HelpName}} myminio/mybucket --id "kxYD.492" --remote-bucket https://foobar:newpassword@minio.siteb.example.com/targetbucket \ + {{.Prompt}} {{.HelpName}} mysilo/mybucket --id "kxYD.492" --remote-bucket https://foobar:newpassword@silo.siteb.example.com/targetbucket \ --sync "enable" --proxy "disable" `, } diff --git a/cmd/retention-clear.go b/cmd/retention-clear.go index 3d076cadea..0bfd7be904 100644 --- a/cmd/retention-clear.go +++ b/cmd/retention-clear.go @@ -69,22 +69,22 @@ FLAGS: EXAMPLES: 1. Clear object retention for a specific object - $ {{.HelpName}} myminio/mybucket/prefix/obj.csv + $ {{.HelpName}} mysilo/mybucket/prefix/obj.csv 2. Clear object retention for recursively for all objects at a given prefix - $ {{.HelpName}} myminio/mybucket/prefix --recursive + $ {{.HelpName}} mysilo/mybucket/prefix --recursive 3. Clear object retention for a specific version of a specific object - $ {{.HelpName}} myminio/mybucket/prefix/obj.csv --version-id "3Jr2x6fqlBUsVzbvPihBO3HgNpgZgAnp" + $ {{.HelpName}} mysilo/mybucket/prefix/obj.csv --version-id "3Jr2x6fqlBUsVzbvPihBO3HgNpgZgAnp" 4. Clear object retention for recursively for all versions of all objects - $ {{.HelpName}} myminio/mybucket/prefix --recursive --versions + $ {{.HelpName}} mysilo/mybucket/prefix --recursive --versions 5. Clear object retention for recursively for all versions created one year ago - $ {{.HelpName}} myminio/mybucket/prefix --recursive --versions --rewind 365d + $ {{.HelpName}} mysilo/mybucket/prefix --recursive --versions --rewind 365d 6. Clear a bucket retention configuration - $ {{.HelpName}} --default myminio/mybucket/ + $ {{.HelpName}} --default mysilo/mybucket/ `, } diff --git a/cmd/retention-info.go b/cmd/retention-info.go index 627becec30..2a40cf404f 100644 --- a/cmd/retention-info.go +++ b/cmd/retention-info.go @@ -73,19 +73,19 @@ FLAGS: EXAMPLES: 1. Show object retention for a specific object - $ {{.HelpName}} myminio/mybucket/prefix/obj.csv + $ {{.HelpName}} mysilo/mybucket/prefix/obj.csv 2. Show object retention for recursively for all objects at a given prefix - $ {{.HelpName}} myminio/mybucket/prefix --recursive + $ {{.HelpName}} mysilo/mybucket/prefix --recursive 3. Show object retention to a specific version of a specific object - $ {{.HelpName}} myminio/mybucket/prefix/obj.csv --version-id "3Jr2x6fqlBUsVzbvPihBO3HgNpgZgAnp" + $ {{.HelpName}} mysilo/mybucket/prefix/obj.csv --version-id "3Jr2x6fqlBUsVzbvPihBO3HgNpgZgAnp" 4. Show object retention for recursively for all versions of all objects under prefix - $ {{.HelpName}} myminio/mybucket/prefix --recursive --versions + $ {{.HelpName}} mysilo/mybucket/prefix --recursive --versions 5. Show default lock retention configuration for a bucket - $ {{.HelpName}} myminio/mybucket/ --default + $ {{.HelpName}} mysilo/mybucket/ --default `, } diff --git a/cmd/retention-set.go b/cmd/retention-set.go index f6c8ac7473..7c5dc8c24f 100644 --- a/cmd/retention-set.go +++ b/cmd/retention-set.go @@ -77,19 +77,19 @@ VALIDITY: EXAMPLES: 1. Set object retention for a specific object - $ {{.HelpName}} compliance 30d myminio/mybucket/prefix/obj.csv + $ {{.HelpName}} compliance 30d mysilo/mybucket/prefix/obj.csv 2. Set object retention for recursively for all objects at a given prefix - $ {{.HelpName}} governance 30d myminio/mybucket/prefix --recursive + $ {{.HelpName}} governance 30d mysilo/mybucket/prefix --recursive 3. Set object retention to a specific version of a specific object - $ {{.HelpName}} governance 30d myminio/mybucket/prefix/obj.csv --version-id "3Jr2x6fqlBUsVzbvPihBO3HgNpgZgAnp" + $ {{.HelpName}} governance 30d mysilo/mybucket/prefix/obj.csv --version-id "3Jr2x6fqlBUsVzbvPihBO3HgNpgZgAnp" 4. Set object retention for recursively for all versions of all objects - $ {{.HelpName}} governance 30d myminio/mybucket/prefix --recursive --versions + $ {{.HelpName}} governance 30d mysilo/mybucket/prefix --recursive --versions 5. Set default lock retention configuration for a bucket - $ {{.HelpName}} --default governance 30d myminio/mybucket/ + $ {{.HelpName}} --default governance 30d mysilo/mybucket/ `, } diff --git a/cmd/sql-main.go b/cmd/sql-main.go index 907d7f9a84..39c666d393 100644 --- a/cmd/sql-main.go +++ b/cmd/sql-main.go @@ -92,34 +92,34 @@ FLAGS: {{end}}{{end}} SERIALIZATION OPTIONS: - For query serialization options, refer to https://docs.min.io/community/minio-object-store/reference/minio-mc/mc-sql.html + For query serialization options, refer to https://silo.pgsty.com/reference/minio-mc/ EXAMPLES: 1. Run a query on a set of objects recursively on AWS S3. {{.Prompt}} {{.HelpName}} --recursive --query "select * from S3Object" s3/personalbucket/my-large-csvs/ - 2. Run a query on an object on MinIO. - {{.Prompt}} {{.HelpName}} --query "select count(s.power) from S3Object s" myminio/iot-devices/power-ratio.csv + 2. Run a query on an object on Silo/MinIO. + {{.Prompt}} {{.HelpName}} --query "select count(s.power) from S3Object s" mysilo/iot-devices/power-ratio.csv 3. Run a query on an encrypted object with customer provided keys. - {{.Prompt}} {{.HelpName}} --enc-c "myminio/iot-devices=MDEyMzQ1Njc4OTAxMjM0NTY3ODkwMTIzNDU2Nzg5MDA" \ - --query "select count(s.power) from S3Object s" myminio/iot-devices/power-ratio-encrypted.csv + {{.Prompt}} {{.HelpName}} --enc-c "mysilo/iot-devices=MDEyMzQ1Njc4OTAxMjM0NTY3ODkwMTIzNDU2Nzg5MDA" \ + --query "select count(s.power) from S3Object s" mysilo/iot-devices/power-ratio-encrypted.csv - 4. Run a query on an object on MinIO in gzip format using ; as field delimiter, + 4. Run a query on an object on Silo/MinIO in gzip format using ; as field delimiter, newline as record delimiter and file header to be used {{.Prompt}} {{.HelpName}} --compression GZIP --csv-input "rd=\n,fh=USE,fd=;" \ - --query "select count(s.power) from S3Object s" myminio/iot-devices/power-ratio.csv.gz + --query "select count(s.power) from S3Object s" mysilo/iot-devices/power-ratio.csv.gz - 5. Run a query on an object on MinIO in gzip format using ; as field delimiter, + 5. Run a query on an object on Silo/MinIO in gzip format using ; as field delimiter, newline as record delimiter and file header to be used {{.Prompt}} {{.HelpName}} --compression GZIP --csv-input "rd=\n,fh=USE,fd=;" \ - --json-output "rd=\n\n" --query "select * from S3Object" myminio/iot-devices/data.csv + --json-output "rd=\n\n" --query "select * from S3Object" mysilo/iot-devices/data.csv 6. Run same query as in 5., but specify csv output headers. If --csv-output-headers is specified as "", first row of csv is interpreted as header {{.Prompt}} {{.HelpName}} --compression GZIP --csv-input "rd=\n,fh=USE,fd=;" \ --csv-output "rd=\n" --csv-output-header "device_id,uptime,lat,lon" \ - --query "select * from S3Object" myminio/iot-devices/data.csv + --query "select * from S3Object" mysilo/iot-devices/data.csv `, } diff --git a/cmd/support-proxy-remove.go b/cmd/support-proxy-remove.go index b3c630a64e..e5551902a3 100644 --- a/cmd/support-proxy-remove.go +++ b/cmd/support-proxy-remove.go @@ -56,8 +56,8 @@ FLAGS: {{range .VisibleFlags}}{{.}} {{end}} EXAMPLES: - 1. Remove the proxy configured for cluster with alias 'myminio' - {{.Prompt}} {{.HelpName}} myminio + 1. Remove the proxy configured for cluster with alias 'mysilo' + {{.Prompt}} {{.HelpName}} mysilo `, } diff --git a/cmd/support-proxy-set.go b/cmd/support-proxy-set.go index 1d3dd67dcb..22c7a905b2 100644 --- a/cmd/support-proxy-set.go +++ b/cmd/support-proxy-set.go @@ -59,8 +59,8 @@ FLAGS: {{range .VisibleFlags}}{{.}} {{end}} EXAMPLES: - 1. Set the proxy to http://my.proxy for cluster with alias 'myminio' - {{.Prompt}} {{.HelpName}} myminio http://my.proxy + 1. Set the proxy to http://my.proxy for cluster with alias 'mysilo' + {{.Prompt}} {{.HelpName}} mysilo http://my.proxy `, } diff --git a/cmd/support-proxy-show.go b/cmd/support-proxy-show.go index 55f49f806c..627750c38b 100644 --- a/cmd/support-proxy-show.go +++ b/cmd/support-proxy-show.go @@ -40,8 +40,8 @@ FLAGS: {{range .VisibleFlags}}{{.}} {{end}} EXAMPLES: - 1. Show the proxy configured for cluster with alias 'myminio' - {{.Prompt}} {{.HelpName}} myminio + 1. Show the proxy configured for cluster with alias 'mysilo' + {{.Prompt}} {{.HelpName}} mysilo `, } @@ -88,7 +88,7 @@ func mainSupportProxyShow(ctx *cli.Context) error { // get the subnet proxy config from MinIO if available proxy, supported := getKeyFromSubnetConfig(alias, "proxy") if !supported { - fatal(errDummy().Trace(), "Proxy configuration not supported in this version of MinIO.") + fatal(errDummy().Trace(), "Proxy configuration not supported in this version of the Silo/MinIO server.") } printMsg(supportProxyShowMessage{Proxy: proxy}) diff --git a/cmd/support-top-api.go b/cmd/support-top-api.go index ca9bf02d8b..62d60cd758 100644 --- a/cmd/support-top-api.go +++ b/cmd/support-top-api.go @@ -47,7 +47,7 @@ var supportTopAPIFlags = []cli.Flag{ var supportTopAPICmd = cli.Command{ Name: "api", - Usage: "summarize API events on MinIO server in real-time", + Usage: "summarize API events on Silo/MinIO server in real-time", Action: mainSupportTopAPI, OnUsageError: onUsageError, Before: setGlobalsFromContext, @@ -64,10 +64,10 @@ FLAGS: {{end}} EXAMPLES: 1. Display current in-progress all S3 API calls. - {{.Prompt}} {{.HelpName}} myminio/ + {{.Prompt}} {{.HelpName}} mysilo/ 2. Display current in-progress all 's3.PutObject' API calls. - {{.Prompt}} {{.HelpName}} --name s3.PutObject myminio/ + {{.Prompt}} {{.HelpName}} --name s3.PutObject mysilo/ `, } diff --git a/cmd/support-top-drive.go b/cmd/support-top-drive.go index fd9d310fac..941cc091e1 100644 --- a/cmd/support-top-drive.go +++ b/cmd/support-top-drive.go @@ -56,7 +56,7 @@ FLAGS: {{end}} EXAMPLES: 1. Display drive metrics - {{.Prompt}} {{.HelpName}} myminio/ + {{.Prompt}} {{.HelpName}} mysilo/ `, } diff --git a/cmd/support-top-locks.go b/cmd/support-top-locks.go index 3a56736900..ff1e65d23f 100644 --- a/cmd/support-top-locks.go +++ b/cmd/support-top-locks.go @@ -45,7 +45,7 @@ var supportTopLocksFlag = []cli.Flag{ var supportTopLocksCmd = cli.Command{ Name: "locks", - Usage: "list all active locks on a MinIO cluster", + Usage: "list all active locks on a Silo/MinIO cluster", Before: setGlobalsFromContext, Action: mainSupportTopLocks, OnUsageError: onUsageError, @@ -60,8 +60,8 @@ FLAGS: {{range .VisibleFlags}}{{.}} {{end}} EXAMPLES: - 1. List oldest locks on a MinIO cluster. - {{.Prompt}} {{.HelpName}} myminio/ + 1. List oldest locks on a Silo/MinIO cluster. + {{.Prompt}} {{.HelpName}} mysilo/ `, } diff --git a/cmd/support-top-net.go b/cmd/support-top-net.go index da5adb1cd2..83be23a891 100644 --- a/cmd/support-top-net.go +++ b/cmd/support-top-net.go @@ -62,7 +62,7 @@ FLAGS: {{end}} EXAMPLES: 1. Display net metrics - {{.Prompt}} {{.HelpName}} myminio/ + {{.Prompt}} {{.HelpName}} mysilo/ `, } diff --git a/cmd/support-top-rpc.go b/cmd/support-top-rpc.go index bef9a3d769..d470389032 100644 --- a/cmd/support-top-rpc.go +++ b/cmd/support-top-rpc.go @@ -80,7 +80,7 @@ FLAGS: {{end}} EXAMPLES: 1. Display net metrics - {{.Prompt}} {{.HelpName}} myminio/ + {{.Prompt}} {{.HelpName}} mysilo/ `, } diff --git a/cmd/support-top.go b/cmd/support-top.go index 7042320ab0..654cee6418 100644 --- a/cmd/support-top.go +++ b/cmd/support-top.go @@ -29,7 +29,7 @@ var supportTopSubcommands = []cli.Command{ var supportTopCmd = cli.Command{ Name: "top", - Usage: "provide top like statistics for MinIO", + Usage: "provide top like statistics for Silo/MinIO", Action: mainSupportTop, Before: setGlobalsFromContext, Flags: globalFlags, diff --git a/cmd/tag-list.go b/cmd/tag-list.go index 8dd9ce7d8e..647c14022d 100644 --- a/cmd/tag-list.go +++ b/cmd/tag-list.go @@ -73,28 +73,28 @@ DESCRIPTION: EXAMPLES: 1. List the tags assigned to an object. - {{.Prompt}} {{.HelpName}} myminio/testbucket/testobject + {{.Prompt}} {{.HelpName}} mysilo/testbucket/testobject 2. List the tags assigned to particular version of an object. - {{.Prompt}} {{.HelpName}} --version-id "ieQq7aXsyhlhDt47YURGlrucYY3GxWHa" myminio/testbucket/testobject + {{.Prompt}} {{.HelpName}} --version-id "ieQq7aXsyhlhDt47YURGlrucYY3GxWHa" mysilo/testbucket/testobject 3. List the tags assigned to an object versions that are older than one week. - {{.Prompt}} {{.HelpName}} --versions --rewind 7d myminio/testbucket/testobject + {{.Prompt}} {{.HelpName}} --versions --rewind 7d mysilo/testbucket/testobject 4. List the tags assigned to an object in JSON format. - {{.Prompt}} {{.HelpName}} --json myminio/testbucket/testobject + {{.Prompt}} {{.HelpName}} --json mysilo/testbucket/testobject 5. List the tags assigned to a bucket. - {{.Prompt}} {{.HelpName}} myminio/testbucket + {{.Prompt}} {{.HelpName}} mysilo/testbucket 6. List the tags assigned to a bucket in JSON format. {{.Prompt}} {{.HelpName}} --json s3/testbucket 7. List the tags recursively for all the objects of subdirs of bucket. - {{.Prompt}} {{.HelpName}} --recursive myminio/testbucket + {{.Prompt}} {{.HelpName}} --recursive mysilo/testbucket 8. Show the tags recursively for all versions of all objects of subdirs of bucket. - {{.Prompt}} {{.HelpName}} --recursive --versions myminio/testbucket + {{.Prompt}} {{.HelpName}} --recursive --versions mysilo/testbucket `, } diff --git a/cmd/tag-remove.go b/cmd/tag-remove.go index 5ad68b7619..db99d033c1 100644 --- a/cmd/tag-remove.go +++ b/cmd/tag-remove.go @@ -69,22 +69,22 @@ DESCRIPTION: EXAMPLES: 1. Remove the tags assigned to an object. - {{.Prompt}} {{.HelpName}} myminio/testbucket/testobject + {{.Prompt}} {{.HelpName}} mysilo/testbucket/testobject 2. Remove the tags assigned to a particular version of an object. - {{.Prompt}} {{.HelpName}} --version-id "ieQq7aXsyhlhDt47YURGlrucYY3GxWHa" myminio/testbucket/testobject + {{.Prompt}} {{.HelpName}} --version-id "ieQq7aXsyhlhDt47YURGlrucYY3GxWHa" mysilo/testbucket/testobject 3. Remove the tags assigned to an object versions that are older than one week - {{.Prompt}} {{.HelpName}} --versions --rewind 7d myminio/testbucket/testobject + {{.Prompt}} {{.HelpName}} --versions --rewind 7d mysilo/testbucket/testobject 4. Remove the tags assigned to a bucket. - {{.Prompt}} {{.HelpName}} play/testbucket + {{.Prompt}} {{.HelpName}} mysilo/testbucket 5. Remove the tags recursively for all the objects of subdirs of bucket. - {{.Prompt}} {{.HelpName}} --recursive myminio/testbucket + {{.Prompt}} {{.HelpName}} --recursive mysilo/testbucket 6. Remove the tags recursively for all versions of all objects of subdirs of bucket. - {{.Prompt}} {{.HelpName}} --recursive --versions myminio/testbucket + {{.Prompt}} {{.HelpName}} --recursive --versions mysilo/testbucket `, } diff --git a/cmd/tag-set.go b/cmd/tag-set.go index e08126ae26..7b9cf7faad 100644 --- a/cmd/tag-set.go +++ b/cmd/tag-set.go @@ -72,25 +72,25 @@ DESCRIPTION: EXAMPLES: 1. Assign tags to an object. - {{.Prompt}} {{.HelpName}} play/testbucket/testobject "key1=value1&key2=value2&key3=value3" + {{.Prompt}} {{.HelpName}} mysilo/testbucket/testobject "key1=value1&key2=value2&key3=value3" 2. Assign tags to a particuler version of an object. - {{.Prompt}} {{.HelpName}} --version-id "ieQq7aXsyhlhDt47YURGlrucYY3GxWHa" play/testbucket/testobject "key1=value1&key2=value2&key3=value3" + {{.Prompt}} {{.HelpName}} --version-id "ieQq7aXsyhlhDt47YURGlrucYY3GxWHa" mysilo/testbucket/testobject "key1=value1&key2=value2&key3=value3" 3. Assign tags to a object versions older than one week. - {{.Prompt}} {{.HelpName}} --versions --rewind 7d play/testbucket/testobject "key1=value1&key2=value2&key3=value3" + {{.Prompt}} {{.HelpName}} --versions --rewind 7d mysilo/testbucket/testobject "key1=value1&key2=value2&key3=value3" 4. Assign tags to a bucket. - {{.Prompt}} {{.HelpName}} myminio/testbucket "key1=value1&key2=value2&key3=value3" + {{.Prompt}} {{.HelpName}} mysilo/testbucket "key1=value1&key2=value2&key3=value3" 5. Assign tags recursively to all the objects of subdirs of bucket. - {{.Prompt}} {{.HelpName}} myminio/testbucket --recursive "key1=value1&key2=value2&key3=value3" + {{.Prompt}} {{.HelpName}} mysilo/testbucket --recursive "key1=value1&key2=value2&key3=value3" 6. Assign tags recursively to all versions of all objects of subdirs of bucket. - {{.Prompt}} {{.HelpName}} myminio/testbucket --recursive --versions "key1=value1&key2=value2&key3=value3" + {{.Prompt}} {{.HelpName}} mysilo/testbucket --recursive --versions "key1=value1&key2=value2&key3=value3" 7. Assign tags to all the objects on a bucket, excluding folders - {{.Prompt}} {{.HelpName}} myminio/testbucket --exclude-folders --recursive "key1=value1&key2=value2&key3=value3" + {{.Prompt}} {{.HelpName}} mysilo/testbucket --exclude-folders --recursive "key1=value1&key2=value2&key3=value3" `, } diff --git a/cmd/tree-main.go b/cmd/tree-main.go index 86e50887a8..516e8c61fe 100644 --- a/cmd/tree-main.go +++ b/cmd/tree-main.go @@ -57,7 +57,7 @@ func (t treeMessage) String() string { // JSON'ified message for scripting. // Does No-op. JSON requests are redirected to `ls -r --json` func (t treeMessage) JSON() string { - fatalIf(probe.NewError(errors.New("JSON() should never be called here")), "Unable to list in tree format. Please report this issue at https://github.com/minio/mc/issues") + fatalIf(probe.NewError(errors.New("JSON() should never be called here")), "Unable to list in tree format. Please report this issue at https://github.com/pgsty/mc/issues") return "" } @@ -95,20 +95,20 @@ FLAGS: {{range .VisibleFlags}}{{.}} {{end}} EXAMPLES: - 1. List all buckets and directories on MinIO object storage server in tree format. - {{.Prompt}} {{.HelpName}} myminio + 1. List all buckets and directories on Silo/MinIO object storage server in tree format. + {{.Prompt}} {{.HelpName}} mysilo - 2. List all directories in "mybucket" on MinIO object storage server in tree format. - {{.Prompt}} {{.HelpName}} myminio/mybucket/ + 2. List all directories in "mybucket" on Silo/MinIO object storage server in tree format. + {{.Prompt}} {{.HelpName}} mysilo/mybucket/ - 3. List all directories in "mybucket" on MinIO object storage server hosted on Microsoft Windows in tree format. - {{.Prompt}} {{.HelpName}} myminio\mybucket\ + 3. List all directories in "mybucket" on Silo/MinIO object storage server hosted on Microsoft Windows in tree format. + {{.Prompt}} {{.HelpName}} mysilo\mybucket\ - 4. List all directories and objects in "mybucket" on MinIO object storage server in tree format. - {{.Prompt}} {{.HelpName}} --files myminio/mybucket/ + 4. List all directories and objects in "mybucket" on Silo/MinIO object storage server in tree format. + {{.Prompt}} {{.HelpName}} --files mysilo/mybucket/ 5. List all directories upto depth level '2' in tree format. - {{.Prompt}} {{.HelpName}} --depth 2 myminio/mybucket/ + {{.Prompt}} {{.HelpName}} --depth 2 mysilo/mybucket/ `, } diff --git a/cmd/typed-errors.go b/cmd/typed-errors.go index 1a1bf3fd9f..8258bfe26e 100644 --- a/cmd/typed-errors.go +++ b/cmd/typed-errors.go @@ -73,7 +73,7 @@ var errInvalidAlias = func(alias string) *probe.Error { type invalidURLErr error var errInvalidURL = func(URL string) *probe.Error { - msg := "URL `" + URL + "` for MinIO Client should be of the form scheme://host[:port]/ without resource component." + msg := "URL `" + URL + "` should be of the form scheme://host[:port]/ without resource component." return probe.NewError(invalidURLErr(errors.New(msg))) } diff --git a/cmd/version-enable.go b/cmd/version-enable.go index 8703c43352..313c3b8322 100644 --- a/cmd/version-enable.go +++ b/cmd/version-enable.go @@ -57,15 +57,15 @@ FLAGS: {{range .VisibleFlags}}{{.}} {{end}} EXAMPLES: - 1. Enable versioning on bucket "mybucket" for alias "myminio". - {{.Prompt}} {{.HelpName}} myminio/mybucket + 1. Enable versioning on bucket "mybucket" for alias "mysilo". + {{.Prompt}} {{.HelpName}} mysilo/mybucket 2. Enable versioning on bucket "mybucket" while excluding versioning on a few select prefixes. - {{.Prompt}} {{.HelpName}} myminio/mybucket --excluded-prefixes "app1/*/_temporary/,app2/*/_staging/" + {{.Prompt}} {{.HelpName}} mysilo/mybucket --excluded-prefixes "app1/*/_temporary/,app2/*/_staging/" 3. Enable versioning on bucket "mybucket" while excluding versioning on a few select prefixes and all folders. Note: this is useful on buckets used with Spark/Hadoop workloads. - {{.Prompt}} {{.HelpName}} myminio/mybucket --excluded-prefixes "app1/*/_temporary/,app2/*/_staging/" --exclude-folders + {{.Prompt}} {{.HelpName}} mysilo/mybucket --excluded-prefixes "app1/*/_temporary/,app2/*/_staging/" --exclude-folders `, } diff --git a/cmd/version-info.go b/cmd/version-info.go index 3c6a101547..6a872c68b7 100644 --- a/cmd/version-info.go +++ b/cmd/version-info.go @@ -47,7 +47,7 @@ FLAGS: {{end}} EXAMPLES: 1. Display bucket versioning status for bucket "mybucket". - {{.Prompt}} {{.HelpName}} myminio/mybucket + {{.Prompt}} {{.HelpName}} mysilo/mybucket `, } diff --git a/cmd/version-suspend.go b/cmd/version-suspend.go index 596935ceb7..bf47e9fac6 100644 --- a/cmd/version-suspend.go +++ b/cmd/version-suspend.go @@ -45,8 +45,8 @@ FLAGS: {{range .VisibleFlags}}{{.}} {{end}} EXAMPLES: - 1. Suspend versioning on bucket "mybucket" for alias "myminio". - {{.Prompt}} {{.HelpName}} myminio/mybucket + 1. Suspend versioning on bucket "mybucket" for alias "mysilo". + {{.Prompt}} {{.HelpName}} mysilo/mybucket `, } diff --git a/cmd/watch-main.go b/cmd/watch-main.go index d5b16b99ef..46a19f6fe0 100644 --- a/cmd/watch-main.go +++ b/cmd/watch-main.go @@ -69,20 +69,20 @@ FLAGS: {{range .VisibleFlags}}{{.}} {{end}} EXAMPLES: - 1. Watch new S3 operations on a MinIO server - {{.Prompt}} {{.HelpName}} play/testbucket + 1. Watch new S3 operations on a Silo/MinIO server + {{.Prompt}} {{.HelpName}} mysilo/testbucket - 2. Watch new events for a specific prefix "output/" on MinIO server. - {{.Prompt}} {{.HelpName}} --prefix "output/" play/testbucket + 2. Watch new events for a specific prefix "output/" on Silo/MinIO server. + {{.Prompt}} {{.HelpName}} --prefix "output/" mysilo/testbucket - 3. Watch new events for a specific suffix ".jpg" on MinIO server. - {{.Prompt}} {{.HelpName}} --suffix ".jpg" play/testbucket + 3. Watch new events for a specific suffix ".jpg" on Silo/MinIO server. + {{.Prompt}} {{.HelpName}} --suffix ".jpg" mysilo/testbucket - 4. Watch new events on a specific prefix and suffix on MinIO server. - {{.Prompt}} {{.HelpName}} --suffix ".jpg" --prefix "photos/" play/testbucket + 4. Watch new events on a specific prefix and suffix on Silo/MinIO server. + {{.Prompt}} {{.HelpName}} --suffix ".jpg" --prefix "photos/" mysilo/testbucket 5. Site level watch (except new buckets created after running this command) - {{.Prompt}} {{.HelpName}} play/ + {{.Prompt}} {{.HelpName}} mysilo/ 6. Watch for events on local directory. {{.Prompt}} {{.HelpName}} /usr/share From 5312859998bde10b169fee7c676893ec0f5e72bc Mon Sep 17 00:00:00 2001 From: Feng Ruohang Date: Thu, 6 Aug 2026 11:10:59 +0800 Subject: [PATCH 3/7] docs: align governance files and package metadata with the fork - code of conduct reports now reach the fork maintainer instead of dev@min.io - CONFLICT.md rewritten in the fork's own voice, documenting the actual mcli naming scheme instead of speaking as MinIO, Inc. - CONTRIBUTING.md points at pgsty/mc and go-modules workflow instead of the archived upstream repository and GOPATH-era instructions - PR template licenses contributions under AGPL-3.0-or-later (matching the project license, previously a leftover Apache-2 CLA) and no longer links to minio/docs - shared package description now says what the package is - the Silo object storage client - instead of describing a server; updated atomically in nfpm.yml, Dockerfile.goreleaser and sign-release-rpms.sh which test-release.yml keeps in lockstep - README Silo bundle rows point at pgsty/silo (Docker Hub successor of pgsty/minio); issue template asks for mcli --version to match the shipped binary name; stray duplicate root issue template and upstream jekyll _config.yml removed - NOTICE gains a modification statement identifying the Silo fork while keeping the original MinIO attribution intact Co-Authored-By: Claude Fable 5 Signed-off-by: Feng Ruohang --- .github/ISSUE_TEMPLATE.md | 12 ------------ .github/ISSUE_TEMPLATE/bug_report.md | 4 ++-- .github/PULL_REQUEST_TEMPLATE.md | 9 +++++---- .github/nfpm.yml | 2 +- CONFLICT.md | 22 ++++++++++++++++------ CONTRIBUTING.md | 12 +++++------- Dockerfile.goreleaser | 4 ++-- NOTICE | 8 ++++++++ README.md | 2 +- README_zh_CN.md | 2 +- _config.yml | 1 - buildscripts/sign-release-rpms.sh | 4 ++-- code_of_conduct.md | 2 +- 13 files changed, 44 insertions(+), 40 deletions(-) delete mode 100644 .github/ISSUE_TEMPLATE.md delete mode 100644 _config.yml diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md deleted file mode 100644 index 62ca240df8..0000000000 --- a/.github/ISSUE_TEMPLATE.md +++ /dev/null @@ -1,12 +0,0 @@ -## Expected behavior - -## Actual behavior - -## Steps to reproduce the behavior - -## mc --version -- (paste output of `mc --version`) - -## System information - - diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index ba961ec7f5..a8be6eb64c 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -13,7 +13,7 @@ assignees: '' ## Steps to reproduce the behavior -## mc --version -- (paste output of `mc --version`) +## mcli --version +- (paste output of `mcli --version`) ## System information diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 26b23178e1..2d0b41f59f 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -1,8 +1,9 @@ ## Community Contribution License All community contributions in this pull request are licensed to the project maintainers -under the terms of the [Apache 2 license](https://www.apache.org/licenses/LICENSE-2.0). -By creating this pull request I represent that I have the right to license the -contributions to the project maintainers under the Apache 2 license. +under the terms of the [GNU AGPL v3.0 or later](https://www.gnu.org/licenses/agpl-3.0.html), +the license of this project. +By creating this pull request I represent that I have the right to license the +contributions to the project maintainers under that license. ## Description @@ -23,4 +24,4 @@ contributions to the project maintainers under the Apache 2 license. - [ ] Fixes a regression (If yes, please add `commit-id` or `PR #` here) - [ ] Unit tests added/updated - [ ] Internal documentation updated -- [ ] Create a documentation update request [here](https://github.com/minio/docs/issues/new?label=doc-change,title=Doc+Updated+Needed+For+PR+github.com%2fminio%2fmc%2fpull%2fNNNNN) +- [ ] Documentation update requested (open an issue at [pgsty/mc](https://github.com/pgsty/mc/issues) if silo.pgsty.com content needs updating) diff --git a/.github/nfpm.yml b/.github/nfpm.yml index 129584a1a4..79d01ce267 100644 --- a/.github/nfpm.yml +++ b/.github/nfpm.yml @@ -7,7 +7,7 @@ release: ${NFPM_RELEASE} section: utils priority: optional maintainer: "Ruohang Feng (@Vonng) " -description: S3-Interface Libre Object Storage, Community-maintained MinIO client fork. +description: Silo object storage client (mcli), a community-maintained fork of the MinIO Client. vendor: PGSTY homepage: https://silo.pgsty.com license: AGPL-3.0-or-later diff --git a/CONFLICT.md b/CONFLICT.md index 282c183054..158b06fa36 100644 --- a/CONFLICT.md +++ b/CONFLICT.md @@ -1,11 +1,21 @@ -## mc (MinIO Client) v/s Midnight Commander (mc) +## mc (this client) v/s Midnight Commander (mc) -There has been some amount of [requests](https://github.com/minio/mc/issues?q=is%3Aissue+midnight+commander+is%3Aclosed) on renaming this project to avoid the conflict with Midnight Commander for Unix distributions. We struggled with this, it is harder to find a name sweeter and shorter than `mc` for MinIO Client. +The `mc` command name is inherited from the upstream MinIO Client and conflicts +with GNU Midnight Commander on many Unix distributions. The upstream project +[declined to rename](https://github.com/minio/mc/issues?q=is%3Aissue+midnight+commander+is%3Aclosed) +its binary, and this fork keeps the upstream command name for script +compatibility. The two programs share no code or ideas — only the abbreviation +matches. Midnight Commander (mc) is a free software clone of Norton +Commander (nc), while this client is a single, fully self-contained static +binary for object storage. -Besides `mc` is a single static binary and can reside inside your application and is fully self contained. Midnight Commander (mc) is a free software clone of Norton Commander (nc). MinIO and Midnight shares no code or ideas. Only their abbreviation matches. - -Package managers are free to choose a different name if they like. One such solution [pointed out](https://github.com/minio/mc/issues/873#issuecomment-267583013) by one of our community members. +To avoid the conflict, the standalone archives and Linux packages of this fork +install the binary as `mcli` — the approach +[suggested](https://github.com/minio/mc/issues/873#issuecomment-267583013) in +the upstream issue tracker. The configuration directory follows the invoked +name: `mc` uses `~/.mc`, `mcli` uses `~/.mcli`. Package managers remain free to +choose a different name: ``` mv ./mc ./mcli -``` \ No newline at end of file +``` diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 429c754d21..6837be46cf 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,8 +1,6 @@ -### Setup your mc Github Repository -Fork [mc upstream](https://github.com/minio/mc/fork) source repository to your own personal repository. +### Setup your mc GitHub Repository +Fork the [pgsty/mc](https://github.com/pgsty/mc/fork) repository to your own personal repository. ``` -$ mkdir -p $GOPATH/src/github.com/minio -$ cd $GOPATH/src/github.com/minio $ git clone https://github.com/$USER_ID/mc $ cd mc $ make @@ -18,12 +16,12 @@ $ ./mc --help - Create your feature branch (git checkout -b my-new-feature) - Commit your changes (git commit -am 'Add some feature') - Push to the branch (git push origin my-new-feature) - - Create new Pull Request + - Create new Pull Request against the `main` branch of [pgsty/mc](https://github.com/pgsty/mc) * If you have additional dependencies for ``mc``, ``mc`` manages its dependencies using `go mod` - Run `go get foo/bar` - Edit your code to import foo/bar - - Run `GO111MODULE=on go mod tidy` from top-level folder + - Run `go mod tidy` from top-level folder * When you're ready to create a pull request, be sure to: - Have test cases for the new code. If you have questions about how to do it, please ask in your pull request. @@ -31,6 +29,6 @@ $ ./mc --help - Squash your commits into a single commit. `git rebase -i`. It's okay to force update your pull request. - Make sure `make install` completes. -* Read [Effective Go](https://github.com/golang/go/wiki/CodeReviewComments) article from Golang project +* Read [Go Code Review Comments](https://go.dev/wiki/CodeReviewComments) from the Go project - `mc` project is conformant with Golang style - if you happen to observe offending code, please feel free to send a pull request diff --git a/Dockerfile.goreleaser b/Dockerfile.goreleaser index 55998d2962..5dba7d404d 100644 --- a/Dockerfile.goreleaser +++ b/Dockerfile.goreleaser @@ -13,9 +13,9 @@ LABEL maintainer="Ruohang Feng (@Vonng) " \ org.opencontainers.image.vendor="PGSTY" \ org.opencontainers.image.url="https://silo.pgsty.com" \ org.opencontainers.image.source="https://github.com/pgsty/mc" \ - org.opencontainers.image.description="S3-Interface Libre Object Storage, Community-maintained MinIO client fork." \ + org.opencontainers.image.description="Silo object storage client (mcli), a community-maintained fork of the MinIO Client." \ org.opencontainers.image.licenses="AGPL-3.0-or-later" \ - description="S3-Interface Libre Object Storage, Community-maintained MinIO client fork." + description="Silo object storage client (mcli), a community-maintained fork of the MinIO Client." COPY --from=certs /tmp/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt COPY mc /usr/bin/mc diff --git a/NOTICE b/NOTICE index c5d57b4e87..e528a52722 100644 --- a/NOTICE +++ b/NOTICE @@ -7,3 +7,11 @@ The MinIO project contains unmodified/modified subcomponents too with separate copyright notices and license terms. Your use of the source code for the these subcomponents is subject to the terms and conditions of the following licenses. + +=== + +This distribution (pgsty/mc, shipped as "mcli") is a community-maintained +fork of the MinIO Client, modified by the Silo project +(https://silo.pgsty.com/). It is not affiliated with, endorsed by, or +sponsored by MinIO, Inc. Modifications are Copyright (c) 2026 Silo project +contributors and are licensed under the GNU AGPL v3.0 or later. diff --git a/README.md b/README.md index b4cd819865..b182f7b2ee 100644 --- a/README.md +++ b/README.md @@ -89,7 +89,7 @@ Use [Download & Install](https://silo.pgsty.com/download/#client) to choose a cl | Standalone archives | [GitHub Releases](https://github.com/pgsty/mc/releases), providing `mcli` for Linux, macOS, and Windows on `amd64` and `arm64` | | Linux packages | RPM, DEB, and APK for `x86_64`/`aarch64`, also distributed through the [Pigsty repository](https://pigsty.io/docs/repo/infra/list/#object-storage) | | Container image | [`pgsty/mc`](https://hub.docker.com/r/pgsty/mc), multi-arch for `linux/amd64` and `linux/arm64`, with `mc` as the entrypoint | -| Silo bundle | [`pgsty/minio`](https://hub.docker.com/r/pgsty/minio) includes the client as `mcli` with an `mc` compatibility alias | +| Silo bundle | [`pgsty/silo`](https://hub.docker.com/r/pgsty/silo) includes the client as `mcli` with an `mc` compatibility alias | | Documentation | [Client command reference](https://silo.pgsty.com/reference/minio-mc/) and [administration command reference](https://silo.pgsty.com/reference/minio-mc-admin/) | ## Quick Start diff --git a/README_zh_CN.md b/README_zh_CN.md index 1eaabcab21..3c00e9215e 100644 --- a/README_zh_CN.md +++ b/README_zh_CN.md @@ -89,7 +89,7 @@ | 独立归档包 | [GitHub Releases](https://github.com/pgsty/mc/releases)，提供 Linux、macOS、Windows 的 `amd64` 与 `arm64` 版本，命令名为 `mcli` | | Linux 软件包 | 面向 `x86_64`/`aarch64` 的 RPM、DEB 与 APK，同时通过 [Pigsty 软件仓库](https://pigsty.cc/docs/repo/infra/list/#object-storage) 分发 | | 容器镜像 | [`pgsty/mc`](https://hub.docker.com/r/pgsty/mc)，支持 `linux/amd64` 与 `linux/arm64` 多架构清单，以 `mc` 作为入口 | -| Silo 内置客户端 | [`pgsty/minio`](https://hub.docker.com/r/pgsty/minio) 以 `mcli` 提供本客户端，并保留 `mc` 兼容别名 | +| Silo 内置客户端 | [`pgsty/silo`](https://hub.docker.com/r/pgsty/silo) 以 `mcli` 提供本客户端，并保留 `mc` 兼容别名 | | 文档 | [客户端命令参考](https://silo.pgsty.com/zh/reference/minio-mc/)与[管理命令参考](https://silo.pgsty.com/zh/reference/minio-mc-admin/) | ## 快速开始 diff --git a/_config.yml b/_config.yml deleted file mode 100644 index 2f7efbeab5..0000000000 --- a/_config.yml +++ /dev/null @@ -1 +0,0 @@ -theme: jekyll-theme-minimal \ No newline at end of file diff --git a/buildscripts/sign-release-rpms.sh b/buildscripts/sign-release-rpms.sh index 2e8401210b..69187df0c9 100755 --- a/buildscripts/sign-release-rpms.sh +++ b/buildscripts/sign-release-rpms.sh @@ -6,8 +6,8 @@ expected_fingerprint="9592A7BC7A682E7333376E09E7935D8DB9BD8B20" expected_vendor="PGSTY" expected_packager="Ruohang Feng (@Vonng) " expected_url="https://silo.pgsty.com" -expected_summary="S3-Interface Libre Object Storage, Community-maintained MinIO client fork." -expected_description="S3-Interface Libre Object Storage, Community-maintained MinIO client fork." +expected_summary="Silo object storage client (mcli), a community-maintained fork of the MinIO Client." +expected_description="Silo object storage client (mcli), a community-maintained fork of the MinIO Client." expected_license="AGPL-3.0-or-later" expected_group="Applications/File" repository="${GH_REPO:-pgsty/mc}" diff --git a/code_of_conduct.md b/code_of_conduct.md index cb232c3c69..fdb5e6d4be 100644 --- a/code_of_conduct.md +++ b/code_of_conduct.md @@ -58,7 +58,7 @@ further defined and clarified by project maintainers. ## Enforcement Instances of abusive, harassing, or otherwise unacceptable behavior may be -reported by contacting the project team at dev@min.io. The project team +reported by contacting the project team at rh@vonng.com. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. From 87b780e36d25b7851e5fcb49077802f898ba40b7 Mon Sep 17 00:00:00 2001 From: Feng Ruohang Date: Thu, 6 Aug 2026 11:10:59 +0800 Subject: [PATCH 4/7] test: default functional tests to a local server and add brand gate - functional-tests.sh no longer targets play.min.io with MinIO's public demo credentials when SERVER_ENDPOINT is unset; it now defaults to localhost:9000 with the same credentials CI already uses, so a bare local run never fires the destructive suite at third-party infrastructure - new buildscripts/check-branding.sh fails the build when user-visible surfaces reintroduce MinIO endpoints, commercial upsell, branded example aliases, or lose the Silo identity or the SUBNET hard-disable; wired into make verifiers and the vetchecks CI job; deliberately never inspects protocol-compatibility identifiers Co-Authored-By: Claude Fable 5 Signed-off-by: Feng Ruohang --- .github/workflows/go.yml | 6 ++++ Makefile | 6 +++- buildscripts/check-branding.sh | 59 ++++++++++++++++++++++++++++++++++ functional-tests.sh | 24 +++++++------- 4 files changed, 83 insertions(+), 12 deletions(-) create mode 100755 buildscripts/check-branding.sh diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index 7badbd0a52..1bdd3dc8c4 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -91,5 +91,11 @@ jobs: go mod tidy git diff --exit-code -- go.mod go.sum + # Brand policy gate: user-visible surfaces must keep the Silo identity + # and never reintroduce MinIO endpoints or commercial upsell, while + # protocol-compatibility identifiers stay untouched. + - name: Check branding policy + run: bash buildscripts/check-branding.sh + - name: Test 386 run: GOOS=linux GOARCH=386 go test -short ./... diff --git a/Makefile b/Makefile index da905ee08e..07ad6a47ea 100644 --- a/Makefile +++ b/Makefile @@ -23,7 +23,11 @@ getdeps: crosscompile: @(env bash $(PWD)/buildscripts/cross-compile.sh) -verifiers: getdeps vet lint +verifiers: getdeps vet lint check-brand + +check-brand: + @echo "Running $@ check" + @(env bash $(PWD)/buildscripts/check-branding.sh) docker: build @docker build -t $(TAG) . -f Dockerfile.dev diff --git a/buildscripts/check-branding.sh b/buildscripts/check-branding.sh new file mode 100755 index 0000000000..09bac6658d --- /dev/null +++ b/buildscripts/check-branding.sh @@ -0,0 +1,59 @@ +#!/usr/bin/env bash + +# Brand policy gate for the Silo mc fork. +# +# Classification follows the Silo rebranding manual: +# BRAND/UPSELL -> must not reappear in user-visible surfaces (checked here) +# COMPAT -> deliberately preserved and never checked: MINIO_*/MC_* env +# vars, x-minio-* headers, module and import paths, the +# minio-go user agent, --type minio enums, /minio/* metric +# paths, the minio-job scrape job name, the .part.minio +# transfer suffix, and all original copyright headers. +# +# Allowlisted files keep legacy-migration or dormant upstream logic on purpose. + +set -euo pipefail +cd "$(dirname "$0")/.." + +fail=0 +err() { + echo "check-branding: $1" >&2 + fail=1 +} + +# 1. No MinIO-operated endpoints outside legacy config migration and the +# dormant play-detection logic. +if git grep -nE 'play\.min\.io|dl\.min\.io' -- 'cmd/*.go' \ + ':!cmd/config-old.go' ':!cmd/config-fix.go' ':!cmd/config-migrate.go' \ + ':!cmd/config-v10.go' ':!cmd/license-register.go' ':!cmd/*_test.go'; then + err "MinIO demo/download endpoint found outside the migration allowlist" +fi + +# 2. No commercial upsell URLs anywhere. +if git grep -n 'min\.io/signup\|min\.io/subscription' -- ':!buildscripts/check-branding.sh'; then + err "MinIO commercial upsell URL found" +fi + +# 3. The CLI must identify as the Silo client. +if ! grep -q 'app.Usage = "Silo client' cmd/main.go; then + err "cmd/main.go app.Usage no longer carries the Silo identity" +fi +if grep -q 'app.Author = "MinIO' cmd/main.go; then + err "cmd/main.go app.Author reverted to MinIO" +fi + +# 4. Example aliases stay de-branded. +if git grep -nw 'myminio' -- 'cmd/*.go' ':!cmd/*_test.go'; then + err "'myminio' example alias reappeared" +fi + +# 5. SUBNET connectivity must stay hard-disabled at compile time. +if ! grep -q 'func subnetServicesEnabled() bool { return false }' cmd/subnet-utils.go; then + err "subnetServicesEnabled() is no longer hard-disabled" +fi + +if [ "${fail}" -ne 0 ]; then + echo "check-branding: FAILED - review docs/rebranding policy before changing brand surfaces" >&2 + exit 1 +fi +echo "check-branding: OK" diff --git a/functional-tests.sh b/functional-tests.sh index 926eaf7bd1..58873a0dd8 100755 --- a/functional-tests.sh +++ b/functional-tests.sh @@ -20,16 +20,16 @@ ################################################################################ # -# This script is usable by mc functional tests, mint tests and MinIO verification -# tests. +# This script is usable by mc functional tests, mint tests and server +# verification tests. # # * As mc functional tests, just run this script. It uses mc executable binary -# in current working directory or in the path. The tests uses play.min.io -# as MinIO server. +# in current working directory or in the path. The tests use a local +# Silo/MinIO server at localhost:9000 by default. # # * For other, call this script with environment variables MINT_MODE, # MINT_DATA_DIR, SERVER_ENDPOINT, ACCESS_KEY, SECRET_KEY and ENABLE_HTTPS. It -# uses mc executable binary in current working directory and uses given MinIO +# uses mc executable binary in current working directory and uses the given # server to run tests. MINT_MODE is set by mint to specify what category of # tests to run. # @@ -62,10 +62,12 @@ if [ -n "$MINT_MODE" ]; then fi if [ -z "${SERVER_ENDPOINT+x}" ]; then - SERVER_ENDPOINT="play.min.io" - ACCESS_KEY="Q3AM3UQ867SPQQA43P2F" - SECRET_KEY="zuf+tfteSlswRu7BJ86wekitnifILbZam1KYY3TG" - ENABLE_HTTPS=1 + # Default to a locally running server; never target third-party + # infrastructure. Override with SERVER_ENDPOINT/ACCESS_KEY/SECRET_KEY. + SERVER_ENDPOINT="localhost:9000" + ACCESS_KEY="minioadmin" + SECRET_KEY="minioadmin" + ENABLE_HTTPS=0 fi # If you want to run the complete site cleaning test, set this variable to true @@ -90,8 +92,8 @@ if [ "$ENABLE_HTTPS" != "1" ]; then ENDPOINT="http://$SERVER_ENDPOINT" fi -SERVER_ALIAS="myminio" -SERVER_ALIAS_TLS="myminio-ssl" +SERVER_ALIAS="mysilo" +SERVER_ALIAS_TLS="mysilo-ssl" BUCKET_NAME="mc-test-bucket-$RANDOM" WATCH_OUT_FILE="$WORK_DIR/watch.out-$RANDOM" From 1027801a82e334345019e9e8808c254d41b2209a Mon Sep 17 00:00:00 2001 From: Feng Ruohang Date: Thu, 6 Aug 2026 11:15:49 +0800 Subject: [PATCH 5/7] fix: credit both MinIO and PGSTY in copyright notices This is a mixed fork: upstream MinIO development covers 2015-2025 and the PGSTY fork starts in 2025. Version output and the help template now print both lines - MinIO fixed at 2015-2025, PGSTY from 2025 through the release-stamped CopyrightYear. The fork-authored test file carries the dual header and the NOTICE modification statement uses the same range. Co-Authored-By: Claude Fable 5 Signed-off-by: Feng Ruohang --- NOTICE | 4 ++-- cmd/main.go | 6 ++++-- cmd/subnet-disabled_test.go | 3 ++- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/NOTICE b/NOTICE index e528a52722..272e411901 100644 --- a/NOTICE +++ b/NOTICE @@ -13,5 +13,5 @@ of the following licenses. This distribution (pgsty/mc, shipped as "mcli") is a community-maintained fork of the MinIO Client, modified by the Silo project (https://silo.pgsty.com/). It is not affiliated with, endorsed by, or -sponsored by MinIO, Inc. Modifications are Copyright (c) 2026 Silo project -contributors and are licensed under the GNU AGPL v3.0 or later. +sponsored by MinIO, Inc. Modifications are Copyright (c) 2025-2026 PGSTY +and are licensed under the GNU AGPL v3.0 or later. diff --git a/cmd/main.go b/cmd/main.go index e0bc5a76ba..9ddab7ac3e 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -71,7 +71,8 @@ TIP: Use '{{.Name}} --autocompletion' to enable shell autocompletion COPYRIGHT: - Copyright (c) 2015-` + CopyrightYear + ` MinIO, Inc. + Copyright (c) 2015-2025 MinIO, Inc. + Copyright (c) 2025-` + CopyrightYear + ` PGSTY LICENSE: GNU AGPLv3 @@ -444,7 +445,8 @@ func printMCVersion(c *cli.Context) { fmt.Fprintf(c.App.Writer, "%s version %s (commit-id=%s)\n", c.App.Name, c.App.Version, CommitID) fmt.Fprintf(c.App.Writer, "Silo object storage client, based on MinIO technology\n") fmt.Fprintf(c.App.Writer, "Runtime: %s %s/%s\n", runtime.Version(), runtime.GOOS, runtime.GOARCH) - fmt.Fprintf(c.App.Writer, "Copyright (c) 2015-%s MinIO, Inc.\n", CopyrightYear) + fmt.Fprintf(c.App.Writer, "Copyright (c) 2015-2025 MinIO, Inc.\n") + fmt.Fprintf(c.App.Writer, "Copyright (c) 2025-%s PGSTY\n", CopyrightYear) fmt.Fprintf(c.App.Writer, "License GNU AGPLv3 \n") } diff --git a/cmd/subnet-disabled_test.go b/cmd/subnet-disabled_test.go index 05f97b37bd..ffe7744fbd 100644 --- a/cmd/subnet-disabled_test.go +++ b/cmd/subnet-disabled_test.go @@ -1,4 +1,5 @@ -// Copyright (c) 2015-2022 MinIO, Inc. +// Copyright (c) 2015-2025 MinIO, Inc. +// Copyright (c) 2025-2026 PGSTY // // This file is part of MinIO Object Storage stack // From 6930657a0c8f7afc0bccfa5103799fe936853af7 Mon Sep 17 00:00:00 2001 From: Feng Ruohang Date: Thu, 6 Aug 2026 11:20:52 +0800 Subject: [PATCH 6/7] docs: adopt no-CLA plus DCO contribution policy The core of this fork is Copyright MinIO, Inc., so the combined work can never be relicensed; a CLA would create signing friction while buying nothing. Contributions are therefore accepted inbound=outbound under AGPL-3.0-or-later with contributors keeping their copyright. What a fork built on third-party code does need is provenance, so the Developer Certificate of Origin 1.1 becomes mandatory: every non-bot commit must carry a Signed-off-by trailer matching the author email, enforced by a dependency-free workflow check. CONTRIBUTING.md documents the sign-off, repair (git rebase --signoff), cherry-pick provenance (-x plus relayer sign-off), dual copyright headers for fork-authored files, and trailer preservation across squash merges; README (EN/zh) and the PR template point at the policy. Co-Authored-By: Claude Fable 5 Signed-off-by: Feng Ruohang --- .github/PULL_REQUEST_TEMPLATE.md | 13 +++++---- .github/workflows/dco.yml | 43 +++++++++++++++++++++++++++++ CONTRIBUTING.md | 46 ++++++++++++++++++++++++++++++++ README.md | 2 ++ README_zh_CN.md | 2 ++ 5 files changed, 101 insertions(+), 5 deletions(-) create mode 100644 .github/workflows/dco.yml diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 2d0b41f59f..7f7a1cbc76 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -1,9 +1,11 @@ ## Community Contribution License -All community contributions in this pull request are licensed to the project maintainers -under the terms of the [GNU AGPL v3.0 or later](https://www.gnu.org/licenses/agpl-3.0.html), -the license of this project. -By creating this pull request I represent that I have the right to license the -contributions to the project maintainers under that license. +This project does not use a CLA; contributions are accepted inbound=outbound. +All community contributions in this pull request are licensed under the +[GNU AGPL v3.0 or later](https://www.gnu.org/licenses/agpl-3.0.html), the +license of this project, and every commit must carry a DCO `Signed-off-by` +trailer (`git commit -s`) certifying the +[Developer Certificate of Origin](https://developercertificate.org/) — +see [CONTRIBUTING.md](../CONTRIBUTING.md). ## Description @@ -21,6 +23,7 @@ contributions to the project maintainers under that license. - [ ] Breaking change (fix or feature that would cause existing functionality to change) ## Checklist: +- [ ] All commits are signed off (`git commit -s`) per the [DCO](https://developercertificate.org/) - [ ] Fixes a regression (If yes, please add `commit-id` or `PR #` here) - [ ] Unit tests added/updated - [ ] Internal documentation updated diff --git a/.github/workflows/dco.yml b/.github/workflows/dco.yml new file mode 100644 index 0000000000..ce5faf0471 --- /dev/null +++ b/.github/workflows/dco.yml @@ -0,0 +1,43 @@ +name: DCO + +on: + pull_request: + branches: + - main + +permissions: + contents: read + +jobs: + check: + name: Verify DCO sign-off + runs-on: ubuntu-latest + steps: + - name: Checkout code + uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 + with: + fetch-depth: 0 + + # Every non-merge commit in the pull request must carry a Signed-off-by + # trailer matching the commit author's email, certifying the Developer + # Certificate of Origin 1.1 (https://developercertificate.org/). + # Bot-authored commits (dependabot etc.) are exempt. + - name: Check Signed-off-by trailers + env: + BASE_SHA: ${{ github.event.pull_request.base.sha }} + HEAD_SHA: ${{ github.event.pull_request.head.sha }} + run: | + fail=0 + while read -r sha; do + author_name="$(git log -1 --format='%an' "${sha}")" + author_email="$(git log -1 --format='%ae' "${sha}")" + case "${author_name}" in + *"[bot]"*) continue ;; + esac + if ! git log -1 --format='%(trailers:key=Signed-off-by,valueonly)' "${sha}" | + grep -qiF "<${author_email}>"; then + echo "::error::commit ${sha} by ${author_name} <${author_email}> lacks a matching Signed-off-by trailer; sign with 'git commit -s', repair with 'git rebase --signoff'" + fail=1 + fi + done < <(git rev-list --no-merges "${BASE_SHA}..${HEAD_SHA}") + exit "${fail}" diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 6837be46cf..4217300dd0 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -32,3 +32,49 @@ $ ./mc --help * Read [Go Code Review Comments](https://go.dev/wiki/CodeReviewComments) from the Go project - `mc` project is conformant with Golang style - if you happen to observe offending code, please feel free to send a pull request + +### Licensing of Contributions + +This project is licensed under the [GNU AGPL v3.0 or later](LICENSE). Its core +is Copyright (c) MinIO, Inc.; the combined work can never be relicensed, and +this fork does not try to. + +* **No CLA.** We do not ask you to sign a Contributor License Agreement and we + do not take your copyright. Contributions are accepted inbound=outbound: you + keep the copyright to your changes and license them under the same + AGPL-3.0-or-later as the project itself. The maintainers receive no rights + beyond the project license. + +* **DCO sign-off required.** Every commit must carry a + `Signed-off-by: Your Name ` trailer certifying the + [Developer Certificate of Origin 1.1](https://developercertificate.org/) — + your statement that you have the right to submit the code under the project + license. Sign each commit with: + + ``` + git commit -s + ``` + + Forgot some? Repair your branch with `git rebase --signoff` and force-push. + CI rejects pull requests containing unsigned commits; the sign-off email + must match the commit author email. (Lowercase `-s` is the plain-text DCO + sign-off; cryptographic `-S`/GPG signing is welcome but independent.) + +* **Provenance.** Only submit code you are entitled to submit. When relaying a + patch written by someone else — for example cherry-picking from the archived + upstream or another fork — preserve original authorship + (`git cherry-pick -x`, keep the author field and any existing + `Signed-off-by` trailers) and add your own sign-off as the person passing it + along. + +* **File headers.** Files derived from upstream keep the original MinIO + copyright header unchanged. New files added by this fork use the dual + header, followed by the standard AGPL boilerplate: + + ``` + // Copyright (c) 2015-2025 MinIO, Inc. + // Copyright (c) 2025-2026 PGSTY + ``` + +* **Squash merges** must keep the `Signed-off-by:` trailers in the resulting + commit message. diff --git a/README.md b/README.md index b182f7b2ee..cfcce19184 100644 --- a/README.md +++ b/README.md @@ -144,6 +144,8 @@ Useful contributions include security and dependency updates, reproducible bug f Issues and pull requests should include the affected client and server versions, reproduction steps, impact, expected behavior, tests, and compatibility notes. Discuss large changes in an issue first. +There is no CLA: contributions are accepted inbound=outbound under the project license (AGPL-3.0-or-later) and contributors keep their copyright. Every commit must be signed off (`git commit -s`) per the [Developer Certificate of Origin](https://developercertificate.org/); see [`CONTRIBUTING.md`](CONTRIBUTING.md). + ## Background The upstream [`minio/mc`](https://github.com/minio/mc) repository was archived after its final 2025 development line. Pigsty maintains this fork because Silo needs a reproducible companion client release channel rather than depending on an archived upstream project. diff --git a/README_zh_CN.md b/README_zh_CN.md index 3c00e9215e..7165805cd6 100644 --- a/README_zh_CN.md +++ b/README_zh_CN.md @@ -144,6 +144,8 @@ make build Issue 与 Pull Request 应说明受影响的客户端与服务端版本、复现步骤、影响、预期行为、测试与兼容性说明。大型改动请先提交 Issue 讨论。 +本项目不要求签署 CLA：贡献按项目许可证（AGPL-3.0-or-later，inbound=outbound）接收，贡献者保留自己的版权。每个提交都必须按照 [DCO](https://developercertificate.org/) 签署（`git commit -s`），详见 [`CONTRIBUTING.md`](CONTRIBUTING.md)。 + ## 背景 上游 [`minio/mc`](https://github.com/minio/mc) 仓库在 2025 年最后一条开发线后归档。Pigsty 维护此分支，是因为 Silo 需要可复现的配套客户端发布渠道，而不能继续依赖已经归档的上游项目。 From 6eabee872bd55c8beb6a8e45b158ae36ffcc7dec Mon Sep 17 00:00:00 2001 From: Feng Ruohang Date: Thu, 6 Aug 2026 11:32:27 +0800 Subject: [PATCH 7/7] docs: add related-projects table and polish contribution wording - README (EN/zh) gains a Related Projects section linking pgsty/silo, pgsty/silo-console, pgsty/silo-pkg, and pgsty/pigsty alongside this repository - the container quick-start example listed the removed play alias; 'alias ls' works against the fresh default config - PR template links CONTRIBUTING.md by absolute URL (relative links do not resolve from the pull-request page) - CONTRIBUTING example commit command now carries the -s sign-off the policy itself requires Co-Authored-By: Claude Fable 5 Signed-off-by: Feng Ruohang --- .github/PULL_REQUEST_TEMPLATE.md | 2 +- CONTRIBUTING.md | 4 ++-- README.md | 12 +++++++++++- README_zh_CN.md | 12 +++++++++++- 4 files changed, 25 insertions(+), 5 deletions(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 7f7a1cbc76..3334a56493 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -5,7 +5,7 @@ All community contributions in this pull request are licensed under the license of this project, and every commit must carry a DCO `Signed-off-by` trailer (`git commit -s`) certifying the [Developer Certificate of Origin](https://developercertificate.org/) — -see [CONTRIBUTING.md](../CONTRIBUTING.md). +see [CONTRIBUTING.md](https://github.com/pgsty/mc/blob/main/CONTRIBUTING.md). ## Description diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 4217300dd0..8169f74fb0 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,4 +1,4 @@ -### Setup your mc GitHub Repository +### Set up your mc GitHub Repository Fork the [pgsty/mc](https://github.com/pgsty/mc/fork) repository to your own personal repository. ``` $ git clone https://github.com/$USER_ID/mc @@ -14,7 +14,7 @@ $ ./mc --help * Go ahead and fork the project and make your changes. We encourage pull requests to discuss code changes. - Fork it - Create your feature branch (git checkout -b my-new-feature) - - Commit your changes (git commit -am 'Add some feature') + - Commit your changes with a DCO sign-off (git commit -s -am 'Add some feature') - Push to the branch (git push origin my-new-feature) - Create new Pull Request against the `main` branch of [pgsty/mc](https://github.com/pgsty/mc) diff --git a/README.md b/README.md index cfcce19184..35dd0d4e61 100644 --- a/README.md +++ b/README.md @@ -46,6 +46,16 @@ The official project portal is [silo.pgsty.com](https://silo.pgsty.com/). It bri | Vulnerability reporting | [Security Policy](https://silo.pgsty.com/about/security/) | | License, attribution, and trademark information | [`LICENSE`](LICENSE), [`NOTICE`](NOTICE), [`CREDITS`](CREDITS), and the portal's [License](https://silo.pgsty.com/about/license/), [Attribution](https://silo.pgsty.com/about/attribution/), and [Trademark](https://silo.pgsty.com/about/trademark/) pages | +## Related Projects + +| Repository | Description | +| :-- | :-- | +| [`pgsty/silo`](https://github.com/pgsty/silo) | Silo object storage server — the S3-compatible MinIO fork this client accompanies | +| [`pgsty/mc`](https://github.com/pgsty/mc) | This repository — the Silo client, shipped as `mcli` with the `mc` command name | +| [`pgsty/silo-console`](https://github.com/pgsty/silo-console) | Admin web console for the Silo server | +| [`pgsty/silo-pkg`](https://github.com/pgsty/silo-pkg) | Shared Go packages maintained for the Silo forks | +| [`pgsty/pigsty`](https://github.com/pgsty/pigsty) | Pigsty — the PostgreSQL distribution that ships Silo as its object storage | + ## Maintenance Policy The active `main` release line covers: @@ -107,7 +117,7 @@ The container retains the familiar `mc` entrypoint: ```bash docker run --rm pgsty/mc:latest --version -docker run --rm pgsty/mc:latest ls play +docker run --rm pgsty/mc:latest alias ls ``` > [!WARNING] diff --git a/README_zh_CN.md b/README_zh_CN.md index 7165805cd6..218f9c50b4 100644 --- a/README_zh_CN.md +++ b/README_zh_CN.md @@ -46,6 +46,16 @@ | 私密漏洞报告 | [安全策略](https://silo.pgsty.com/zh/about/security/) | | 许可证、署名与商标信息 | [`LICENSE`](LICENSE)、[`NOTICE`](NOTICE)、[`CREDITS`](CREDITS)，以及门户的[许可证](https://silo.pgsty.com/zh/about/license/)、[署名归属](https://silo.pgsty.com/zh/about/attribution/)与[商标政策](https://silo.pgsty.com/zh/about/trademark/)页面 | +## 相关项目 + +| 仓库 | 说明 | +| :-- | :-- | +| [`pgsty/silo`](https://github.com/pgsty/silo) | Silo 对象存储服务器 —— 本客户端配套的 S3 兼容 MinIO fork | +| [`pgsty/mc`](https://github.com/pgsty/mc) | 本仓库 —— Silo 客户端，以 `mcli` 发行、保留 `mc` 命令名 | +| [`pgsty/silo-console`](https://github.com/pgsty/silo-console) | Silo 服务器的 Web 管理控制台 | +| [`pgsty/silo-pkg`](https://github.com/pgsty/silo-pkg) | 为 Silo 系 fork 维护的共享 Go 包 | +| [`pgsty/pigsty`](https://github.com/pgsty/pigsty) | Pigsty —— 内置 Silo 作为对象存储的 PostgreSQL 发行版 | + ## 维护政策 活跃的 `main` 版本线覆盖： @@ -107,7 +117,7 @@ mcli ls local/demo ```bash docker run --rm pgsty/mc:latest --version -docker run --rm pgsty/mc:latest ls play +docker run --rm pgsty/mc:latest alias ls ``` > [!WARNING]