Merge branch 'hotfix/22.1.1'

CenterForOpenScience · Nov 11, 2022 · d5d4f09 · d5d4f09
2 parents 6b2ace8 + f31122e
commit d5d4f09
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 We follow the CalVer (https://calver.org/) versioning scheme: YY.MINOR.MICRO.
 
+22.1.1 (11-11-2022)
+===================
+
+* Trim config for instn cas clients
+* Sync with public charts
+
 22.1.0 (11-09-2022)
 ===================
 

diff --git a/etc/cas/config/cas.properties b/etc/cas/config/cas.properties
@@ -244,7 +244,6 @@ cas.authn.osf-postgres.non-institution-clients[0]=${cas.authn.pac4j.orcid.client
 # Institution clients
 #
 cas.authn.osf-postgres.institution-clients[0]=${cas.authn.pac4j.cas[0].client-name}
-cas.authn.osf-postgres.institution-clients[1]=${cas.authn.pac4j.cas[1].client-name}
 #
 # Delegation Client: ORCiD
 #
@@ -292,7 +291,6 @@ cas.authn.oauth.access-token.crypto.encryption.key=${OAUTH_JWT_ACCESS_TOKEN_ENCR
 cas.authn.oauth.refresh-token.time-to-kill-in-seconds=7776000
 #
 # Personal access token
-# Note: personal access token never expire, neither using the default properties nor setting them here is effective
 #
 cas.authn.oauth.personal-access-token.time-to-kill-in-seconds=31104000
 cas.authn.oauth.personal-access-token.max-time-to-live-in-seconds=31104000

diff --git a/etc/cas/config/local/cas-local.properties b/etc/cas/config/local/cas-local.properties
@@ -252,7 +252,6 @@ cas.authn.osf-postgres.non-institution-clients[0]=${cas.authn.pac4j.orcid.client
 #
 cas.authn.osf-postgres.institution-clients[0]=${cas.authn.pac4j.cas[0].client-name}
 cas.authn.osf-postgres.institution-clients[1]=${cas.authn.pac4j.cas[1].client-name}
-cas.authn.osf-postgres.institution-clients[2]=${cas.authn.pac4j.cas[2].client-name}
 #
 # Delegation Client: ORCiD
 #