From 51eaa1d642fb77ce3d937a65ab1111fca3c82b4b Mon Sep 17 00:00:00 2001
From: marostegui <noreply@pandorafms.org>
Date: Thu, 28 Jun 2007 12:27:36 +0000
Subject: [PATCH] 2007-06-28 Manuel Arostegui <marostegui@artica.es>

        * pandora_doc/en/pandora_install.xml: Added explanation about
          the new directory which must be created to works
          with the #1744248 feature request.

        * conf/pandora_server.conf: Fixed bug #1744240

        * pandora_server: Added feature request #1744248

        * pandora_recon: Added feature request #1744248

        * pandora_network: Added feature request #1744248



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@547 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
---
 pandora_doc/ChangeLog                   |  6 ++++++
 pandora_doc/en/pandora_install.xml      |  6 ++++++
 pandora_server/ChangeLog                | 10 ++++++++++
 pandora_server/conf/pandora_server.conf |  2 +-
 pandora_server/pandora_network          |  4 ++--
 pandora_server/pandora_recon            |  2 +-
 pandora_server/pandora_server           |  2 +-
 7 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/pandora_doc/ChangeLog b/pandora_doc/ChangeLog
index aff3f07368..daae8e6c9c 100644
--- a/pandora_doc/ChangeLog
+++ b/pandora_doc/ChangeLog
@@ -1,3 +1,9 @@
+2007-06-28 Manuel Arostegui <marostegui@artica.es>
+
+	* en/pandora_install.xml: Added explanation about
+	  the new directory which must be created to works 
+	  with the #1744248 feature request.
+
 2007-06-15 Manuel Arostegui <marostegui@artica.es>
 
 	* en/pandora_install.xml: Changes to adapt the
diff --git a/pandora_doc/en/pandora_install.xml b/pandora_doc/en/pandora_install.xml
index 7e1edd0909..c23ab57a80 100644
--- a/pandora_doc/en/pandora_install.xml
+++ b/pandora_doc/en/pandora_install.xml
@@ -191,6 +191,12 @@
     access to <filename>/usr/share/pandora_server</filename> and
     <filename>/var/spool/pandora/data_in</filename> directories.
   </para>
+  <para>
+    You, also, have to create the directory <filename>/var/run/pandora/</filename>
+    and make sure that the permissions are set correctly, basically:
+    <filename>chown pandora:root /var/run/pandora</filename>. Otherwise, PandoraFMS
+    server will complain about either the missing directory or the wrong permissions.
+  </para>
   <para>
     This is true with all the components but with Pandora SNMP Console
     needs root user to open UDP port 161 (this can be solved setting
diff --git a/pandora_server/ChangeLog b/pandora_server/ChangeLog
index 3290e32507..60b6bd1aee 100644
--- a/pandora_server/ChangeLog
+++ b/pandora_server/ChangeLog
@@ -1,3 +1,13 @@
+2007-06-28  Manuel Arostegui <marostegui@artica.es>
+
+     	* conf/pandora_server.conf: Fixed bug #1744240 
+      
+	* pandora_server: Added feature request #1744248
+      
+	* pandora_recon: Added feature request #1744248
+      
+	* pandora_network: Added feature request #1744248
+
 2007-06-25  Sancho Lerena  <slerena@artica.es>
 
 	This should be definitive commit for Beta1
diff --git a/pandora_server/conf/pandora_server.conf b/pandora_server/conf/pandora_server.conf
index 89c2cabb01..dcf00efd95 100755
--- a/pandora_server/conf/pandora_server.conf
+++ b/pandora_server/conf/pandora_server.conf
@@ -29,7 +29,7 @@ dbname pandora
 
 # dbuser:  Database user name (pandora by default)
 
-dbuser root
+dbuser pandora 
 
 # daemon: Runs in daemon mode (background) if 1, if 0 runs in foreground 
 # this could be setup on command line with -D option
diff --git a/pandora_server/pandora_network b/pandora_server/pandora_network
index c439a29cfe..41fd0d3079 100755
--- a/pandora_server/pandora_network
+++ b/pandora_server/pandora_network
@@ -7,7 +7,7 @@
 
 # Configurable path and filenames
 PANDORA_HOME="/usr/share/pandora_server"
-PANDORA_NETWORK_PID="$PANDORA_HOME/var/pandora_network.pid"
+PANDORA_NETWORK_PID="/var/run/pandora/pandora_network.pid"
 
 # Main script
 
@@ -34,7 +34,7 @@ case "$1" in
 		echo $MYPID > $PANDORA_NETWORK_PID
 		echo "Pandora Network Server is now running with PID $MYPID"
 	else
-		echo "Cannot start Pandora FMS Network Server. Aborted"
+		echo "Cannot start Pandora FMS Network Server. Aborted."
 	fi
 		cd "$OLD_PATH"
         ;;
diff --git a/pandora_server/pandora_recon b/pandora_server/pandora_recon
index 55b2c22990..4ee5394b47 100755
--- a/pandora_server/pandora_recon
+++ b/pandora_server/pandora_recon
@@ -6,7 +6,7 @@
 
 # Configurable path and filenames
 PANDORA_HOME="/usr/share/pandora_server"
-PANDORA_PID="$PANDORA_HOME/var/pandora_recon.pid"
+PANDORA_PID="/var/run/pandora/pandora_recon.pid"
 
 # Main script
 
diff --git a/pandora_server/pandora_server b/pandora_server/pandora_server
index f5c76ed3ad..acdcf461fa 100755
--- a/pandora_server/pandora_server
+++ b/pandora_server/pandora_server
@@ -6,7 +6,7 @@
 
 # Configurable path and filenames
 PANDORA_HOME="/usr/share/pandora_server"
-PANDORA_SERVER_PID="$PANDORA_HOME/var/pandora_server.pid"
+PANDORA_SERVER_PID="/var/run/pandora/pandora_server.pid"
 
 # Main script