Revert "Fix syntax with ldap.conf from OPENLDAP_TLS_REQCERT value"

This commit is contained in:
Adam Zheng 2017-09-08 11:03:38 -05:00 committed by GitHub
parent 9a80389c84
commit 44f74c3341
2 changed files with 4 additions and 4 deletions

View File

@ -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'"
@ -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

View File

@ -207,7 +207,7 @@ if ! [ $? -ne 0 ]; then
fi
#Apply server certificate check in a TLS session
echo -e "TLS_REQCERT\t$OPENLDAP_TLS_REQCERT" >> /etc/openldap/ldap.conf
echo "TLS_REQCERT=$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