gokrazy/tsapp: revert breakglass access lockdown
Revert the tailscale/breakglass fork and its access-control flags;
not ready to ship yet.
This reverts commit 1d82c1b3d.
Updates #1866
Signed-off-by: Kristoffer Dalby <kristoffer@tailscale.com>
This commit is contained in:
committed by
Kristoffer Dalby
parent
0eb38dc2e5
commit
a19f8f290e
@@ -11,20 +11,16 @@
|
|||||||
],
|
],
|
||||||
"Packages": [
|
"Packages": [
|
||||||
"github.com/gokrazy/serial-busybox",
|
"github.com/gokrazy/serial-busybox",
|
||||||
"github.com/tailscale/breakglass",
|
"github.com/gokrazy/breakglass",
|
||||||
"github.com/bradfitz/qemu-guest-kragent",
|
"github.com/bradfitz/qemu-guest-kragent",
|
||||||
"tailscale.com/cmd/fbstatus",
|
"tailscale.com/cmd/fbstatus",
|
||||||
"tailscale.com/cmd/tailscale",
|
"tailscale.com/cmd/tailscale",
|
||||||
"tailscale.com/cmd/tailscaled"
|
"tailscale.com/cmd/tailscaled"
|
||||||
],
|
],
|
||||||
"PackageConfig": {
|
"PackageConfig": {
|
||||||
"github.com/tailscale/breakglass": {
|
"github.com/gokrazy/breakglass": {
|
||||||
"CommandLineFlags": [
|
"CommandLineFlags": [
|
||||||
"-authorized_keys=ec2",
|
"-authorized_keys=/perm/breakglass.authorized_keys"
|
||||||
"-allowed_user=aws-marketplace-sec-scan",
|
|
||||||
"-allowed_cidrs=10.0.0.0/16,10.2.0.0/16",
|
|
||||||
"-stop_after_idle=120s",
|
|
||||||
"-start_on_boot=true"
|
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"tailscale.com/cmd/tailscale": {
|
"tailscale.com/cmd/tailscale": {
|
||||||
|
|||||||
@@ -7,12 +7,12 @@ package gokrazydeps
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
_ "github.com/bradfitz/qemu-guest-kragent"
|
_ "github.com/bradfitz/qemu-guest-kragent"
|
||||||
|
_ "github.com/gokrazy/breakglass"
|
||||||
_ "github.com/gokrazy/gokrazy/cmd/dhcp"
|
_ "github.com/gokrazy/gokrazy/cmd/dhcp"
|
||||||
_ "github.com/gokrazy/gokrazy/cmd/ntp"
|
_ "github.com/gokrazy/gokrazy/cmd/ntp"
|
||||||
_ "github.com/gokrazy/gokrazy/cmd/randomd"
|
_ "github.com/gokrazy/gokrazy/cmd/randomd"
|
||||||
_ "github.com/gokrazy/kernel.amd64"
|
_ "github.com/gokrazy/kernel.amd64"
|
||||||
_ "github.com/gokrazy/serial-busybox"
|
_ "github.com/gokrazy/serial-busybox"
|
||||||
_ "github.com/tailscale/breakglass"
|
|
||||||
_ "github.com/tailscale/ts-gokrazy/gokrazyinit"
|
_ "github.com/tailscale/ts-gokrazy/gokrazyinit"
|
||||||
_ "tailscale.com/cmd/tailscale"
|
_ "tailscale.com/cmd/tailscale"
|
||||||
_ "tailscale.com/cmd/tailscaled"
|
_ "tailscale.com/cmd/tailscaled"
|
||||||
|
|||||||
Reference in New Issue
Block a user