diff options
author | bjormel <bjormel@yahooinc.com> | 2023-10-26 13:59:28 +0000 |
---|---|---|
committer | bjormel <bjormel@yahooinc.com> | 2023-10-26 13:59:28 +0000 |
commit | 567be9a1f6353cec41c23bfd1fcd46b4b2a4d2d7 (patch) | |
tree | 4664a743e166a5e11aee7b9acd70ad8ee2617612 /vespa-athenz/src/main/resources/configdefinitions/vespa.athenz.identity.sia-provider.def | |
parent | e9058b555d4dfea2f6c872d9a677e8678b569569 (diff) | |
parent | bce3b8e926bf9da880172acbe1ba4b12d5e026d6 (diff) |
Merge branch 'master' into bjormel/aws-main-controllerbjormel/aws-main-controller
Diffstat (limited to 'vespa-athenz/src/main/resources/configdefinitions/vespa.athenz.identity.sia-provider.def')
-rw-r--r-- | vespa-athenz/src/main/resources/configdefinitions/vespa.athenz.identity.sia-provider.def | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vespa-athenz/src/main/resources/configdefinitions/vespa.athenz.identity.sia-provider.def b/vespa-athenz/src/main/resources/configdefinitions/vespa.athenz.identity.sia-provider.def index de3757ed20f..b97b5b7859f 100644 --- a/vespa-athenz/src/main/resources/configdefinitions/vespa.athenz.identity.sia-provider.def +++ b/vespa-athenz/src/main/resources/configdefinitions/vespa.athenz.identity.sia-provider.def @@ -1,4 +1,4 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. namespace=vespa.athenz.identity athenzDomain string @@ -6,4 +6,4 @@ athenzService string keyPathPrefix string trustStorePath string trustStoreType enum {pem, jks} default=jks -athenzTruststorePath string default="/opt/yahoo/share/ssl/certs/athenz_certificate_bundle.pem"
\ No newline at end of file +athenzTruststorePath string default="/opt/yahoo/share/ssl/certs/athenz_certificate_bundle.pem" |