summaryrefslogtreecommitdiffstats
path: root/controller-server/src/main/resources/configdefinitions
diff options
context:
space:
mode:
authorBjørn Christian Seime <bjorncs@oath.com>2018-07-09 15:13:33 +0200
committerBjørn Christian Seime <bjorncs@oath.com>2018-07-25 16:26:59 +0200
commit3a9d916073fa1f90610fdc219d3214b0fb3b2223 (patch)
treeeec66c2e98653224d029d13a11efab9c1de4ac9f /controller-server/src/main/resources/configdefinitions
parent7ffbc291ea4623c7877628fa0bc3274b7232cadd (diff)
Move NTokenValidator to vespa-athenz + load pub keys from file
- Move NTokenValidator from controller-server to vespa-athenz - Remodel ZmsKeystore as AthenzTruststore - Use file-backed truststore on controller (replaces download of public keys) - Remove ZmsClient.getPublicKey/getPublicKeys
Diffstat (limited to 'controller-server/src/main/resources/configdefinitions')
-rw-r--r--controller-server/src/main/resources/configdefinitions/athenz.def3
1 files changed, 3 insertions, 0 deletions
diff --git a/controller-server/src/main/resources/configdefinitions/athenz.def b/controller-server/src/main/resources/configdefinitions/athenz.def
index f8d65c25e47..8026c0d7f44 100644
--- a/controller-server/src/main/resources/configdefinitions/athenz.def
+++ b/controller-server/src/main/resources/configdefinitions/athenz.def
@@ -42,3 +42,6 @@ service.privateKeySecretName string
# Expiry of service principal token and certificate
service.credentialsExpiryMinutes int default=43200 # 30 days
+
+# Path to athenz.conf file
+athenzConfFile string