novi upstream verzije 2.8.3

[ossec-hids.git] / src / InstallAgent.sh

diff --git a/src/InstallAgent.sh b/src/InstallAgent.sh
index 4dcd94c..3385c51 100755 (executable)
--- a/src/InstallAgent.sh
+++ b/src/InstallAgent.sh
@@ -15,7 +15,7 @@ UNAME=`uname`;
 DIR=`grep DIR ${LOCATION} | cut -f2 -d\"`
 GROUP="ossec"
 USER="ossec"
-subdirs="logs bin queue queue/ossec queue/alerts queue/syscheck queue/rids queue/diff var var/run etc etc/shared active-response active-response/bin agentless .ssh"
+subdirs="logs bin queue queue/ossec queue/alerts queue/syscheck queue/rids queue/diff tmp var var/run etc etc/shared active-response active-response/bin agentless .ssh"
 
 
 # ${DIR} must be set 
@@ -67,14 +67,15 @@ elif [ "$UNAME" = "Darwin" ]; then
     id -u ${USER} > /dev/null 2>&1
     if [ ! $? = 0 ]; then
 
-        # Creating for 10.5
-        /usr/bin/sw_vers 2>/dev/null| grep "ProductVersion" | grep -E "10.5.|10.6" > /dev/null 2>&1
+        # Creating for <= 10.4
+        /usr/bin/sw_vers 2>/dev/null| grep "ProductVersion" | grep -E "10.2.|10.3|10.4" > /dev/null 2>&1
         if [ $? = 0 ]; then
+
+           chmod +x ./init/darwin-addusers.pl
+            ./init/darwin-addusers.pl
+       else
             chmod +x ./init/osx105-addusers.sh
             ./init/osx105-addusers.sh
-        else
-            chmod +x ./init/darwin-addusers.pl
-            ./init/darwin-addusers.pl    
         fi        
     fi
 else
@@ -124,6 +125,8 @@ chown -R ${USER}:${GROUP} ${DIR}/queue/diff
 chmod -R 750 ${DIR}/queue/diff
 chmod 740 ${DIR}/queue/diff/* > /dev/null 2>&1
 
+chown -R root:${GROUP} ${DIR}/tmp
+chmod 1550 ${DIR}/tmp
 
 
 
@@ -189,14 +192,16 @@ chown root:${GROUP} ${DIR}/var/run
 
 
 # Moving the binary files
-cp -pr ../bin/ossec-agentd ${DIR}/bin/
-cp -pr ../bin/agent-auth ${DIR}/bin/
-cp -pr ../bin/ossec-logcollector ${DIR}/bin/
-cp -pr ../bin/ossec-syscheckd ${DIR}/bin/
-cp -pr ../bin/ossec-execd ${DIR}/bin/
+cp -pr client-agent/ossec-agentd ${DIR}/bin/
+cp -pr os_auth/agent-auth ${DIR}/bin/
+cp -pr logcollector/ossec-logcollector ${DIR}/bin/
+cp -pr syscheckd/ossec-syscheckd ${DIR}/bin/
+cp -pr os_execd/ossec-execd ${DIR}/bin/
 cp -pr ./init/ossec-client.sh ${DIR}/bin/ossec-control
-cp -pr ../bin/manage_agents ${DIR}/bin/
+cp -pr addagent/manage_agents ${DIR}/bin/
 cp -pr ../contrib/util.sh ${DIR}/bin/
+cp -pr external/lua/src/ossec-lua ${DIR}/bin/
+cp -pr external/lua/src/ossec-luac ${DIR}/bin/
 chown root:${GROUP} ${DIR}/bin/util.sh
 chmod +x ${DIR}/bin/util.sh