From b55880a0f958498e9030cf7bed75958c7785f5fc Mon Sep 17 00:00:00 2001 From: Adam W Zheng Date: Fri, 8 Sep 2017 10:51:43 -0500 Subject: [PATCH 1/2] Fix syntax with ldap.conf from OPENLDAP_TLS_REQCERT value --- 1.14.15/install-simplesamlphp.sh | 4 ++-- 1.14.16/install-simplesamlphp.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/1.14.15/install-simplesamlphp.sh b/1.14.15/install-simplesamlphp.sh index 6420200..cf7ed59 100644 --- a/1.14.15/install-simplesamlphp.sh +++ b/1.14.15/install-simplesamlphp.sh @@ -46,7 +46,7 @@ CONFIG_THEMEUSE=${CONFIG_THEMEUSE:=default} CONFIG_STORETYPE=${CONFIG_STORETYPE:=phpsession} WWW_INDEX=${WWW_INDEX:=core/frontpage_welcome.php} -OPENLDAP_TLS_REQCERT=${OPENLDAP_TLS_REQCERT:=demand} +echo -e "TLS_REQCERT\t$OPENLDAP_TLS_REQCERT" >> /etc/openldap/ldap.conf if [ "$DOCKER_REDIRECTLOGS" = "true" ]; then echo "[$0] DOCKER_REDIRECTLOGS was set to 'true', so setting CONFIG_LOGGINGHANDLER to 'file'" @@ -273,7 +273,7 @@ if [ "$CONFIG_STORETYPE" == "memcache" ]; then fi fi -chown php-fpm:php-fpm /var/simplesamlphp/log +chown php-fpm:php-fpm /var/simplesamlphp/log/ touch /var/simplesamlphp/config/.dockersetupdone diff --git a/1.14.16/install-simplesamlphp.sh b/1.14.16/install-simplesamlphp.sh index 6420200..89caad5 100644 --- a/1.14.16/install-simplesamlphp.sh +++ b/1.14.16/install-simplesamlphp.sh @@ -207,7 +207,7 @@ if ! [ $? -ne 0 ]; then fi #Apply server certificate check in a TLS session -echo "TLS_REQCERT=$OPENLDAP_TLS_REQCERT" >> /etc/openldap/ldap.conf +echo -e "TLS_REQCERT\t$OPENLDAP_TLS_REQCERT" >> /etc/openldap/ldap.conf #Configure SimpleSAMLphp from runtime variables. @@ -273,7 +273,7 @@ if [ "$CONFIG_STORETYPE" == "memcache" ]; then fi fi -chown php-fpm:php-fpm /var/simplesamlphp/log +chown php-fpm:php-fpm /var/simplesamlphp/log/ touch /var/simplesamlphp/config/.dockersetupdone From c0ddbf0d423b76845ab59dc5e1ccb12f63f6aab4 Mon Sep 17 00:00:00 2001 From: Adam W Zheng Date: Fri, 8 Sep 2017 11:06:48 -0500 Subject: [PATCH 2/2] Fix syntax with ldap.conf from OPENLDAP_TLS_REQCERT value --- 1.14.15/install-simplesamlphp.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/1.14.15/install-simplesamlphp.sh b/1.14.15/install-simplesamlphp.sh index cf7ed59..89caad5 100644 --- a/1.14.15/install-simplesamlphp.sh +++ b/1.14.15/install-simplesamlphp.sh @@ -46,7 +46,7 @@ CONFIG_THEMEUSE=${CONFIG_THEMEUSE:=default} CONFIG_STORETYPE=${CONFIG_STORETYPE:=phpsession} WWW_INDEX=${WWW_INDEX:=core/frontpage_welcome.php} -echo -e "TLS_REQCERT\t$OPENLDAP_TLS_REQCERT" >> /etc/openldap/ldap.conf +OPENLDAP_TLS_REQCERT=${OPENLDAP_TLS_REQCERT:=demand} if [ "$DOCKER_REDIRECTLOGS" = "true" ]; then echo "[$0] DOCKER_REDIRECTLOGS was set to 'true', so setting CONFIG_LOGGINGHANDLER to 'file'" @@ -207,7 +207,7 @@ if ! [ $? -ne 0 ]; then fi #Apply server certificate check in a TLS session -echo "TLS_REQCERT=$OPENLDAP_TLS_REQCERT" >> /etc/openldap/ldap.conf +echo -e "TLS_REQCERT\t$OPENLDAP_TLS_REQCERT" >> /etc/openldap/ldap.conf #Configure SimpleSAMLphp from runtime variables.