Merge branch 'main' into plugin-hostcatalogs

This commit is contained in:
Jeff Mitchell committed 2021-10-14 12:14:07 -04:00
commit f01a8060a0
7 files changed
+19 -19

No files matched your search

+5 -5
View File
@@ -67,7 +67,7 @@ type Command struct {
flagWorkerAuthKey string
flagWorkerProxyListenAddr string
flagWorkerPublicAddr string
flagPassthroughDirectory string
flagUiPassthroughDir string
flagRecoveryKey string
flagDatabaseUrl string
flagContainerImage string
@@ -253,9 +253,9 @@ func (c *Command) Flags() *base.FlagSets {
})
f.StringVar(&base.StringVar{
Name: "passthrough-directory",
Target: &c.flagPassthroughDirectory,
EnvVar: "BOUNDARY_DEV_PASSTHROUGH_DIRECTORY",
Name: "ui-passthrough-dir",
Target: &c.flagUiPassthroughDir,
EnvVar: "BOUNDARY_DEV_UI_PASSTHROUGH_DIR",
Usage: "Enables a passthrough directory in the webserver at /",
})
@@ -420,7 +420,7 @@ func (c *Command) Run(args []string) int {
c.DevTargetSessionConnectionLimit = c.flagTargetSessionConnectionLimit
c.DevHostAddress = host
c.Config.PassthroughDirectory = c.flagPassthroughDirectory
c.Config.DevUiPassthroughDir = c.flagUiPassthroughDir
for _, l := range c.Config.Listeners {
if len(l.Purpose) != 1 {
+5 -5
View File
@@ -97,11 +97,11 @@ type Config struct {
Controller *Controller `hcl:"controller"`
// Dev-related options
DevController bool `hcl:"-"`
PassthroughDirectory string `hcl:"-"`
DevControllerKey string `hcl:"-"`
DevWorkerAuthKey string `hcl:"-"`
DevRecoveryKey string `hcl:"-"`
DevController bool `hcl:"-"`
DevUiPassthroughDir string `hcl:"-"`
DevControllerKey string `hcl:"-"`
DevWorkerAuthKey string `hcl:"-"`
DevRecoveryKey string `hcl:"-"`
// Eventing configuration for the controller
Eventing *event.EventerConfig `hcl:"events"`