Changeset 795

Timestamp:

07/02/09 21:09:19 (4 years ago)

Author:

bruno

Message:

• Fix ntp info for VE locally
• Fix postgresql issue at startup by defering conf file modification. THis allows a non already installed postgresql to setup the conf correctly and then modification and restart is possible

Location:

projects

Files:

• fossology/pbconf/trunk/fossology/rpm/fossology.spec (modified) (3 diffs)
• rinse/pbconf/devel/conf/.pbrc (modified) (1 diff)

projects/fossology/pbconf/trunk/fossology/rpm/fossology.spec

@@ -89 +89 @@
 %post
 
+# Check postgresql is running
+LANGUAGE=C /etc/init.d/postgresql status 2>&1 | grep -q stop
+if [ $? -eq 0 ]; then
+    /etc/init.d/postgresql start
+fi
+chkconfig --add postgresql
+
 # We suppose that we use the local postgresql installed on the same machine.
 cat >> /var/lib/pgsql/data/pg_hba.conf << EOF
@@ -96 +103 @@
 # IPv4 local connections:
 host    all         all         127.0.0.1/32          md5
-# IPv6 local connections:
-host    all         all         ::1/128               ident sameuser
 
 EOF
+# Comment previous setup
 perl -pi -e 's|(host\s+all\s+all\s+127.0.0.1/32\s+ident\s+sameuser)|#$1|' /var/lib/pgsql/data/pg_hba.conf
+perl -pi -e 's|(local\s+all\s+all\s+127.0.0.1/32\s+ident\s+sameuser)|#$1|' /var/lib/pgsql/data/pg_hba.conf
 
-# Check postgresql is running
-LANGUAGE=C /etc/init.d/postgresql status 2>&1 | grep -q stop
-if [ $? -eq 0 ]; then
-    /etc/init.d/postgresql start
-else
-    # Reload doesn't seem to work here
-    /etc/init.d/postgresql restart
-fi
-chkconfig --add postgresql
+# Now restart again postgresql
+# We have do it here in order to let postgresql configure itself correctly 
+# in case it wasn't already installed
+/etc/init.d/postgresql restart
 
 # To avoid fossology setup to fail, leave it time to start
@@ -121 +123 @@
 # Adds user httpd to fossy group
 #useradd -G fossy httpd
-perl -pi -e 's/^fossy:x:([0-9]+):/fossy:x:$1:httpd/' /etc/group
+perl -pi -e 's/^fossy:x:([0-9]+):(.+)/fossy:x:$1:httpd,$2/' /etc/group
+perl -pi -e 's/^fossy:x:([0-9]+):$/fossy:x:$1:httpd/' /etc/group
 
 # httpd is also assumed to run locally

projects/rinse/pbconf/devel/conf/.pbrc

@@ -17 +17 @@
 
 # Hash for VE stuff on vmtype
-ventp default = pool.ntp.org
-ventpcmd default = ntpdate
+ventp default = grentp1.europe.hp.net
+ventpcmd default = /usr/sbin/ntpdate
 
 # We suppose we can commmunicate with the VE through schroot