[Pkg-ossec-devel] [SCM] Git repository for pkg-ossec branch, debian, updated. 58821e0bc7b9c1a6782c901dcd31ccb865a49893

[Javier Fernandez-Sanguino]

The following commit has been merged in the debian branch:
commit 5571c0cc0d7c8e39c1f798dfaa05564853e07bab
Author: Javier Fernandez-Sanguino <jfs at debian.org>
Date:   Mon Jul 25 22:27:36 2011 +0200

    Create symlinks for missing directories and create additional directories
    in the ossec-hids-agent.dirs and ossec-hids-server.dirs files

diff --git a/debian/ossec-hids-agent.dirs b/debian/ossec-hids-agent.dirs
index 2eea0ad..aefa56d 100644
--- a/debian/ossec-hids-agent.dirs
+++ b/debian/ossec-hids-agent.dirs
@@ -1,2 +1,7 @@
 usr/bin/
 usr/lib/ossec/
+var/ossec/active-response/bin
+var/ossec/agentless
+var/ossec/queue
+var/ossec/rules
+var/ossec/stats
diff --git a/debian/ossec-hids-server.dirs b/debian/ossec-hids-server.dirs
index 02a256b..0046d5a 100644
--- a/debian/ossec-hids-server.dirs
+++ b/debian/ossec-hids-server.dirs
@@ -1,9 +1,8 @@
 usr/bin/
 usr/lib/ossec/
-var/ossec/bin
-var/ossec/etc
+var/ossec/.ssh
+var/ossec/active-response/bin
+var/ossec/agentless
 var/ossec/queue
 var/ossec/rules
 var/ossec/stats
-var/ossec/agentless
-var/ossec/active-response/bin
diff --git a/debian/rules b/debian/rules
index effc76c..dd285b6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -42,7 +42,7 @@ install-arch: build
 	dh_testroot
 	dh_prep -a
 	dh_installdirs -a
-# Server files
+# Server files and directories
 	install -m 755 bin/ossec debian/ossec-hids-server/usr/bin/
 	install -m 755 bin/ossec* debian/ossec-hids-server/usr/lib/ossec
 	-rm -f debian/ossec-hids-server/usr/bin/ossec
@@ -52,14 +52,18 @@ install-arch: build
 		rootcheck_control ; do \
 		install -m 755 bin/$$file debian/ossec-hids-server/usr/lib/ossec/ ; \
 	done
+	cd debian/ossec-hids-server/var/ossec && ln -s bin ../../usr/lib/ossec/
+	cd debian/ossec-hids-server/var/ossec && ln -s etc ../../etc/ossec/
 	cd debian/ossec-hids-server/var/ossec && ln -s logs ../logs/ossec/
-# Agent files
+# Agent files and directories
 	install -m 755 bin/ossec-agentd debian/ossec-hids-agent/usr/bin/
 	for file in agent-auth ossec-logcollector ossec-syscheckd ossec-execd \
 		manage_agents ; do \
 		install -m 755 bin/$$file debian/ossec-hids-agent/usr/lib/ossec/ ; \
 	done
 	dh_install -a
+	cd debian/ossec-hids-agent/var/ossec && ln -s bin ../../usr/lib/ossec/
+	cd debian/ossec-hids-agent/var/ossec && ln -s etc ../../etc/ossec/
 	cd debian/ossec-hids-agent/var/ossec && ln -s logs ../logs/ossec/
 
 install-indep: build-indep

-- 
Git repository for pkg-ossec