Removing root requirement for download option from Wazuh installation assistant and other improvements #1465
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
alberpilot
suggested changes
Apr 19, 2022
|
|
||
| curl -so ${DEST_PATH}/wazuh-filebeat-module.tar.gz ${BASE_URL}/filebeat/wazuh-filebeat-0.1.tar.gz | ||
| eval "chmod 500 ${BASE_DEST_FOLDER}" | ||
|
|
||
| common_logger "The Configuration Files are in ${DEST_PATH}" |
Comment on lines
39
to
46
| if [ "$EUID" -eq 0 ]; then | ||
| if [ -z "${debugLogger}" ] || ( [ -n "${debugLogger}" ] && [ -n "${debugEnabled}" ] ); then | ||
| printf "${now} ${mtype} ${message}\n" | tee -a ${logfile} | ||
| fi | ||
| else | ||
| if [ -z "${debugLogger}" ] || ( [ -n "${debugLogger}" ] && [ -n "${debugEnabled}" ] ); then | ||
| printf "${now} ${mtype} ${message}\n" | ||
| fi |
There was a problem hiding this comment.
This code can be simplified by:
if [ -z "${debugLogger}" ] || ( [ -n "${debugLogger}" ] && [ -n "${debugEnabled}" ] ); then
if [ "$EUID" -eq 0 ]; then
printf "${now} ${mtype} ${message}\n" | tee -a ${logfile}
else
printf "${now} ${mtype} ${message}\n"
fi
fi
| @@ -85,13 +83,15 @@ function main() { | |||
| case "${1}" in | |||
| "-a"|"--all-in-one") | |||
| AIO=1 | |||
| common_checkRoot | |||
There was a problem hiding this comment.
Instead of repeat common_checkRoot make a function with a loop that finds the option -dw inside the arguments array. If it doesn't exist, then make the common_checkRoot call.
This option has to be attached with a flag check: -V, -h has to be used alone, and probably -dw too.
| @@ -35,18 +35,18 @@ debug=">> ${logfile} 2>&1" | |||
| ## Offline Installation vars | |||
| readonly BASE_DEST_FOLDER="wazuh-offline" | |||
| readonly WAZUH_DEB_BASE_URL="${BASE_URL}/apt/pool/main/w/wazuh-manager" | |||
| readonly WAZUH_DEB_PACKAGES=( "wazuh-manager_${wazuh_version}-${wazuh_revision}_amd64.deb" ) | |||
| readonly WAZUH_DEB_PACKAGES="wazuh-manager_${wazuh_version}-${wazuh_revision}_amd64.deb" | |||
There was a problem hiding this comment.
Instead WAZUH_DEB_PACKAGES it should be MANAGER_DEB_PACKAGE, right?
Also, it could be a good idea to remove the plural of variable names that only have one element.
|
New tests: |
alberpilot
changed the title
|
New Tests: |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Logs example
root tests:
Tests
Ubuntu: https://devel.ci.wazuh.info/view/Tests/job/Test_unattended/523/console
Centos: https://devel.ci.wazuh.info/view/Tests/job/Test_unattended/526/console
Distributed: https://devel.ci.wazuh.info/view/Tests/job/Test_unattended_distributed/442/console