2009-12-18 Sancho lerena <slerena@artica.es>

* pandora_console.spec: Ypdated build.

	* pandora_console_upgrade: Applied patch for more verbose information, submitted in 
	Sourceforge.

	* pandoradb_data.sql: Updated version to FINAL build and version ;-)

	* include/config_process.php: Updated build.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2221 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f

pandora_console/ChangeLog

@@ -1,3 +1,14 @@
+2009-12-18  Sancho lerena <slerena@artica.es>
+
+	* pandora_console.spec: Ypdated build.
+
+	* pandora_console_upgrade: Applied patch for more verbose information, submitted in 
+	Sourceforge.
+
+	* pandoradb_data.sql: Updated version to FINAL build and version ;-)
+
+	* include/config_process.php: Updated build.
+
 2009-12-18  Miguel de Dios  <miguel.dedios@artica.es>
 
 	* include/fgraph.php: fix the graph boolean, it's rewrite.

pandora_console/include/config_process.php

@@ -22,7 +22,7 @@
 /**
  * Pandora build version and version 
  */
-$build_version = 'PC091216';
+$build_version = 'PC091218';
 $pandora_version = 'v3.0';
 
 /* Help to debug problems. Override global PHP configuration */

pandora_console/pandora_console.spec

@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_console
 %define version     3.0.0
-%define release	    2
+%define release	    4
 %define httpd_name      httpd
 # User and Group under which Apache is running
 %define httpd_name  apache2

pandora_console/pandora_console_upgrade

@@ -49,13 +49,52 @@ pandora_upgrade () {
 	WWWUSER=`ls -la $PANDORAPATH/index.php | awk '{ print $3 }'` 
 	echo "Setting permissions for $WWWUSER in $PANDORAPATH"
 	chown -R $WWWUSER $PANDORAPATH
+        if [ "$?" -ne 0 ]
+	then
+		echo "ERROR (Cannot change $PANDORAPATH to $WWWUSER ownership)!"
+		return 1
+	fi
 
+	WWWGROUP=`ls -la $PANDORAPATH/index.php | awk '{ print $4 }'` 
 	echo "Setting permissions for $WWWUSER in /var/spool/pandora/data_in"
-	chgrp -R $WWWUSER /var/spool/pandora/data_in
+	chgrp -R $WWWGROUP /var/spool/pandora/data_in
+	if [ "$?" -ne 0 ]
+	then
+		echo "ERROR (Cannot change group ownership to /var/spool/pandora/data_in to $WWWGROUP)!"
+		return 1
+	fi
+
+        # Remove installer file
+
+	[ -f $PANDORAPATH/install.php ] && rm -f $PANDORAPATH/install.php
+
+	# Only root should have read/write access to config.php
+
+	chmod 600 $PANDORAPATH/include/config.php
+	if [ "$?" -ne 0 ]
+	then
+		echo "ERROR (Cannot do chmod 600 $PANDORAPATH/include/config.php)!"
+		return 1
+	fi
+
+    # Remove unnecessary files (optional, set variable to activate)
+
+	REMOVEFILES=0
+	if [ "${REMOVEFILES}" -eq 1 ]
+	then
+		rm -f $PANDORAPATH/AUTHORS
+		rm -f $PANDORAPATH/COPYING
+		rm -f $PANDORAPATH/ChangeLog
+		rm -f $PANDORAPATH/pandora_console_install
+		rm -f $PANDORAPATH/pandora_console_upgrade
+		rm -f $PANDORAPATH/pandoradb.sql
+		rm -f $PANDORAPATH/pandoradb_data.sql
+	fi
 
 	echo " "
 	echo "DONE!"
 	echo " "
+	return 0
 }
 
 help () {

pandora_console/pandoradb_data.sql

@@ -46,8 +46,8 @@ INSERT INTO `tconfig` VALUES
 (5,'days_compact','15'),
 (6,'graph_res','5'),
 (7,'step_compact','1'),
-(8,'db_scheme_version','3.0-dev'),
-(9,'db_scheme_build','PD90918'),
+(8,'db_scheme_version','3.0'),
+(9,'db_scheme_build','PD91218'),
 (13,'show_unknown','0'),
 (14,'show_lastalerts','1'),
 (15,'style','pandora'),