fix: Ensure PostgreSQL uses default port 5432

Author: kamildevtactics

lib/travis/build/bash/travis_setup_postgresql.bash

@@ -1,9 +1,9 @@
 travis_setup_postgresql() {
-  local port start_cmd stop_cmd
+  local port=5432 start_cmd stop_cmd
   local version="${1}"
 
-  if [[ -z "${version}" ]]; then
-    case "${TRAVIS_DIST}" in
+if [[ -z "${version}" ]]; then
+  case "${TRAVIS_DIST}" in
     precise)
       version='9.1'
       ;;
@@ -27,39 +27,60 @@ travis_setup_postgresql() {
       ;;
     *)
       echo -e "${ANSI_RED}Unrecognized operating system.${ANSI_CLEAR}"
+      return 1
       ;;
-    esac
-  fi
+  esac
+fi
 
-  echo -e "${ANSI_YELLOW}Starting PostgreSQL v${version}${ANSI_CLEAR}"
-  export PATH="/usr/lib/postgresql/${version}/bin:$PATH"
+echo -e "${ANSI_YELLOW}Starting PostgreSQL v${version}${ANSI_CLEAR}"
+export PATH="/usr/lib/postgresql/${version}/bin:$PATH"
 
-  if [[ "${TRAVIS_INIT}" == upstart ]]; then
-    start_cmd="sudo service postgresql start ${version}"
-    stop_cmd="sudo service postgresql stop"
-  elif [[ "${TRAVIS_INIT}" == systemd ]]; then
-    start_cmd="sudo systemctl start postgresql@${version}-main"
-    stop_cmd="sudo systemctl stop postgresql"
-  fi
+if [[ "${TRAVIS_INIT}" == upstart ]]; then
+  start_cmd="sudo service postgresql start ${version}"
+  stop_cmd="sudo service postgresql stop"
+elif [[ "${TRAVIS_INIT}" == systemd ]]; then
+  start_cmd="sudo systemctl start postgresql@${version}-main"
+  stop_cmd="sudo systemctl stop postgresql"
+else
+  echo "Unsupported TRAVIS_INIT: ${TRAVIS_INIT}"
+  return 1
+fi
+
+${stop_cmd}
 
-  ${stop_cmd}
+# Jeśli klaster istnieje, usuń go (bez opcji --force, która generowała błąd)
+if sudo pg_lsclusters | grep -q "^${version}[[:space:]]\+main"; then
+  echo "Dropping existing PostgreSQL cluster ${version}/main"
+  sudo pg_dropcluster --stop "${version}" main || true
+fi
 
-  sudo pg_createcluster ${version} main
+sudo pg_createcluster "${version}" main
 
-  sudo bash -c "
-	if [[ -d /var/ramfs && ! -d \"/var/ramfs/postgresql/${version}\" ]]; then
+sudo sed -i "s/^port = .*/port = ${port}/" "/etc/postgresql/${version}/main/postgresql.conf"
+
+for existing_version in $(pg_lsclusters | grep "${port}" | awk '{print $1}'); do
+  if [ "${existing_version}" != "${version}" ]; then
+    sudo pg_ctlcluster "${existing_version}" main stop || true
+  fi
+done
+
+sudo bash -c "
+  if [[ -d /var/ramfs && ! -d \"/var/ramfs/postgresql/${version}\" ]]; then
     mkdir -p /var/ramfs/postgresql
-	  cp -rp \"/var/lib/postgresql/${version}\" \"/var/ramfs/postgresql/${version}\"
-	fi
-  " &>/dev/null
+    cp -rp \"/var/lib/postgresql/${version}\" \"/var/ramfs/postgresql/${version}\"
+  fi
+" &>/dev/null
+
+sudo sed -i "s/^local.*postgres.*peer$/local   all             postgres                                trust/" "/etc/postgresql/${version}/main/pg_hba.conf"
+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"
+
+${start_cmd}
+echo "${start_cmd}"
 
-  ${start_cmd}
-  echo "${start_cmd}"
+sleep 2
 
-  pushd / &>/dev/null || true
-  for port in 5432 5433; do
-    sudo -u postgres createuser -s -p "${port}" travis
-    sudo -u postgres createdb -O travis -p "${port}" travis
-  done &>/dev/null
-  popd &>/dev/null || true
+pushd / &>/dev/null || true
+sudo -u postgres createuser -s -p "${port}" travis
+sudo -u postgres createdb -O travis -p "${port}" travis
+popd &>/dev/null || true
 }