extern/zrok
1
1
Fork 0
mirror of https://github.com/openziti/zrok.git synced 2024-12-01 04:23:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

quickstart polish

Browse Source
This commit is contained in:
Michael Quigley 2022-12-07 12:01:56 -05:00
parent 4b7c1d3b51
commit f12868c116
No known key found for this signature in database
GPG Key ID: 9B60314A9DD20A62
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
controller/bootstrap.go
View File

@ -33,13 +33,16 @@ func Bootstrap(skipCtrl, skipFrontend bool, inCfg *Config) error {
return errors.Wrap(err, "error opening store") return errors.Wrap(err, "error opening store")
} }
logrus.Info("connecting to the ziti edge management api")
edge, err := edgeClient() edge, err := edgeClient()
if err != nil { if err != nil {
return err return errors.Wrap(err, "error connecting to the ziti edge management api")
} }
var ctrlZId string var ctrlZId string
if !skipCtrl { if !skipCtrl {
logrus.Info("creating identity for controller ziti access")
if ctrlZId, err = getIdentityId("ctrl"); err == nil { if ctrlZId, err = getIdentityId("ctrl"); err == nil {
logrus.Infof("controller identity: %v", ctrlZId) logrus.Infof("controller identity: %v", ctrlZId)
} else { } else {
@ -58,6 +61,8 @@ func Bootstrap(skipCtrl, skipFrontend bool, inCfg *Config) error {
var frontendZId string var frontendZId string
if !skipFrontend { if !skipFrontend {
logrus.Info("creating identity for frontend ziti access")
if frontendZId, err = getIdentityId("frontend"); err == nil { if frontendZId, err = getIdentityId("frontend"); err == nil {
logrus.Infof("frontend identity: %v", frontendZId) logrus.Infof("frontend identity: %v", frontendZId)
} else { } else {
@ -80,7 +85,7 @@ func Bootstrap(skipCtrl, skipFrontend bool, inCfg *Config) error {
defer func() { _ = tx.Rollback() }() defer func() { _ = tx.Rollback() }()
publicFe, err := str.FindFrontendWithZId(frontendZId, tx) publicFe, err := str.FindFrontendWithZId(frontendZId, tx)
if err != nil { if err != nil {
logrus.Warnf("missing public frontend for ziti id '%v'; please use 'zrok admin create frontend' to create a frontend instance", frontendZId) logrus.Warnf("missing public frontend for ziti id '%v'; please use 'zrok admin create frontend %v public https://{svcToken}.your.dns.name' to create a frontend instance", frontendZId, frontendZId)
} else { } else {
if publicFe.PublicName != nil && publicFe.UrlTemplate != nil { if publicFe.PublicName != nil && publicFe.UrlTemplate != nil {
logrus.Infof("found public frontend entry '%v' (%v) for ziti identity '%v'", *publicFe.PublicName, publicFe.Token, frontendZId) logrus.Infof("found public frontend entry '%v' (%v) for ziti identity '%v'", *publicFe.PublicName, publicFe.Token, frontendZId)

11
etc/ctrl.yml
View File

@ -10,20 +10,15 @@ endpoint:
host: 0.0.0.0 host: 0.0.0.0
port: 18080 port: 18080
proxy:
url_template: "https://{svcToken}.in.zrok.io/"
identities:
- "e6gMfeD4y"
email: email:
host: smtp.email.us-ashburn-1.oci.oraclecloud.com host: smtp.server.com
port: 587 port: 587
username: "" username: ""
password: "" password: ""
registration: registration:
email_from: ziggy@zrok.io email_from: ziggy@server.com
registration_url_template: https://api.zrok.io/register registration_url_template: https://zrok.server.com/register
store: store:
path: "host=127.0.0.1 user=zrok password=zrok dbname=zrok" path: "host=127.0.0.1 user=zrok password=zrok dbname=zrok"