pgpool2.git / summary / log / commit / refs
commit 64e85f8ab64328843f7dd1d465deb842016c2eb8
Author: Yugo Nagata <nagata@sraoss.co.jp>
Date: Tue Jul 23 07:23:42 2013 +0000
Fix to not print netmask to pg_hba.conf if node is specified by hostname
redhat/rpm_installer/install.sh | 26 +++++++++++++++++++-------
1 file changed, 19 insertions(+), 7 deletions(-)
diff --git a/redhat/rpm_installer/install.sh b/redhat/rpm_installer/install.sh
index d38755830..694ae8236 100755
--- a/redhat/rpm_installer/install.sh
+++ b/redhat/rpm_installer/install.sh
@@ -679,6 +679,18 @@ function doConfigPostgres()
# [4] pg_hba.conf
# -------------------------------------------------------------------
+ NODE0_MASK=""
+ NODE1_MASK=""
+
+
+ # If hostname, netmask isn't necessary.
+ if expr "$NODE0_HOST" : "^[0-9]\{1,3\}\.[0-9]\{1,3\}\.[0-9]\{1,3\}\.[0-9]\{1,3\}$" > /dev/null; then
+ NODE0_MASK=$NETMASK
+ fi
+ if expr "$NODE1_HOST" : "^[0-9]\{1,3\}\.[0-9]\{1,3\}\.[0-9]\{1,3\}\.[0-9]\{1,3\}$" > /dev/null; then
+ NODE1_MASK=$NETMASK
+ fi
+
echo
echo "[5/$_STEPS] authorization"
cp templates/pg_hba.conf editted/pg_hba.conf
@@ -689,12 +701,12 @@ function doConfigPostgres()
w
q
EOT
- echo "host replication $PG_SUPER_USER $NODE0_HOST $NETMASK trust" >> editted/pg_hba.conf
- echo "host replication $PG_SUPER_USER $NODE1_HOST $NETMASK trust" >> editted/pg_hba.conf
- echo "host all $PG_SUPER_USER $NODE0_HOST $NETMASK trust" >> editted/pg_hba.conf
- echo "host all $PG_SUPER_USER $NODE1_HOST $NETMASK trust" >> editted/pg_hba.conf
- echo "host all $PG_ADMIN_USER $NODE0_HOST $NETMASK trust" >> editted/pg_hba.conf
- echo "host all $PG_ADMIN_USER $NODE1_HOST $NETMASK trust" >> editted/pg_hba.conf
+ echo "host replication $PG_SUPER_USER $NODE0_HOST $NODE0_MASK trust" >> editted/pg_hba.conf
+ echo "host replication $PG_SUPER_USER $NODE1_HOST $NODE1_MASK trust" >> editted/pg_hba.conf
+ echo "host all $PG_SUPER_USER $NODE0_HOST $NODE0_MASK trust" >> editted/pg_hba.conf
+ echo "host all $PG_SUPER_USER $NODE1_HOST $NODE1_MASK trust" >> editted/pg_hba.conf
+ echo "host all $PG_ADMIN_USER $NODE0_HOST $NODE0_MASK trust" >> editted/pg_hba.conf
+ echo "host all $PG_ADMIN_USER $NODE1_HOST $NODE1_MASK trust" >> editted/pg_hba.conf
echo
echo $BOLD"----------------------------------------------------------------------"$SPAN_END
@@ -1173,7 +1185,7 @@ INITDB_OK=0
if [ $NODE_NO -eq 0 ]; then
echo
echo "* Create node 0 (localhost) 's database cluster"
- echo
+ echo
echo -n "- initdb ... "
[parent: 43620cb3dadf]