summaryrefslogtreecommitdiffstats
path: root/controller-server/src/main/resources
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-09 15:22:53 +0200
commit3588ab015c45e5e8682e9a9299cabec25937d9d8 (patch)
tree4911645bf82062d85402ba2329358914733e812e /controller-server/src/main/resources
parent257bfcde6220c40e7ceab46d1f5b5ab8c5e650a0 (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')
-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..172d5851dde 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 \ No newline at end of file