Skip to content

Commit 8e5b853

Browse files
fix: Ensure PostgreSQL uses default port 5432
1 parent 434b2f2 commit 8e5b853

File tree

1 file changed

+19
-6
lines changed

1 file changed

+19
-6
lines changed

lib/travis/build/bash/travis_setup_postgresql.bash

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
travis_setup_postgresql() {
2-
local port start_cmd stop_cmd
2+
local port=5432 start_cmd stop_cmd
33
local version="${1}"
44

55
if [[ -z "${version}" ]]; then
@@ -44,7 +44,17 @@ travis_setup_postgresql() {
4444

4545
${stop_cmd}
4646

47-
sudo pg_createcluster ${version} main
47+
sudo pg_dropcluster --stop "${version}" main || true
48+
49+
sudo pg_createcluster "${version}" main
50+
51+
sudo sed -i "s/^port = .*/port = ${port}/" "/etc/postgresql/${version}/main/postgresql.conf"
52+
53+
for existing_version in $(pg_lsclusters | grep "${port}" | awk '{print $1}'); do
54+
if [ "${existing_version}" != "${version}" ]; then
55+
sudo pg_ctlcluster "${existing_version}" main stop || true
56+
fi
57+
done
4858

4959
sudo bash -c "
5060
if [[ -d /var/ramfs && ! -d \"/var/ramfs/postgresql/${version}\" ]]; then
@@ -53,13 +63,16 @@ travis_setup_postgresql() {
5363
fi
5464
" &>/dev/null
5565

66+
sudo sed -i "s/^local.*postgres.*peer$/local all postgres trust/" "/etc/postgresql/${version}/main/pg_hba.conf"
67+
sudo sed -i "s/^host.*all.*all.*127.0.0.1\\/32.*md5$/host all all 127.0.0.1\\/32 trust/" "/etc/postgresql/${version}/main/pg_hba.conf"
68+
5669
${start_cmd}
5770
echo "${start_cmd}"
5871

72+
sleep 2
73+
5974
pushd / &>/dev/null || true
60-
for port in 5432 5433; do
61-
sudo -u postgres createuser -s -p "${port}" travis
62-
sudo -u postgres createdb -O travis -p "${port}" travis
63-
done &>/dev/null
75+
sudo -u postgres createuser -s -p "${port}" travis
76+
sudo -u postgres createdb -O travis -p "${port}" travis
6477
popd &>/dev/null || true
6578
}

0 commit comments

Comments
 (0)