Changeset 796 in ProjectBuilder

Timestamp:

Jul 2, 2009, 10:19:52 PM (15 years ago)

Author:

Bruno Cornec

Message:

• New fixes for fossology build

Location:

projects/fossology/pbconf/trunk

Files:

• fossology/rpm/fossology.spec (modified) (4 diffs)
• pbve.pre (modified) (1 diff)

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

@@ -97 +97 @@
 
 # We suppose that we use the local postgresql installed on the same machine.
-cat >> /var/lib/pgsql/data/pg_hba.conf << EOF
+grep -q FOSSology /var/lib/pgsql/data/pg_hba.conf
+if [ $? -ne 0 ]; then
+    cat >> /var/lib/pgsql/data/pg_hba.conf << EOF
 # Added for FOSSology connection
 # Local connections
@@ -106 +108 @@
 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
+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
+fi
 
 # Now restart again postgresql
@@ -113 +116 @@
 # in case it wasn't already installed
 /etc/init.d/postgresql restart
-
-# To avoid fossology setup to fail, leave it time to start
-sleep 3 
 
 # Add apache config for fossology (described in detail in section 2.1.6) - done in install
@@ -136 +136 @@
 
 # Create logfile to avoid issues later on
-touch %{_var}/log/PBPROJ
+#touch %{_var}/log/PBPROJ
 # Handle logfile owner correctly
-chown fossy:fossy %{_var}/log/PBPROJ
+#chown fossy:fossy %{_var}/log/PBPROJ
 
 # Test that things are installed correctly

projects/fossology/pbconf/trunk/pbve.pre

@@ -5 +5 @@
 sudo mkdir -p /dev/shm
 sudo mount tmpfs /dev/shm -t tmpfs -o size=32m
+# For httpd support and ability to make tests
+sudo mknod /dev/urandom c 1 9