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

Merge branch 'main' into limits-classes

Browse Source
This commit is contained in:
Michael Quigley 2024-06-11 12:00:27 -04:00
commit 186393526d
No known key found for this signature in database
GPG Key ID: 9B60314A9DD20A62
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -6,6 +6,8 @@ FEATURE: New "limits classes" limits implementation (https://github.com/openziti
FIX: Correct the syntax for the Docker and Linux zrok-share "frontdoor" service that broke OAuth email address pattern matching FIX: Correct the syntax for the Docker and Linux zrok-share "frontdoor" service that broke OAuth email address pattern matching
CHANGE: log messages that said "backend proxy endpoint" were clarified to say "backend target"
## v0.4.30 ## v0.4.30
FIX: Fix to the Node.js release process to properly support releasing on a tag. FIX: Fix to the Node.js release process to properly support releasing on a tag.

6
cmd/zrok/shareReserved.go
View File

@ -105,13 +105,13 @@ func (cmd *shareReservedCommand) run(_ *cobra.Command, args []string) {
} }
if _, err := zrok.Share.UpdateShare(upReq, auth); err != nil { if _, err := zrok.Share.UpdateShare(upReq, auth); err != nil {
if !panicInstead { if !panicInstead {
tui.Error("unable to update backend proxy endpoint", err) tui.Error("unable to update backend target", err)
} }
panic(err) panic(err)
} }
logrus.Infof("updated backend proxy endpoint to: %v", target) logrus.Infof("updated backend target to: %v", target)
} else { } else {
logrus.Infof("using existing backend proxy endpoint: %v", target) logrus.Infof("using existing backend target: %v", target)
} }
} }

2
docs/guides/drives/cli.md
View File

@ -290,7 +290,7 @@ $ zrok reserve private -b drive --unique-name mydrive /tmp/junk
[ 0.315] INFO main.(*reserveCommand).run: your reserved share token is 'mydrive' [ 0.315] INFO main.(*reserveCommand).run: your reserved share token is 'mydrive'
$ zrok share reserved --headless mydrive $ zrok share reserved --headless mydrive
[ 0.289] INFO main.(*shareReservedCommand).run: sharing target: '/tmp/junk' [ 0.289] INFO main.(*shareReservedCommand).run: sharing target: '/tmp/junk'
[ 0.289] INFO main.(*shareReservedCommand).run: using existing backend proxy endpoint: /tmp/junk [ 0.289] INFO main.(*shareReservedCommand).run: using existing backend target: /tmp/junk
[ 0.767] INFO sdk-golang/ziti.(*listenerManager).createSessionWithBackoff: {session token=[d519a436-9fb5-4207-afd5-7cbc28fb779a]} new service session [ 0.767] INFO sdk-golang/ziti.(*listenerManager).createSessionWithBackoff: {session token=[d519a436-9fb5-4207-afd5-7cbc28fb779a]} new service session
[ 0.927] INFO main.(*shareReservedCommand).run: use this command to access your zrok share: 'zrok access private mydrive' [ 0.927] INFO main.(*shareReservedCommand).run: use this command to access your zrok share: 'zrok access private mydrive'
``` ```

2
docs/guides/vpn/vpn.md
View File

@ -53,7 +53,7 @@ eugene@hermes $ zrok reserve private -b vpn
eugene@hermes $ sudo -E zrok share reserved k77y2cl7jmjl --headless eugene@hermes $ sudo -E zrok share reserved k77y2cl7jmjl --headless
[ 0.211] INFO main.(*shareReservedCommand).run: sharing target: '10.122.0.1/16' [ 0.211] INFO main.(*shareReservedCommand).run: sharing target: '10.122.0.1/16'
[ 0.211] INFO main.(*shareReservedCommand).run: using existing backend proxy endpoint: 10.122.0.1/16 [ 0.211] INFO main.(*shareReservedCommand).run: using existing backend target: 10.122.0.1/16
[ 0.463] INFO sdk-golang/ziti.(*listenerManager).createSessionWithBackoff: {session token=[22c5708d-e2f2-41aa-a507-454055f8bfcc]} new service session [ 0.463] INFO sdk-golang/ziti.(*listenerManager).createSessionWithBackoff: {session token=[22c5708d-e2f2-41aa-a507-454055f8bfcc]} new service session
[ 0.641] INFO main.(*shareReservedCommand).run: use this command to access your zrok share: 'zrok access private k77y2cl7jmjl' [ 0.641] INFO main.(*shareReservedCommand).run: use this command to access your zrok share: 'zrok access private k77y2cl7jmjl'
[ [