From afb4833675ac046fb4efe875790dec2c983430ce Mon Sep 17 00:00:00 2001 From: BraulioV Date: Mon, 19 Feb 2018 15:06:34 +0100 Subject: [PATCH] Debian files for Wazuh 3.2.0 --- debs/generate_wazuh_master.sh | 4 ++-- debs/wazuh-agent/debian/changelog | 7 +++++++ debs/wazuh-agent/debian/copyright | 1 + debs/wazuh-agent/debian/postinst | 3 +++ debs/wazuh-agent/debian/preinst | 2 +- debs/wazuh-api/debian/changelog | 7 +++++++ debs/wazuh-api/debian/control | 2 +- debs/wazuh-api/debian/copyright | 1 + debs/wazuh-api/debian/postinst | 7 +++++-- debs/wazuh-manager/debian/changelog | 7 +++++++ debs/wazuh-manager/debian/copyright | 1 + debs/wazuh-manager/debian/postinst | 11 ++++++++++- debs/wazuh-manager/debian/preinst | 4 ++++ 13 files changed, 50 insertions(+), 7 deletions(-) diff --git a/debs/generate_wazuh_master.sh b/debs/generate_wazuh_master.sh index e1e004ec40..1a5c5ca48d 100644 --- a/debs/generate_wazuh_master.sh +++ b/debs/generate_wazuh_master.sh @@ -21,8 +21,8 @@ # CONFIGURATION VARIABLES # -wazuh_major='3.1' -wazuh_version='3.1.0' +wazuh_major='3.2' +wazuh_version='3.2.0' # source_file="${wazuh_major}.zip" source_file="v${wazuh_version}.zip" diff --git a/debs/wazuh-agent/debian/changelog b/debs/wazuh-agent/debian/changelog index 95cedb3413..a6d870d6cf 100644 --- a/debs/wazuh-agent/debian/changelog +++ b/debs/wazuh-agent/debian/changelog @@ -1,3 +1,10 @@ +wazuh-agent (3.2.0) stable; urgency=low + + * More info: https://documentation.wazuh.com/current/release-notes/ + + -- Wazuh, Inc Thu, 11 Dec 2017 15:19:24 +0000 + + wazuh-agent (3.1.0) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/ diff --git a/debs/wazuh-agent/debian/copyright b/debs/wazuh-agent/debian/copyright index 8b32cecfe9..d23af3f22a 100644 --- a/debs/wazuh-agent/debian/copyright +++ b/debs/wazuh-agent/debian/copyright @@ -20,6 +20,7 @@ Upstream Authors: pedro@wazuh.com jose@wazuh.com ernesto@wazuh.com + braulio@wazuh.com Copyright: diff --git a/debs/wazuh-agent/debian/postinst b/debs/wazuh-agent/debian/postinst index 4d52b1d537..4df7793294 100755 --- a/debs/wazuh-agent/debian/postinst +++ b/debs/wazuh-agent/debian/postinst @@ -80,6 +80,9 @@ case "$1" in # Service if [ -f /etc/init.d/wazuh-agent ]; then + if [ -d /run/systemd/system ]; then + systemctl enable wazuh-agent > /dev/null 2>&1 + fi update-rc.d wazuh-agent defaults > /dev/null 2>&1 fi if cat ${DIR}etc/ossec.conf | grep -o -P '(?<=).*(?=)' | grep -E '^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$' > /dev/null 2>&1; then diff --git a/debs/wazuh-agent/debian/preinst b/debs/wazuh-agent/debian/preinst index 1b8d05aaa3..bbc345d56c 100755 --- a/debs/wazuh-agent/debian/preinst +++ b/debs/wazuh-agent/debian/preinst @@ -14,7 +14,7 @@ fi case "$1" in install|upgrade) - + if [ -z "$2" ] then if [ -f ${DIR}/etc/ossec.conf ]; then diff --git a/debs/wazuh-api/debian/changelog b/debs/wazuh-api/debian/changelog index b77f19a36b..c5b8d7a101 100644 --- a/debs/wazuh-api/debian/changelog +++ b/debs/wazuh-api/debian/changelog @@ -1,3 +1,10 @@ +wazuh-api (3.2.0) stable; urgency=low + + * More info: https://documentation.wazuh.com/current/release-notes/ + + -- Wazuh, Inc Thu, 11 Dec 2017 15:19:24 +0000 + + wazuh-api (3.1.0) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/ diff --git a/debs/wazuh-api/debian/control b/debs/wazuh-api/debian/control index ac6d3ca0ed..304f56207e 100644 --- a/debs/wazuh-api/debian/control +++ b/debs/wazuh-api/debian/control @@ -8,5 +8,5 @@ Homepage: http://www.wazuh.com Package: wazuh-api Architecture: any -Depends: ${shlibs:Depends}, npm, nodejs (>= 4.6.1), wazuh-manager (>= 3.0.0), curl +Depends: ${shlibs:Depends}, npm, nodejs (>= 4.6.1), wazuh-manager (>= 3.2.0), curl Description: Wazuh API is an open source RESTful API to interact with OSSEC from your own application or with a simple web browser or tools like cURL. diff --git a/debs/wazuh-api/debian/copyright b/debs/wazuh-api/debian/copyright index 24e092d30f..86270c7d91 100644 --- a/debs/wazuh-api/debian/copyright +++ b/debs/wazuh-api/debian/copyright @@ -13,6 +13,7 @@ Upstream Authors: jose@wazuh.com jesus@wazuh.com ernesto@wazuh.com + braulio@wazuh.com Copyright: diff --git a/debs/wazuh-api/debian/postinst b/debs/wazuh-api/debian/postinst index f258f19fae..cf34d43e23 100755 --- a/debs/wazuh-api/debian/postinst +++ b/debs/wazuh-api/debian/postinst @@ -35,6 +35,9 @@ case "$1" in fi if [ -x /etc/init.d/wazuh-api ]; then + if [ -d /run/systemd/system ]; then + systemctl enable wazuh-api > /dev/null 2>&1 + fi update-rc.d wazuh-api defaults > /dev/null 2>&1 fi @@ -62,9 +65,9 @@ case "$1" in rm -r ${OSSEC_HIDS_TMP_DIR} fi if [ -n "$(ps -e | egrep ^\ *1\ .*systemd$)" ]; then - systemctl daemon-reload > /dev/null 2>&1 + systemctl daemon-reload > /dev/null 2>&1 systemctl restart wazuh-api.service > /dev/null 2>&1 - + fi if [ -n "$(ps -e | egrep ^\ *1\ .*init$)" ]; then service wazuh-api restart > /dev/null 2>&1 diff --git a/debs/wazuh-manager/debian/changelog b/debs/wazuh-manager/debian/changelog index 6d1dad7de9..fb04db7241 100644 --- a/debs/wazuh-manager/debian/changelog +++ b/debs/wazuh-manager/debian/changelog @@ -1,3 +1,10 @@ +wazuh-manager (3.2.0) stable; urgency=low + + * More info: https://documentation.wazuh.com/current/release-notes/ + + -- Wazuh, Inc Thu, 11 Dec 2017 15:19:24 +0000 + + wazuh-manager (3.1.0) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/ diff --git a/debs/wazuh-manager/debian/copyright b/debs/wazuh-manager/debian/copyright index 8b32cecfe9..d23af3f22a 100644 --- a/debs/wazuh-manager/debian/copyright +++ b/debs/wazuh-manager/debian/copyright @@ -20,6 +20,7 @@ Upstream Authors: pedro@wazuh.com jose@wazuh.com ernesto@wazuh.com + braulio@wazuh.com Copyright: diff --git a/debs/wazuh-manager/debian/postinst b/debs/wazuh-manager/debian/postinst index 022614b498..95d0ac0a66 100755 --- a/debs/wazuh-manager/debian/postinst +++ b/debs/wazuh-manager/debian/postinst @@ -106,6 +106,7 @@ case "$1" in # Remove existing SQLite databases rm -f ${DIR}var/db/global.db* || true + rm -f ${DIR}var/db/cluster.db* || true rm -f ${DIR}var/db/.profile.db* || true rm -f ${DIR}var/db/agents/* || true @@ -133,7 +134,6 @@ case "$1" in mv "${DIR}ossec/etc/shared/agent.conf" "${DIR}ossec/etc/shared/default/agent.conf " fi - # For the etc dir if [ -f /etc/localtime ]; then cp -pL /etc/localtime ${DIR}etc/; @@ -192,6 +192,9 @@ case "$1" in touch ${DIR}etc/client.keys touch ${DIR}etc/shared/default/* + chmod 770 /var/ossec/etc/lists + chmod 770 /var/ossec/etc/lists/amazon + chmod 660 /var/ossec/etc/lists/amazon/* # Delete old service if [ -e /etc/init.d/ossec ]; then @@ -217,7 +220,13 @@ case "$1" in # Service if [ -x /etc/init.d/wazuh-manager ]; then + if [ -d /run/systemd/system ]; then + systemctl daemon-reload + systemctl enable wazuh-manager > /dev/null 2>&1 + fi + update-rc.d wazuh-manager defaults > /dev/null 2>&1 + if ${DIR}bin/ossec-logtest -t 2>/dev/null ; then service wazuh-manager restart else diff --git a/debs/wazuh-manager/debian/preinst b/debs/wazuh-manager/debian/preinst index dcde58bc22..70f7ad188f 100755 --- a/debs/wazuh-manager/debian/preinst +++ b/debs/wazuh-manager/debian/preinst @@ -94,6 +94,10 @@ case "$1" in cp -p ${DIR}/etc/ossec.conf ${OSSEC_HIDS_TMP_DIR}/ossec.conf fi + if [ -d ${DIR}/var/db/agents ]; then + rm -f ${DIR}/var/db/agents/* + fi + ;; abort-upgrade)