Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Changes in check for systemd #269

Open
wants to merge 14 commits into
base: master
Choose a base branch
from
Open

Changes in check for systemd #269

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
0c7cb26
Changed check for systemd
DFolchA Aug 22, 2019
d973296
Fixed missing []
DFolchA Aug 22, 2019
1669231
Adapt to sh syntax
DFolchA Aug 22, 2019
dc86f0e
Aplied postinstall changes to manager
DFolchA Aug 23, 2019
70a8c5c
Merge branch 'master' of https://github.com/wazuh/wazuh-packages into…
DFolchA Aug 23, 2019
125fe42
Aply changes in postinstallation script to manager and reverted chang…
DFolchA Aug 23, 2019
aca0c5d
Apply same changes to postremove
DFolchA Sep 2, 2019
7d74842
Included changes in manager postinstallation script into 3.11.0 SPECS
DFolchA Sep 9, 2019
b331dac
Included changes in agent postinstallation script into 3.11.0 SPECS
DFolchA Sep 9, 2019
0961e33
Revert 3.10.0 changes
DFolchA Sep 23, 2019
84e8454
Delete spaces that were not needed
DFolchA Sep 23, 2019
4ee1ba3
Merge branch 'master' of https://github.com/wazuh/wazuh-packages into…
DFolchA Jan 24, 2020
6765088
Fix mistake with "
DFolchA Jan 24, 2020
83a6352
Remove changes from old files
DFolchA Jan 27, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion debs/SPECS/3.10.0/wazuh-agent/debian/postrm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ case "$1" in
rm -rf ${WAZUH_TMP_DIR}
fi

if [ -d /run/systemd/system ] ; then
if [ -d /run/systemd/system ]; then
systemctl disable wazuh-agent > /dev/null 2>&1
systemctl daemon-reload
systemctl reset-failed
Expand Down
2 changes: 0 additions & 2 deletions debs/SPECS/3.10.0/wazuh-manager/debian/postrm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,6 @@ case "$1" in
rm -rf ${WAZUH_TMP_DIR}
fi



if [ -d /run/systemd/system ] ; then
systemctl disable wazuh-manager > /dev/null 2>&1
systemctl daemon-reload
Expand Down
2 changes: 1 addition & 1 deletion debs/SPECS/3.11.0/wazuh-agent/debian/postinst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ case "$1" in

# Service
if [ -f /etc/init.d/wazuh-agent ]; then
if [ -d /run/systemd/system ]; then
if [ ! -z "$(file /sbin/init |grep "systemd")" ]; then
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Question: what about to use:
if [ ! -z "$(file /sbin/init |grep 'systemd')" ]; then
instead?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done in 6765088

systemctl enable wazuh-agent > /dev/null 2>&1
fi
update-rc.d wazuh-agent defaults > /dev/null 2>&1
Expand Down
3 changes: 2 additions & 1 deletion debs/SPECS/3.11.0/wazuh-agent/debian/postrm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@ case "$1" in
rm -rf ${WAZUH_TMP_DIR}
fi

if [ -d /run/systemd/system ] ; then

if [ ! -z "$(file /sbin/init |grep "systemd")" ]; then
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same https://github.com/wazuh/wazuh-packages/pull/269/files#r370579928

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done in 6765088

systemctl disable wazuh-agent > /dev/null 2>&1
systemctl daemon-reload
systemctl reset-failed
Expand Down
2 changes: 1 addition & 1 deletion debs/SPECS/3.11.0/wazuh-manager/debian/postinst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,7 @@ case "$1" in

# Service
if [ -x /etc/init.d/wazuh-manager ]; then
if [ -d /run/systemd/system ]; then
if [ ! -z "$(file /sbin/init |grep "systemd")" ]; then
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same https://github.com/wazuh/wazuh-packages/pull/269/files#r370579928

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done in 6765088

systemctl daemon-reload
systemctl enable wazuh-manager > /dev/null 2>&1
fi
Expand Down
2 changes: 1 addition & 1 deletion debs/SPECS/3.11.0/wazuh-manager/debian/postrm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ case "$1" in



if [ -d /run/systemd/system ] ; then
if [ ! -z "$(file /sbin/init |grep "systemd")" ]; then
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same https://github.com/wazuh/wazuh-packages/pull/269/files#r370579928

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done in 6765088

systemctl disable wazuh-manager > /dev/null 2>&1
systemctl daemon-reload
systemctl reset-failed
Expand Down