Skip to content

Commit

Permalink
Make the code check a bit happier
Browse files Browse the repository at this point in the history
  • Loading branch information
m-kuhn committed Jun 5, 2019
1 parent 128583e commit 8c39f88
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .ci/travis/linux/docker-compose.travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ services:
context: ../../../tests/testdata
environment:
- ALLOW_IP_RANGE="172.18.0.0/16"
# The following files are added in Dopckerfile-postgis
# The following files are added in Dockerfile-postgis
- SSL_CERT_FILE=/etc/ssl/certs/localhost_ssl_cert.pem
- SSL_KEY_FILE=/etc/ssl/private/localhost_ssl_key.pem
- SSL_CA_FILE=/etc/ssl/certs/chains_subissuer-issuer-root_issuer2-root2.pem
Expand Down
20 changes: 11 additions & 9 deletions tests/testdata/temp/setup-ssl.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,20 +17,22 @@ chown -R postgres /tmp/ssl-copy
rm -r /etc/ssl
mv /tmp/ssl-copy /etc/ssl

# Needed under debian, wasnt needed under ubuntu
# Needed under debian, was not needed under ubuntu
mkdir -p ${PGSTAT_TMP}
chmod 0777 ${PGSTAT_TMP}

{
# moved from setup.sh
echo "ssl = true" >> $CONF
#echo "ssl_ciphers = 'DEFAULT:!LOW:!EXP:!MD5:@STRENGTH' " >> $CONF
#echo "ssl_renegotiation_limit = 512MB " >> $CONF
echo "ssl_cert_file = '${SSL_CERT_FILE}'" >> $CONF
echo "ssl_key_file = '${SSL_KEY_FILE}'" >> $CONF
if [ ! -z "${SSL_CA_FILE}" ]; then
echo "ssl_ca_file = '${SSL_CA_FILE}' # (change requires restart)" >> $CONF
echo "ssl = true"
#echo "ssl_ciphers = 'DEFAULT:!LOW:!EXP:!MD5:@STRENGTH' "
#echo "ssl_renegotiation_limit = 512MB " >>
echo "ssl_cert_file = '${SSL_CERT_FILE}'"
echo "ssl_key_file = '${SSL_KEY_FILE}'"
if [ -n "${SSL_CA_FILE}" ]; then
echo "ssl_ca_file = '${SSL_CA_FILE}' # (change requires restart)"
fi
#echo "ssl_crl_file = ''" >> $CONF
#echo "ssl_crl_file = ''"
} >> $CONF

# Put lock file to make sure conf was not reinitialized
touch ${SETUP_LOCKFILE}

0 comments on commit 8c39f88

Please sign in to comment.