2010-12-23 Juan Manuel Ramon <juanmanuel.ramon@artica.es>

* mac_osx/pandora_agent_installer: Fixed some problems settings permissions
        * mac_osx/pandora_agent: Fixed some problems with md5sum -> openssl md5 command
        * mac_osx/pandora_agent.conf: Commented some trouble modules
        * mac_osx/pandora_fms/pandora_fms: Fixed some problems starting / stoping daemon



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

pandora_agents/mac_osx/ChangeLog

@@ -0,0 +1,8 @@
+2010-12-23 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
+
+	* mac_osx/pandora_agent_installer: Fixed some problems settings permissions
+	* mac_osx/pandora_agent: Fixed some problems with md5sum -> openssl md5 command 
+	* mac_osx/pandora_agent.conf: Commented some trouble modules 
+	* mac_osx/pandora_fms/pandora_fms: Fixed some problems starting / stoping daemon
+
+ 

pandora_agents/mac_osx/pandora_agent

@@ -365,12 +365,12 @@ function check_remote_config {
 	fi
 
 	# Agent name md5sum
-	AGENT_MD5=`echo -n $NOMBRE_HOST | md5sum | cut -d" " -f1`
+	AGENT_MD5=`echo -n $NOMBRE_HOST | openssl md5 | cut -d" " -f1`
 	CONFIG_FILE="$AGENT_MD5.conf"
 	MD5_FILE="$AGENT_MD5.md5"
 	
 	# Local config file md5sum
-	CONFIG_MD5=`md5sum $PANDORA_HOME/pandora_agent.conf | cut -d" " -f1`
+	CONFIG_MD5=`openssl md5 $PANDORA_HOME/pandora_agent.conf | cut -d" " -f1`
 	
 	# Get remote config file md5sum
 	recv_file "$MD5_FILE"

pandora_agents/mac_osx/pandora_agent.conf

@@ -160,12 +160,12 @@ module_exec netstat -as | grep "bad reset" | awk '{ print $1 }'
 module_description Bad Resets
 module_end
 
-module_begin
-module_name Network Adapter bond0 IPv4 Address
-module_type generic_data_string
-module_exec ifconfig bond0 | grep "inet " | awk '{ print $2 }'
-module_description IP Address Interface 1
-module_end
+#module_begin
+#module_name Network Adapter bond0 IPv4 Address
+#module_type generic_data_string
+#module_exec ifconfig bond0 | grep "inet " | awk '{ print $2 }'
+#module_description IP Address Interface 1
+#module_end
 
 module_begin
 module_name Network Adapter en0 Status
@@ -181,12 +181,12 @@ module_exec ifconfig en1 | grep status | awk '{ if($6=="active") { print 1}; if(
 module_description Ethernet Link 1
 module_end
 
-module_begin
-module_name Network Adapter bond0 Status
-module_type generic_proc
-module_exec ifconfig bond0 | grep status | awk '{ if($6=="active") { print 1}; if($6!="active") {print 0}}'
-module_description Ethernet Bond 0
-module_end
+#module_begin
+#module_name Network Adapter bond0 Status
+#module_type generic_proc
+#module_exec ifconfig bond0 | grep status | awk '{ if($6=="active") { print 1}; if($6!="active") {print 0}}'
+#module_description Ethernet Bond 0
+#module_end
 
 
 # ========================
@@ -378,7 +378,7 @@ module_end
 # This parses /var/log/syslog file, under the module name "syslog"
 # And search for "ssh" string into it, sending only that information.
 
-module_plugin grep_log /var/log/syslog Syslog ssh
+#module_plugin grep_log /var/log/syslog Syslog ssh
 
 # Plugin for inventory on the agent (Only Enterprise)
 

pandora_agents/mac_osx/pandora_agent_installer

@@ -129,12 +129,12 @@ install () {
         chown -R root $PANDORA_HOME
         #chmod -R 600 $PANDORA_TEMP/data_out
         chmod 640 $PANDORA_LOG
-        chgrp root $PANDORA_LOG
+        chgrp admin $PANDORA_LOG
 
         echo "Linking start-up daemon script at $PANDORA_STARTUP";
         cp -R pandora_fms $PANDORA_STARTUP
 
-        chown -R root:root $PANDORA_BIN
+        chown -R root:admin $PANDORA_BIN
         
         echo "Done."
         echo " "

pandora_agents/mac_osx/pandora_fms/pandora_fms

@@ -10,6 +10,7 @@ PANDORA_PATH=/etc/pandora
 DAEMON=/usr/bin/pandora_agent
 PIDFILE=/var/run/pandora_agent.pid
 LOGFILE=/var/log/pandora_agent.log
+MYPID=0
 
 if [ ! -f $DAEMON ]
 then
@@ -34,6 +35,7 @@ StartService()
 	
 	$DAEMON $PANDORA_PATH > $LOGFILE 2>&1 & 
     echo $! > $PIDFILE
+	MYPID=`cat $PIDFILE`
 	echo "Pandora FMS Agent is now running with PID $MYPID"
 }