JakeHillion/storj
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

uplink, satellite: use bgp hostnames

Browse Source 
Change-Id: I58f5011d3019f8267fa8cbd3096b2cfe42eb5f8b
This commit is contained in:
JT Olio 2022-05-16 10:04:25 -06:00 committed by Stefan Benten
parent bfad64a6f0
commit 5fb9ee3cfa
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/uplink/cmd_access_register.go
View File

@ -27,7 +27,7 @@ func newCmdAccessRegister(ex ulext.External) *cmdAccessRegister {
} }
func (c *cmdAccessRegister) Setup(params clingy.Parameters) { func (c *cmdAccessRegister) Setup(params clingy.Parameters) {
c.authService = params.Flag("auth-service", "The address to the service you wish to register your access with", "auth.us1.storjshare.io:7777").(string) c.authService = params.Flag("auth-service", "The address to the service you wish to register your access with", "auth.storjshare.io:7777").(string)
c.caCert = params.Flag("ca-cert", "path to a file in PEM format with certificate(s) or certificate chain(s) to validate the auth service against", "").(string) c.caCert = params.Flag("ca-cert", "path to a file in PEM format with certificate(s) or certificate chain(s) to validate the auth service against", "").(string)
c.public = params.Flag("public", "If true, the access will be public", false, clingy.Transform(strconv.ParseBool)).(bool) c.public = params.Flag("public", "If true, the access will be public", false, clingy.Transform(strconv.ParseBool)).(bool)
c.format = params.Flag("format", "Format of the output credentials, use 'env' or 'aws' when using in scripts", "").(string) c.format = params.Flag("format", "Format of the output credentials, use 'env' or 'aws' when using in scripts", "").(string)

2
cmd/uplink/cmd_access_setup.go
View File

@ -32,7 +32,7 @@ func newCmdAccessSetup(ex ulext.External) *cmdAccessSetup {
} }
func (c *cmdAccessSetup) Setup(params clingy.Parameters) { func (c *cmdAccessSetup) Setup(params clingy.Parameters) {
c.authService = params.Flag("auth-service", "If generating backwards-compatible S3 Gateway credentials, use this auth service", "https://auth.us1.storjshare.io").(string) c.authService = params.Flag("auth-service", "If generating backwards-compatible S3 Gateway credentials, use this auth service", "https://auth.storjshare.io").(string)
} }
func (c *cmdAccessSetup) Execute(ctx clingy.Context) (err error) { func (c *cmdAccessSetup) Execute(ctx clingy.Context) (err error) {

4
cmd/uplink/cmd_share.go
View File

@ -46,7 +46,7 @@ func (c *cmdShare) Setup(params clingy.Parameters) {
params.Break() params.Break()
c.exportTo = params.Flag("export-to", "Path to export the shared access to", "").(string) c.exportTo = params.Flag("export-to", "Path to export the shared access to", "").(string)
c.baseURL = params.Flag("base-url", "The base url for link sharing", "https://link.us1.storjshare.io").(string) c.baseURL = params.Flag("base-url", "The base url for link sharing", "https://link.storjshare.io").(string)
c.register = params.Flag("register", "If true, creates and registers access grant", false, c.register = params.Flag("register", "If true, creates and registers access grant", false,
clingy.Transform(strconv.ParseBool), clingy.Boolean, clingy.Transform(strconv.ParseBool), clingy.Boolean,
).(bool) ).(bool)
@ -54,7 +54,7 @@ func (c *cmdShare) Setup(params clingy.Parameters) {
clingy.Transform(strconv.ParseBool), clingy.Boolean, clingy.Transform(strconv.ParseBool), clingy.Boolean,
).(bool) ).(bool)
c.dns = params.Flag("dns", "Specify your custom hostname. if set, returns dns settings for web hosting. implies --register and --public", "").(string) c.dns = params.Flag("dns", "Specify your custom hostname. if set, returns dns settings for web hosting. implies --register and --public", "").(string)
c.authService = params.Flag("auth-service", "URL for shared auth service", "https://auth.us1.storjshare.io").(string) c.authService = params.Flag("auth-service", "URL for shared auth service", "https://auth.storjshare.io").(string)
c.public = params.Flag("public", "If true, the access will be public. --dns and --url override this", false, c.public = params.Flag("public", "If true, the access will be public. --dns and --url override this", false,
clingy.Transform(strconv.ParseBool), clingy.Boolean, clingy.Transform(strconv.ParseBool), clingy.Boolean,
).(bool) ).(bool)

4
satellite/console/consoleweb/server.go
View File

@ -81,7 +81,7 @@ type Config struct {
PartneredSatellites SatList `help:"names and addresses of partnered satellites in JSON list format" default:"[[\"US1\",\"https://us1.storj.io\"],[\"EU1\",\"https://eu1.storj.io\"],[\"AP1\",\"https://ap1.storj.io\"]]"` PartneredSatellites SatList `help:"names and addresses of partnered satellites in JSON list format" default:"[[\"US1\",\"https://us1.storj.io\"],[\"EU1\",\"https://eu1.storj.io\"],[\"AP1\",\"https://ap1.storj.io\"]]"`
GeneralRequestURL string `help:"url link to general request page" default:"https://supportdcs.storj.io/hc/en-us/requests/new?ticket_form_id=360000379291"` GeneralRequestURL string `help:"url link to general request page" default:"https://supportdcs.storj.io/hc/en-us/requests/new?ticket_form_id=360000379291"`
ProjectLimitsIncreaseRequestURL string `help:"url link to project limit increase request page" default:"https://supportdcs.storj.io/hc/en-us/requests/new?ticket_form_id=360000683212"` ProjectLimitsIncreaseRequestURL string `help:"url link to project limit increase request page" default:"https://supportdcs.storj.io/hc/en-us/requests/new?ticket_form_id=360000683212"`
GatewayCredentialsRequestURL string `help:"url link for gateway credentials requests" default:"https://auth.us1.storjshare.io" devDefault:""` GatewayCredentialsRequestURL string `help:"url link for gateway credentials requests" default:"https://auth.storjshare.io" devDefault:""`
IsBetaSatellite bool `help:"indicates if satellite is in beta" default:"false"` IsBetaSatellite bool `help:"indicates if satellite is in beta" default:"false"`
BetaSatelliteFeedbackURL string `help:"url link for for beta satellite feedback" default:""` BetaSatelliteFeedbackURL string `help:"url link for for beta satellite feedback" default:""`
BetaSatelliteSupportURL string `help:"url link for for beta satellite support" default:""` BetaSatelliteSupportURL string `help:"url link for for beta satellite support" default:""`
@ -90,7 +90,7 @@ type Config struct {
CouponCodeSignupUIEnabled bool `help:"indicates if user is allowed to add coupon codes to account from signup" default:"false"` CouponCodeSignupUIEnabled bool `help:"indicates if user is allowed to add coupon codes to account from signup" default:"false"`
FileBrowserFlowDisabled bool `help:"indicates if file browser flow is disabled" default:"false"` FileBrowserFlowDisabled bool `help:"indicates if file browser flow is disabled" default:"false"`
CSPEnabled bool `help:"indicates if Content Security Policy is enabled" devDefault:"false" releaseDefault:"true"` CSPEnabled bool `help:"indicates if Content Security Policy is enabled" devDefault:"false" releaseDefault:"true"`
LinksharingURL string `help:"url link for linksharing requests" default:"https://link.us1.storjshare.io" devDefault:""` LinksharingURL string `help:"url link for linksharing requests" default:"https://link.storjshare.io" devDefault:""`
PathwayOverviewEnabled bool `help:"indicates if the overview onboarding step should render with pathways" default:"true"` PathwayOverviewEnabled bool `help:"indicates if the overview onboarding step should render with pathways" default:"true"`
NewProjectDashboard bool `help:"indicates if new project dashboard should be used" default:"false"` NewProjectDashboard bool `help:"indicates if new project dashboard should be used" default:"false"`
NewNavigation bool `help:"indicates if new navigation structure should be rendered" default:"true"` NewNavigation bool `help:"indicates if new navigation structure should be rendered" default:"true"`

4
scripts/testdata/satellite-config.yaml.lock vendored
View File

@ -200,7 +200,7 @@ compensation.withheld-percents: 75,75,75,50,50,50,25,25,25,0,0,0,0,0,0
# console.frame-ancestors: tardigrade.io storj.io # console.frame-ancestors: tardigrade.io storj.io
# url link for gateway credentials requests # url link for gateway credentials requests
# console.gateway-credentials-request-url: https://auth.us1.storjshare.io # console.gateway-credentials-request-url: https://auth.storjshare.io
# url link to general request page # url link to general request page
# console.general-request-url: https://supportdcs.storj.io/hc/en-us/requests/new?ticket_form_id=360000379291 # console.general-request-url: https://supportdcs.storj.io/hc/en-us/requests/new?ticket_form_id=360000379291
@ -230,7 +230,7 @@ compensation.withheld-percents: 75,75,75,50,50,50,25,25,25,0,0,0,0,0,0
# console.let-us-know-url: https://storjlabs.atlassian.net/servicedesk/customer/portals # console.let-us-know-url: https://storjlabs.atlassian.net/servicedesk/customer/portals
# url link for linksharing requests # url link for linksharing requests
# console.linksharing-url: https://link.us1.storjshare.io # console.linksharing-url: https://link.storjshare.io
# number of times user can try to login without penalty # number of times user can try to login without penalty
# console.login-attempts-without-penalty: 3 # console.login-attempts-without-penalty: 3