Skip to content

Commit

Permalink
Merge pull request postgis#2 from elcodedocle/imatia
Browse files Browse the repository at this point in the history
fix ssl conf
  • Loading branch information
elcodedocle committed Jun 16, 2016
2 parents bd1d0e1 + e883c06 commit 3f7560b
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion 9.1-2.2/initdb-postgis.sh
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ echo "port = 5432" >> $PG_CONF_DIR/$PG_CONF

# Enable ssl on postgres != 9.1
if [ "$POSTGRES_MAJOR" != '9.1' ]; then
echo "ssl = true" >> $PG_CONF
echo "ssl = true" >> $PG_CONF_DIR/$PG_CONF
echo "ssl_cert_file = '/etc/ssl/certs/ssl-cert-snakeoil.pem'" >> $PG_CONF_DIR/$PG_CONF
echo "ssl_key_file = '/etc/ssl/private/ssl-cert-snakeoil.key'" >> $PG_CONF_DIR/$PG_CONF
fi
2 changes: 1 addition & 1 deletion 9.2-2.2/initdb-postgis.sh
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ echo "port = 5432" >> $PG_CONF_DIR/$PG_CONF

# Enable ssl on postgres != 9.1
if [ "$POSTGRES_MAJOR" != '9.1' ]; then
echo "ssl = true" >> $PG_CONF
echo "ssl = true" >> $PG_CONF_DIR/$PG_CONF
echo "ssl_cert_file = '/etc/ssl/certs/ssl-cert-snakeoil.pem'" >> $PG_CONF_DIR/$PG_CONF
echo "ssl_key_file = '/etc/ssl/private/ssl-cert-snakeoil.key'" >> $PG_CONF_DIR/$PG_CONF
fi
2 changes: 1 addition & 1 deletion 9.3-2.2/initdb-postgis.sh
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ echo "port = 5432" >> $PG_CONF_DIR/$PG_CONF

# Enable ssl on postgres != 9.1
if [ "$POSTGRES_MAJOR" != '9.1' ]; then
echo "ssl = true" >> $PG_CONF
echo "ssl = true" >> $PG_CONF_DIR/$PG_CONF
echo "ssl_cert_file = '/etc/ssl/certs/ssl-cert-snakeoil.pem'" >> $PG_CONF_DIR/$PG_CONF
echo "ssl_key_file = '/etc/ssl/private/ssl-cert-snakeoil.key'" >> $PG_CONF_DIR/$PG_CONF
fi
2 changes: 1 addition & 1 deletion 9.4-2.2/initdb-postgis.sh
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ echo "port = 5432" >> $PG_CONF_DIR/$PG_CONF

# Enable ssl on postgres != 9.1
if [ "$POSTGRES_MAJOR" != '9.1' ]; then
echo "ssl = true" >> $PG_CONF
echo "ssl = true" >> $PG_CONF_DIR/$PG_CONF
echo "ssl_cert_file = '/etc/ssl/certs/ssl-cert-snakeoil.pem'" >> $PG_CONF_DIR/$PG_CONF
echo "ssl_key_file = '/etc/ssl/private/ssl-cert-snakeoil.key'" >> $PG_CONF_DIR/$PG_CONF
fi
2 changes: 1 addition & 1 deletion 9.5-2.2/initdb-postgis.sh
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ echo "port = 5432" >> $PG_CONF_DIR/$PG_CONF

# Enable ssl on postgres != 9.1
if [ "$POSTGRES_MAJOR" != '9.1' ]; then
echo "ssl = true" >> $PG_CONF
echo "ssl = true" >> $PG_CONF_DIR/$PG_CONF
echo "ssl_cert_file = '/etc/ssl/certs/ssl-cert-snakeoil.pem'" >> $PG_CONF_DIR/$PG_CONF
echo "ssl_key_file = '/etc/ssl/private/ssl-cert-snakeoil.key'" >> $PG_CONF_DIR/$PG_CONF
fi
2 changes: 1 addition & 1 deletion initdb-postgis.sh
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ echo "port = 5432" >> $PG_CONF_DIR/$PG_CONF

# Enable ssl on postgres != 9.1
if [ "$POSTGRES_MAJOR" != '9.1' ]; then
echo "ssl = true" >> $PG_CONF
echo "ssl = true" >> $PG_CONF_DIR/$PG_CONF
echo "ssl_cert_file = '/etc/ssl/certs/ssl-cert-snakeoil.pem'" >> $PG_CONF_DIR/$PG_CONF
echo "ssl_key_file = '/etc/ssl/private/ssl-cert-snakeoil.key'" >> $PG_CONF_DIR/$PG_CONF
fi

0 comments on commit 3f7560b

Please sign in to comment.