[Pkg-ossec-devel] [pkg-ossec] 05/05: Changing every reference whithin debian/ directory from var/ossec to var/lib/ossec.
Jose Antonio Quevedo Muñoz
jaqm-guest at moszumanska.debian.org
Wed Jan 29 13:19:39 UTC 2014
This is an automated email from the git hooks/post-receive script.
jaqm-guest pushed a commit to branch master
in repository pkg-ossec.
commit 2a6c3c4c6f552cfd9bff941573da59a2e72d8afa
Author: Jose Antonio Quevedo <joseantonio.quevedo at gmail.com>
Date: Wed Jan 29 14:14:42 2014 +0100
Changing every reference whithin debian/ directory from var/ossec to var/lib/ossec.
---
debian/README.Debian | 6 +++---
debian/TODO | 4 ++--
debian/ossec-hids-agent.dirs | 24 ++++++++++-----------
debian/ossec-hids-agent.init | 2 +-
debian/ossec-hids-agent.postinst | 2 +-
debian/ossec-hids-agent.preinst | 2 +-
debian/ossec-hids-create-chroot | 2 +-
debian/ossec-hids-local.dirs | 30 +++++++++++++-------------
debian/ossec-hids-local.init | 2 +-
debian/ossec-hids-local.postinst | 2 +-
debian/ossec-hids-local.preinst | 2 +-
debian/ossec-hids-server.dirs | 30 +++++++++++++-------------
debian/ossec-hids-server.init | 2 +-
debian/ossec-hids-server.postinst | 2 +-
debian/ossec-hids-server.preinst | 2 +-
debian/ossec-hids-update-chroot | 4 ++--
debian/ossec-init.conf | 2 +-
debian/ossec-init.conf.agent | 2 +-
debian/ossec-init.conf.local | 2 +-
debian/ossec-init.conf.server | 2 +-
debian/ossec-orig-target | 12 +++++------
debian/patches/03-disable-chroot-default.patch | 2 +-
22 files changed, 70 insertions(+), 70 deletions(-)
diff --git a/debian/README.Debian b/debian/README.Debian
index 5fab49f..874eb5c 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -8,7 +8,7 @@ OSSEC for Debian
of the daemon.
Upstream installs all the binaries so that they run in a chroot environment
- (/var/ossec). However, installing binaries in the chroot will not follow
+ (/var/lib/ossec). However, installing binaries in the chroot will not follow
the FFSTND and using a chroot will make it difficult to handle packages
upgrades (for bug fixes and new upstream releases) since this is not
handled by Debian's package management system. Consequently, this
@@ -20,14 +20,14 @@ OSSEC for Debian
the system administrator needs to first setup a chroot for OSSEC and
configure (in the ossec-init.conf file) the location of the chroot directory.
- To setup the chroot you can use /var/ossec as a basis, but remember to
+ To setup the chroot you can use /var/lib/ossec as a basis, but remember to
change the symbolic links with the actual files/directories they point to.
The Debian maintainers provide two scripts that can be used to create and
setup the chroot. These script are:
- /usr/lib/ossec/ossec-hids-create-chroot: Creates a chroot using the
- contents distributed in the package, copying /var/ossec and replacing
+ contents distributed in the package, copying /var/lib/ossec and replacing
symlinks with the actual files. By default it is created under
/var/chroot/ossec
diff --git a/debian/TODO b/debian/TODO
index 5871b41..1b86bbf 100644
--- a/debian/TODO
+++ b/debian/TODO
@@ -39,7 +39,7 @@ Packages:
- [all] Package purge:
- Remove the log files from the directory on purge
- Remove ossec users on purge
- - Remove /var/ossec/queue/alerts/execq (possibly other queues too)
+ - Remove /var/lib/ossec/queue/alerts/execq (possibly other queues too)
Other:
@@ -76,7 +76,7 @@ DONE
DONE - uses quilt
-- Check if /var/ossec/etc/ossec-init.conf needs to be generated. This
+- Check if /var/lib/ossec/etc/ossec-init.conf needs to be generated. This
file needs to include the basic configuration for OSSEC including the
type of installation.
diff --git a/debian/ossec-hids-agent.dirs b/debian/ossec-hids-agent.dirs
index c007984..a30d296 100644
--- a/debian/ossec-hids-agent.dirs
+++ b/debian/ossec-hids-agent.dirs
@@ -3,15 +3,15 @@ usr/lib/ossec/active-response
etc/ossec/rules
etc/ossec/shared
var/log/ossec
-var/ossec/.ssh
-var/ossec/active-response/
-var/ossec/agentless
-var/ossec/queue
-var/ossec/queue/agent-info
-var/ossec/queue/agentless
-var/ossec/queue/alerts
-var/ossec/queue/diff
-var/ossec/queue/ossec/queue
-var/ossec/queue/rids
-var/ossec/queue/syscheck
-var/ossec/var/
+var/lib/ossec/.ssh
+var/lib/ossec/active-response/
+var/lib/ossec/agentless
+var/lib/ossec/queue
+var/lib/ossec/queue/agent-info
+var/lib/ossec/queue/agentless
+var/lib/ossec/queue/alerts
+var/lib/ossec/queue/diff
+var/lib/ossec/queue/ossec/queue
+var/lib/ossec/queue/rids
+var/lib/ossec/queue/syscheck
+var/lib/ossec/var/
diff --git a/debian/ossec-hids-agent.init b/debian/ossec-hids-agent.init
index 3c2aa6a..f28b907 100755
--- a/debian/ossec-hids-agent.init
+++ b/debian/ossec-hids-agent.init
@@ -35,7 +35,7 @@ SCRIPTNAME=/etc/init.d/$NAME
# Load the information for the main configuration file
[ -e /etc/ossec-init.conf ] && . /etc/ossec-init.conf
if [ -z "${DIRECTORY}" ]; then
- DIRECTORY="/var/ossec"
+ DIRECTORY="/var/lib/ossec"
fi
# Read configuration variable file if it is present
diff --git a/debian/ossec-hids-agent.postinst b/debian/ossec-hids-agent.postinst
index 187b2e5..f11cafe 100644
--- a/debian/ossec-hids-agent.postinst
+++ b/debian/ossec-hids-agent.postinst
@@ -7,7 +7,7 @@ test $DEBIAN_SCRIPT_DEBUG && set -v -x
OSSECUSER="ossec"
OSSECGROUP="ossec"
LOGDIR="/var/log/ossec"
-HOMEDIR="/var/ossec"
+HOMEDIR="/var/lib/ossec"
CONF_FILE=/etc/ossec/ossec-init.conf
diff --git a/debian/ossec-hids-agent.preinst b/debian/ossec-hids-agent.preinst
index 7a2fdc0..918aabf 100644
--- a/debian/ossec-hids-agent.preinst
+++ b/debian/ossec-hids-agent.preinst
@@ -11,7 +11,7 @@ set -e
# Initialise variables
OSSECUSER="ossec"
OSSECGROUP="ossec"
-HOMEDIR="/var/ossec"
+HOMEDIR="/var/lib/ossec"
case "$1" in
install|upgrade)
diff --git a/debian/ossec-hids-create-chroot b/debian/ossec-hids-create-chroot
index ee21b7f..aab3905 100755
--- a/debian/ossec-hids-create-chroot
+++ b/debian/ossec-hids-create-chroot
@@ -11,7 +11,7 @@
# License, or (at your option) any later version.
-INSTALLDIR=/var/ossec # Directory where OSSEC is installed
+INSTALLDIR=/var/lib/ossec # Directory where OSSEC is installed
CHROOTDIR=/var/chroot/ossec # Directory where we create the chroot
ORIG_TARGET_FILE=.ossec-orig-target # File that describes the original directory and the symlinks made
verbose="no"
diff --git a/debian/ossec-hids-local.dirs b/debian/ossec-hids-local.dirs
index eeccc22..bfe238d 100644
--- a/debian/ossec-hids-local.dirs
+++ b/debian/ossec-hids-local.dirs
@@ -3,18 +3,18 @@ usr/lib/ossec/active-response
etc/ossec/rules
etc/ossec/shared
var/log/ossec
-var/ossec/.ssh
-var/ossec/active-response
-var/ossec/agentless
-var/ossec/queue
-var/ossec/stats
-var/ossec/queue/agent-info
-var/ossec/queue/agentless
-var/ossec/queue/alerts
-var/ossec/queue/diff
-var/ossec/queue/fts
-var/ossec/queue/ossec/queue
-var/ossec/queue/rids
-var/ossec/queue/rootcheck
-var/ossec/queue/syscheck
-var/ossec/var/
+var/lib/ossec/.ssh
+var/lib/ossec/active-response
+var/lib/ossec/agentless
+var/lib/ossec/queue
+var/lib/ossec/stats
+var/lib/ossec/queue/agent-info
+var/lib/ossec/queue/agentless
+var/lib/ossec/queue/alerts
+var/lib/ossec/queue/diff
+var/lib/ossec/queue/fts
+var/lib/ossec/queue/ossec/queue
+var/lib/ossec/queue/rids
+var/lib/ossec/queue/rootcheck
+var/lib/ossec/queue/syscheck
+var/lib/ossec/var/
diff --git a/debian/ossec-hids-local.init b/debian/ossec-hids-local.init
index 35b6d26..b7aed02 100755
--- a/debian/ossec-hids-local.init
+++ b/debian/ossec-hids-local.init
@@ -35,7 +35,7 @@ SCRIPTNAME=/etc/init.d/$NAME
# Load the information for the main configuration file
[ -e /etc/ossec-init.conf ] && . /etc/ossec-init.conf
if [ -z "${DIRECTORY}" ]; then
- DIRECTORY="/var/ossec"
+ DIRECTORY="/var/lib/ossec"
fi
# Read configuration variable file if it is present
diff --git a/debian/ossec-hids-local.postinst b/debian/ossec-hids-local.postinst
index 6db48de..8cef7f5 100644
--- a/debian/ossec-hids-local.postinst
+++ b/debian/ossec-hids-local.postinst
@@ -7,7 +7,7 @@ test $DEBIAN_SCRIPT_DEBUG && set -v -x
OSSECUSER="ossec"
OSSECGROUP="ossec"
LOGDIR="/var/log/ossec"
-HOMEDIR="/var/ossec"
+HOMEDIR="/var/lib/ossec"
CONF_FILE=/etc/ossec/ossec-init.conf
diff --git a/debian/ossec-hids-local.preinst b/debian/ossec-hids-local.preinst
index 7a2fdc0..918aabf 100644
--- a/debian/ossec-hids-local.preinst
+++ b/debian/ossec-hids-local.preinst
@@ -11,7 +11,7 @@ set -e
# Initialise variables
OSSECUSER="ossec"
OSSECGROUP="ossec"
-HOMEDIR="/var/ossec"
+HOMEDIR="/var/lib/ossec"
case "$1" in
install|upgrade)
diff --git a/debian/ossec-hids-server.dirs b/debian/ossec-hids-server.dirs
index eeccc22..bfe238d 100644
--- a/debian/ossec-hids-server.dirs
+++ b/debian/ossec-hids-server.dirs
@@ -3,18 +3,18 @@ usr/lib/ossec/active-response
etc/ossec/rules
etc/ossec/shared
var/log/ossec
-var/ossec/.ssh
-var/ossec/active-response
-var/ossec/agentless
-var/ossec/queue
-var/ossec/stats
-var/ossec/queue/agent-info
-var/ossec/queue/agentless
-var/ossec/queue/alerts
-var/ossec/queue/diff
-var/ossec/queue/fts
-var/ossec/queue/ossec/queue
-var/ossec/queue/rids
-var/ossec/queue/rootcheck
-var/ossec/queue/syscheck
-var/ossec/var/
+var/lib/ossec/.ssh
+var/lib/ossec/active-response
+var/lib/ossec/agentless
+var/lib/ossec/queue
+var/lib/ossec/stats
+var/lib/ossec/queue/agent-info
+var/lib/ossec/queue/agentless
+var/lib/ossec/queue/alerts
+var/lib/ossec/queue/diff
+var/lib/ossec/queue/fts
+var/lib/ossec/queue/ossec/queue
+var/lib/ossec/queue/rids
+var/lib/ossec/queue/rootcheck
+var/lib/ossec/queue/syscheck
+var/lib/ossec/var/
diff --git a/debian/ossec-hids-server.init b/debian/ossec-hids-server.init
index e3fd568..3db624a 100755
--- a/debian/ossec-hids-server.init
+++ b/debian/ossec-hids-server.init
@@ -35,7 +35,7 @@ SCRIPTNAME=/etc/init.d/$NAME
# Load the information for the main configuration file
[ -e /etc/ossec-init.conf ] && . /etc/ossec-init.conf
if [ -z "${DIRECTORY}" ]; then
- DIRECTORY="/var/ossec"
+ DIRECTORY="/var/lib/ossec"
fi
# Read configuration variable file if it is present
diff --git a/debian/ossec-hids-server.postinst b/debian/ossec-hids-server.postinst
index 8c3fd4a..4c783db 100644
--- a/debian/ossec-hids-server.postinst
+++ b/debian/ossec-hids-server.postinst
@@ -7,7 +7,7 @@ test $DEBIAN_SCRIPT_DEBUG && set -v -x
OSSECUSER="ossec"
OSSECGROUP="ossec"
LOGDIR="/var/log/ossec"
-HOMEDIR="/var/ossec"
+HOMEDIR="/var/lib/ossec"
CONF_FILE=/etc/ossec/ossec-init.conf
diff --git a/debian/ossec-hids-server.preinst b/debian/ossec-hids-server.preinst
index 73db4eb..e5a8379 100644
--- a/debian/ossec-hids-server.preinst
+++ b/debian/ossec-hids-server.preinst
@@ -11,7 +11,7 @@ set -e
# Initialise variables
OSSECUSER="ossec"
OSSECGROUP="ossec"
-HOMEDIR="/var/ossec"
+HOMEDIR="/var/lib/ossec"
case "$1" in
install|upgrade)
diff --git a/debian/ossec-hids-update-chroot b/debian/ossec-hids-update-chroot
index 270a7ed..82d581d 100755
--- a/debian/ossec-hids-update-chroot
+++ b/debian/ossec-hids-update-chroot
@@ -10,7 +10,7 @@
# published by the Free Software Foundation; either version 2 of the
# License, or (at your option) any later version.
-INSTALLDIR=/var/ossec # Directory where OSSEC is installed
+INSTALLDIR=/var/lib/ossec # Directory where OSSEC is installed
ORIG_TARGET_FILE=.ossec-orig-target # File that describes the original directory and the symlinks made
verbose="no"
changed_chroot="no"
@@ -31,7 +31,7 @@ sanity_check() {
exit 1
fi
- if [ "$DIRECTORY" = "/var/ossec" ] ; then
+ if [ "$DIRECTORY" = "/var/lib/ossec" ] ; then
echo "ERROR: DIRECTORY variable in /etc/ossec-init.conf does not point to a chroot."
echo "Please fix this and rerun this script. Aborting."
exit 1
diff --git a/debian/ossec-init.conf b/debian/ossec-init.conf
index a564ee0..5916026 100644
--- a/debian/ossec-init.conf
+++ b/debian/ossec-init.conf
@@ -1,5 +1,5 @@
# Debian version of /etc/ossec-init.conf
-DIRECTORY="/var/ossec"
+DIRECTORY="/var/lib/ossec"
VERSION="v2.6"
DATE="Sun Aug 26 13:02:21 CEST 2012"
# This value needs to be set by the system configuration:
diff --git a/debian/ossec-init.conf.agent b/debian/ossec-init.conf.agent
index cfac275..b436cbd 100644
--- a/debian/ossec-init.conf.agent
+++ b/debian/ossec-init.conf.agent
@@ -1,5 +1,5 @@
# Debian version of /etc/ossec-init.conf
-DIRECTORY="/var/ossec"
+DIRECTORY="/var/lib/ossec"
VERSION="v2.6"
DATE="Sun Aug 26 13:02:21 CEST 2012"
TYPE="agent"
diff --git a/debian/ossec-init.conf.local b/debian/ossec-init.conf.local
index 88e7fae..04f9c1c 100644
--- a/debian/ossec-init.conf.local
+++ b/debian/ossec-init.conf.local
@@ -1,5 +1,5 @@
# Debian version of /etc/ossec-init.conf
-DIRECTORY="/var/ossec"
+DIRECTORY="/var/lib/ossec"
VERSION="v2.6"
DATE="Sun Aug 26 13:02:21 CEST 2012"
TYPE="local"
diff --git a/debian/ossec-init.conf.server b/debian/ossec-init.conf.server
index b4da539..100e702 100644
--- a/debian/ossec-init.conf.server
+++ b/debian/ossec-init.conf.server
@@ -1,5 +1,5 @@
# Debian version of /etc/ossec-init.conf
-DIRECTORY="/var/ossec"
+DIRECTORY="/var/lib/ossec"
VERSION="v2.6"
DATE="Sun Aug 26 13:02:21 CEST 2012"
TYPE="server"
diff --git a/debian/ossec-orig-target b/debian/ossec-orig-target
index ef9151a..3a15e6f 100644
--- a/debian/ossec-orig-target
+++ b/debian/ossec-orig-target
@@ -1,9 +1,9 @@
# List of directories we symlink in the Debian package
# these are in the format:
# Original directory - Debian installation location
-/var/ossec/active-response /usr/lib/ossec/active-response
-/var/ossec/bin /usr/lib/ossec/
-/var/ossec/logs /var/log/ossec/
-/var/ossec/rules /etc/ossec/rules
-/var/ossec/etc /etc/ossec/
-/var/ossec/var/run /var/run/ossec-hids
+/var/lib/ossec/active-response /usr/lib/ossec/active-response
+/var/lib/ossec/bin /usr/lib/ossec/
+/var/lib/ossec/logs /var/log/ossec/
+/var/lib/ossec/rules /etc/ossec/rules
+/var/lib/ossec/etc /etc/ossec/
+/var/lib/ossec/var/run /var/run/ossec-hids
diff --git a/debian/patches/03-disable-chroot-default.patch b/debian/patches/03-disable-chroot-default.patch
index 10d6045..b2316a2 100644
--- a/debian/patches/03-disable-chroot-default.patch
+++ b/debian/patches/03-disable-chroot-default.patch
@@ -1,7 +1,7 @@
Description: Disable chroot by default
This patch changes the default behaviour of the daemons and
programs to prevent them from chrooting. In Debian
- installations the /var/ossec directory is not a directory
+ installations the /var/lib/ossec directory is not a directory
they can chroot into since there are symbolic links pointing
out of it.
.
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ossec/pkg-ossec.git
More information about the Pkg-ossec-devel
mailing list