diff --git a/command/agent/command.go b/command/agent/command.go index d88eb56da..18d620678 100644 --- a/command/agent/command.go +++ b/command/agent/command.go @@ -69,6 +69,7 @@ func (c *Command) readConfig() *Config { Ports: &Ports{}, Server: &ServerConfig{}, Vault: &config.VaultConfig{}, + ACL: &ACLConfig{}, } flags := flag.NewFlagSet("agent", flag.ContinueOnError) @@ -166,6 +167,10 @@ func (c *Command) readConfig() *Config { }), "vault-tls-skip-verify", "") flags.StringVar(&cmdConfig.Vault.TLSServerName, "vault-tls-server-name", "", "") + // ACL options + flags.BoolVar(&cmdConfig.ACL.Enabled, "acl-enabled", false, "") + flags.StringVar(&cmdConfig.ACL.ReplicationToken, "acl-replication-token", "", "") + if err := flags.Parse(c.args); err != nil { return nil } @@ -984,6 +989,16 @@ Client Options: The default speed for network interfaces in MBits if the link speed can not be determined dynamically. +ACL Options: + + -acl-enabled + Specifies whether the agent should enable ACLs. + + -acl-replication-token + The replication token for servers to use when replicating from the + authoratative region. The token must be a valid management token from the + authoratative region. + Consul Options: -consul-address= diff --git a/website/source/docs/commands/agent.html.md.erb b/website/source/docs/commands/agent.html.md.erb index 8552cd07e..9055b68a9 100644 --- a/website/source/docs/commands/agent.html.md.erb +++ b/website/source/docs/commands/agent.html.md.erb @@ -24,6 +24,8 @@ via CLI arguments. The `agent` command accepts the following arguments: * `-alloc-dir=`: Equivalent to the Client [alloc_dir](#alloc_dir) config option. +* `-acl-enabled`: Equivalent to the ACL [enabled](/docs/agent/configuration/acl.html#enabled) config option. +* `-acl-replication-token`: Equivalent to the ACL [replication_token](/docs/agent/configuration/acl.html#replication_token) config option. * `-bind=
`: Equivalent to the [bind_addr](#bind_addr) config option. * `-bootstrap-expect=`: Equivalent to the [bootstrap_expect](#bootstrap_expect) config option.