[Pkg-ossec-devel] [SCM] Git repository for pkg-ossec branch, master, updated. f89fb2c00b1a2606035e5cd0e35b4ebe99f049ac

[Javier Fernandez-Sanguino]

The following commit has been merged in the master branch:
commit f63ff65187e3a7a02d920264906265d9b5823ab7
Author: Javier Fernandez-Sanguino <jfs at debian.org>
Date:   Wed Aug 29 13:10:04 2012 +0200

    Move active-response scripts to /usr instead of leaving them in /var

diff --git a/debian/ossec-hids-agent.dirs b/debian/ossec-hids-agent.dirs
index 3e0dd55..1370d67 100644
--- a/debian/ossec-hids-agent.dirs
+++ b/debian/ossec-hids-agent.dirs
@@ -1,6 +1,7 @@
 usr/lib/ossec/
+usr/lib/ossec/active-response
 etc/ossec/shared
 var/log/ossec
-var/ossec/active-response/bin
+var/ossec/active-response/
 var/ossec/agentless
 var/ossec/var/
diff --git a/debian/ossec-hids-local.dirs b/debian/ossec-hids-local.dirs
index 672ffe2..eeccc22 100644
--- a/debian/ossec-hids-local.dirs
+++ b/debian/ossec-hids-local.dirs
@@ -1,9 +1,10 @@
 usr/lib/ossec/
+usr/lib/ossec/active-response
 etc/ossec/rules
 etc/ossec/shared
 var/log/ossec
 var/ossec/.ssh
-var/ossec/active-response/bin
+var/ossec/active-response
 var/ossec/agentless
 var/ossec/queue
 var/ossec/stats
diff --git a/debian/ossec-hids-server.dirs b/debian/ossec-hids-server.dirs
index 672ffe2..eeccc22 100644
--- a/debian/ossec-hids-server.dirs
+++ b/debian/ossec-hids-server.dirs
@@ -1,9 +1,10 @@
 usr/lib/ossec/
+usr/lib/ossec/active-response
 etc/ossec/rules
 etc/ossec/shared
 var/log/ossec
 var/ossec/.ssh
-var/ossec/active-response/bin
+var/ossec/active-response
 var/ossec/agentless
 var/ossec/queue
 var/ossec/stats
diff --git a/debian/rules b/debian/rules
index f5c1cc8..c283acf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -103,6 +103,7 @@ install-local:
 	cd debian/ossec-hids-local/var/ossec && ln -s ../../var/log/ossec/ logs
 	cd debian/ossec-hids-local/var/ossec && ln -s ../../etc/ossec/rules/ rules
 	cd debian/ossec-hids-local/var/ossec/var && ln -s ../../../var/run/ run
+	cd debian/ossec-hids-local/var/ossec/active-response && ln -s ../../../usr/lib/ossec/active-response/ bin
 	chmod -R 550 debian/ossec-hids-local/var/ossec
 	chmod 770 debian/ossec-hids-local/var/ossec/queue/alerts
 	chmod 770 debian/ossec-hids-local/var/ossec/queue/ossec
@@ -133,8 +134,8 @@ install-local:
 #	install -m 640 etc/local_decoder.xml debian/ossec-hids-local/etc/ossec/
 #	install -m 640 etc/local_internal_options.conf debian/ossec-hids-local/etc/ossec/
 	# other scripts
-	install -m 750 active-response/*.sh debian/ossec-hids-local/var/ossec/active-response/bin/
-	install -m 750 active-response/firewalls/*.sh debian/ossec-hids-local/var/ossec/active-response/bin/
+	install -m 750 active-response/*.sh debian/ossec-hids-local/usr/lib/ossec/active-response
+	install -m 750 active-response/firewalls/*.sh debian/ossec-hids-local/usr/lib/ossec/active-response
 
 install-server:
 	install -m 755 server-bin/ossec* debian/ossec-hids-server/usr/lib/ossec
@@ -148,6 +149,7 @@ install-server:
 	cd debian/ossec-hids-server/var/ossec && ln -s ../../var/log/ossec/ logs
 	cd debian/ossec-hids-server/var/ossec && ln -s ../../etc/ossec/rules/ rules
 	cd debian/ossec-hids-server/var/ossec/var && ln -s ../../../var/run/ run
+	cd debian/ossec-hids-server/var/ossec/active-response && ln -s ../../../usr/lib/ossec/active-response/ bin
 	chmod -R 550 debian/ossec-hids-server/var/ossec
 	chmod 770 debian/ossec-hids-server/var/ossec/queue/alerts
 	chmod 770 debian/ossec-hids-server/var/ossec/queue/ossec
@@ -177,8 +179,8 @@ install-server:
 #	install -m 640 etc/local_decoder.xml debian/ossec-hids-server/etc/ossec/
 #	install -m 640 etc/local_internal_options.conf debian/ossec-hids-server/etc/ossec/
 	# other scripts
-	install -m 750 active-response/*.sh debian/ossec-hids-server/var/ossec/active-response/bin/
-	install -m 750 active-response/firewalls/*.sh debian/ossec-hids-server/var/ossec/active-response/bin/
+	install -m 750 active-response/*.sh debian/ossec-hids-server/usr/lib/ossec/active-response/
+	install -m 750 active-response/firewalls/*.sh debian/ossec-hids-server/usr/lib/ossec/active-response/
 
 install-agent:
 	install -m 755 agent-bin/ossec-agentd debian/ossec-hids-agent/usr/lib/ossec/
@@ -191,6 +193,7 @@ install-agent:
 	cd debian/ossec-hids-agent/var/ossec && ln -s ../../etc/ossec/ etc
 	cd debian/ossec-hids-agent/var/ossec && ln -s ../../var/log/ossec/ logs
 	cd debian/ossec-hids-agent/var/ossec/var && ln -s ../../../var/run/ run
+	cd debian/ossec-hids-agent/var/ossec/active-response && ln -s ../../../usr/lib/ossec/active-response/ bin
 	# TODO: Missing configuration files, extract from src/InstallAgent.sh
 	chmod -R 550 debian/ossec-hids-agent/var/ossec
 	chmod 750 debian/ossec-hids-agent/var/log/ossec
@@ -205,8 +208,8 @@ install-agent:
 # These are only for local configuration, not provided upstream
 #	install -m 640 etc/local_internal_options.conf debian/ossec-hids-agent/etc/ossec/
 	# other scripts
-	install -m 750 active-response/*.sh debian/ossec-hids-agent/var/ossec/active-response/bin/
-	install -m 750 active-response/firewalls/*.sh debian/ossec-hids-agent/var/ossec/active-response/bin/
+	install -m 750 active-response/*.sh debian/ossec-hids-agent/usr/lib/ossec/active-response/
+	install -m 750 active-response/firewalls/*.sh debian/ossec-hids-agent/usr/lib/ossec/active-response/
 
 install-arch: build install-prep install-server install-local install-agent
 

-- 
Git repository for pkg-ossec