diff options
| author | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2020-03-17 16:08:29 +0100 |
|---|---|---|
| committer | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2020-03-17 16:11:36 +0100 |
| commit | 2ae2b42dc0c323e8965918078bee538f746cdf31 (patch) | |
| tree | 2a486fdbbd527f3cef6bd47a4d7f85f82c7a58b6 /config-model/src/main/resources | |
| parent | 8c4c00e79390ce4d670ed1482e6f777e5c86461f (diff) | |
Prefer Athenz domain from deploy properties
Only use domain from 'access-control' if domain is not provided by
deploy properties. Make 'domain' in 'access-control' optional.
Diffstat (limited to 'config-model/src/main/resources')
| -rw-r--r-- | config-model/src/main/resources/schema/container.rnc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/config-model/src/main/resources/schema/container.rnc b/config-model/src/main/resources/schema/container.rnc index b9cb5e1fae6..034de1113c2 100644 --- a/config-model/src/main/resources/schema/container.rnc +++ b/config-model/src/main/resources/schema/container.rnc @@ -23,9 +23,9 @@ Server = element server { } AccessControl = element access-control { - attribute domain { xsd:NCName } & - attribute read { string "true" | string "false" }? & - attribute write { string "true" | string "false" }? & + attribute domain { xsd:NCName }? & # TODO Vespa 8 Remove + attribute read { string "true" | string "false" }? & # TODO Vespa 8 Remove + attribute write { string "true" | string "false" }? & # TODO Vespa 8 Remove element vespa-domain { xsd:NCName }? & # TODO Remove after end of March 2020 element exclude { Binding+ |