novi upstream verzije 2.8.3

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

diff --git a/src/InstallServer.sh b/src/InstallServer.sh
index 3c9dd49..e619d99 100755 (executable)
--- a/src/InstallServer.sh
+++ b/src/InstallServer.sh
@@ -81,14 +81,14 @@ elif [ "$UNAME" = "Darwin" ]; then
     id -u ${USER} > /dev/null 2>&1
     if [ ! $? = 0 ]; then
 
-        # Creating for 10.5 and 10.6
-        /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/osx105-addusers.sh
-            ./init/osx105-addusers.sh
-        else
             chmod +x ./init/darwin-addusers.pl
             ./init/darwin-addusers.pl    
+        else
+            chmod +x ./init/osx105-addusers.sh
+            ./init/osx105-addusers.sh
         fi        
     fi    
 else
@@ -164,6 +164,9 @@ chown -R ${USER}:${GROUP} ${DIR}/queue/agentless
 chmod -R 750 ${DIR}/queue/agentless
 chmod 740 ${DIR}/queue/agentless/* > /dev/null 2>&1
 
+chown -R root:${GROUP} ${DIR}/tmp
+chmod 1550 ${DIR}/tmp
+
 
 # For the stats directory
 chown -R ${USER}:${GROUP} ${DIR}/stats
@@ -237,15 +240,25 @@ chmod 770 ${DIR}/var/run
 chown root:${GROUP} ${DIR}/var/run
 
 # Moving the binary files
-cp -pr ../bin/ossec* ${DIR}/bin/
-cp -pr ../bin/manage_agents ${DIR}/bin/
-cp -pr ../bin/syscheck_update ${DIR}/bin/
-cp -pr ../bin/verify-agent-conf ${DIR}/bin/
-cp -pr ../bin/clear_stats ${DIR}/bin/
-cp -pr ../bin/list_agents ${DIR}/bin/
-cp -pr ../bin/agent_control ${DIR}/bin/
-cp -pr ../bin/syscheck_control ${DIR}/bin/
-cp -pr ../bin/rootcheck_control ${DIR}/bin/
+cp -pr addagent/manage_agents agentlessd/ossec-agentlessd \
+        analysisd/ossec-analysisd logcollector/ossec-logcollector \
+        monitord/ossec-monitord monitord/ossec-reportd \
+        os_execd/ossec-execd os_maild/ossec-maild \
+        remoted/ossec-remoted syscheckd/ossec-syscheckd \
+       analysisd/ossec-logtest os_csyslogd/ossec-csyslogd \
+       os_auth/ossec-authd os_dbd/ossec-dbd analysisd/ossec-makelists \
+       ${DIR}/bin/
+
+cp -pr util/verify-agent-conf ${DIR}/bin/
+cp -pr util/clear_stats ${DIR}/bin/
+cp -pr util/list_agents ${DIR}/bin/
+cp -pr util/ossec-regex ${DIR}/bin/
+cp -pr util/syscheck_update ${DIR}/bin/
+cp -pr util/agent_control ${DIR}/bin/
+cp -pr util/syscheck_control ${DIR}/bin/
+cp -pr util/rootcheck_control ${DIR}/bin/
+cp -pr external/lua/src/ossec-lua ${DIR}/bin/
+cp -pr external/lua/src/ossec-luac ${DIR}/bin/
 cp -pr ../contrib/util.sh ${DIR}/bin/
 chown root:${GROUP} ${DIR}/bin/util.sh
 chmod +x ${DIR}/bin/util.sh