Changeset 694 in ProjectBuilder for projects/fossology/pbconf

Timestamp:

Feb 17, 2009, 2:34:30 PM (16 years ago)

Author:

Bruno Cornec

Message:

Fixes for fossology build on centos 5

Location:

projects/fossology/pbconf/trunk

Files:

• fossology/rpm/fossology.spec (modified) (5 diffs)
• pbfilter/centos.pbf (modified) (2 diffs)

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

@@ -12 +12 @@
 #PBPATCHSRC
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n)
-Requires:       postgresql php php-pear php-pgsql libxml2 binutils bzip2 cpio mkisofs poppler-utils rpm tar unzip gzip httpd PBDEP
+Requires:       postgresql php php-pear php-pgsql libxml2 binutils bzip2 cpio mkisofs poppler-utils rpm tar unzip gzip httpd which PBDEP
 BuildRequires:  postgresql-devel libxml2 gcc make perl PBBUILDDEP
 Summary:        FOSSology is a licenses exploration tool
@@ -59 +59 @@
 </Directory>
 EOF
+cp utils/fo-cleanold $RPM_BUILD_ROOT/%{_usr}/lib/PBPROJ/
 
 #rm -f $RPM_BUILD_ROOT/%{_sysconfdir}/default/PBPROJ
@@ -95 +96 @@
     echo "kernel.shmmax=512000000" >> /etc/sysctl.conf
 fi
-# Adjust postgresql config (described in detail in section 2.1.4)
-#  266 > #hba_file = 'ConfigDir/pg_hba.conf'    # host-based authentication file
-#  267 > #ident_file = 'ConfigDir/pg_ident.conf'    # IDENT configuration file
-#  268 > #external_pid_file = '(none)'      # write an extra pid file
-#  269 > listen_addresses = '*'
-#  270 > max_connections = 50
-#  271 > #shared_buffers = 1000     # min 16 or max_connections*2, 8KB each
-#  272 > shared_buffers = 32768
-#  273 > work_mem = 10240  
-#  274 > max_fsm_pages = 100000     # min max_fsm_relations*16, 6 bytes each
-#  275 > fsync = off   
-#  276 > full_page_writes = off     #recover from partial page writes
-#  277 > commit_delay = 1000 
-#  278 > effective_cache_size = 25000
-#  279 > log_min_duration_statement = -1    # -1 is disabled, 0 logs all statements
-#  280 > #log_line_prefix = ''          # Special values:
+
+if [ ! -f /usr/share/pgsql/postgresql.conf ]; then
+    cp /usr/share/pgsql/postgresql.conf.sample /usr/share/pgsql/postgresql.conf
+    
+    # Adjust postgresql config (described in detail in section 2.1.4) for Fossology
+    cat >> /usr/share/pgsql/postgresql.conf << EOF
+listen_addresses = '*'
+max_connections = 50
+shared_buffers = 32768
+work_mem = 10240  
+max_fsm_pages = 100000          # min max_fsm_relations*16, 6 bytes each
+fsync = off   
+full_page_writes = off          # recover from partial page writes
+commit_delay = 1000 
+effective_cache_size = 25000
+log_min_duration_statement = -1 # -1 is disabled, 0 logs all statements
+log_line_prefix = '%t %h %c'    # prepend a time stamp to all log entries
+EOF
+else
+    echo "Please check that your postgresql configuration is aligned with fossology recommendations at section 2.1.4 of /usr/share/doc/fossology*/INSTALL"
+fi
+
+# 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
+    /etc/init.d/postgresql reload
+fi
 
 # Adjust PHP config (described in detail in section 2.1.5)
@@ -133 +147 @@
 
 # Add apache config for fossology (described in detail in section 2.1.6) - done in install
-/etc/init.d/httpd reload
+LANGUAGE=C /etc/init.d/httpd status 2>&1 | grep -q stop
+if [ $? -eq 0 ]; then
+    /etc/init.d/httpd start
+else
+    /etc/init.d/httpd reload
+fi
 
 # Run the postinstall script
@@ -152 +171 @@
 chkconfig --del PBPROJ 2>&1 > /dev/null
 
+# We should do some cleanup here (fossy account ...)
+/usr/lib/PBPROJ/fo-cleanold
+userdel fossy
+groupdel fossy
+
 %changelog
 PBLOG

projects/fossology/pbconf/trunk/pbfilter/centos.pbf

@@ -14 +14 @@
 
 # PBDEP is replaced by the list of dependencies
-filter PBDEP = file
+filter PBDEP = file postgresql-server
 
 # PBBUILDDEP is replaced by the list of build dependencies
@@ -26 +26 @@
 #filter PBOBS =
 
+PBPHPINI = /etc/php.ini