Skip to content

merge 4.0.1 20200603 #83

Merged
merged 2 commits into from Jun 3, 2020
Merged
Changes from all commits
Commits
File filter...
Filter file types
Jump to…
Jump to file
Failed to load files.

Always

Just for now

@@ -8,9 +8,9 @@ FROM centos:centos7
ENV TOMCAT_MAJOR=9 \
TOMCAT_VERSION=9.0.35 \
##shib-idp \
VERSION=4.0.0 \
VERSION=4.0.1 \
##TIER \
TIERVERSION=20200518 \
TIERVERSION=20200603 \
#################### \
#### OTHER VARS #### \
#################### \
@@ -1,4 +1,4 @@
idp.src.dir=/tmp/shibboleth/shibboleth-identity-provider-4.0.0
idp.src.dir=/tmp/shibboleth/shibboleth-identity-provider-4.0.1
idp.target.dir=/opt/shibboleth-idp
idp.host.name=idp.example.org
idp.sealer.password=changeit
@@ -1,5 +1,9 @@
#!/bin/sh

#set env vars for cron jobs
# this script creates /opt/tier/env.bash which is sourced by the cron jobs' scripts
/opt/tier/setenv.sh

#for passed-in env vars, remove spaces and replace any ; with : in usertoken env var since we will use ; as a delimiter
export USERTOKEN="${USERTOKEN//;/:}"
export USERTOKEN="${USERTOKEN// /}"
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.