diff --git a/agent/config/builder.go b/agent/config/builder.go index 472f8fa7a3..d39fe4fbdd 100644 --- a/agent/config/builder.go +++ b/agent/config/builder.go @@ -893,7 +893,7 @@ func (b *Builder) Build() (rt RuntimeConfig, err error) { TaggedAddresses: c.TaggedAddresses, TranslateWANAddrs: b.boolVal(c.TranslateWANAddrs), UIDir: b.stringVal(c.UIDir), - UIContentPath: UIPathBuilder(b.stringVal(b.Flags.Config.UIContentPath)), + UIContentPath: UIPathBuilder(b.stringVal(c.UIContentPath)), UnixSocketGroup: b.stringVal(c.UnixSocket.Group), UnixSocketMode: b.stringVal(c.UnixSocket.Mode), UnixSocketUser: b.stringVal(c.UnixSocket.User), diff --git a/agent/config/runtime_test.go b/agent/config/runtime_test.go index a6109d8c2a..6de90a6224 100644 --- a/agent/config/runtime_test.go +++ b/agent/config/runtime_test.go @@ -4049,6 +4049,7 @@ func TestFullConfig(t *testing.T) { "translate_wan_addrs": true, "ui": true, "ui_dir": "11IFzAUn", + "ui_content_path": "consul", "unix_sockets": { "group": "8pFodrV8", "mode": "E8sAwOv4", @@ -4647,6 +4648,7 @@ func TestFullConfig(t *testing.T) { translate_wan_addrs = true ui = true ui_dir = "11IFzAUn" + ui_content_path = "consul" unix_sockets = { group = "8pFodrV8" mode = "E8sAwOv4" @@ -5340,7 +5342,7 @@ func TestFullConfig(t *testing.T) { "wan": "78.63.37.19", }, TranslateWANAddrs: true, - UIContentPath: "/ui/", + UIContentPath: "/consul/", UIDir: "11IFzAUn", UnixSocketUser: "E0nB1DwA", UnixSocketGroup: "8pFodrV8", @@ -5964,8 +5966,8 @@ func TestSanitize(t *testing.T) { "StatsiteAddr": "" }, "TranslateWANAddrs": false, - "UIContentPath": "", "UIDir": "", + "UIContentPath": "", "UnixSocketGroup": "", "UnixSocketMode": "", "UnixSocketUser": "",