Skip to content

Commit

Permalink
PR changes
Browse files Browse the repository at this point in the history
  • Loading branch information
@c-bordon
c-bordon committed Apr 19, 2022
1 parent 10cb4e0 commit c77ab55
Show file tree
Hide file tree
Showing 4 changed files with 59 additions and 81 deletions.
12 changes: 5 additions & 7 deletions unattended_installer/common_functions/common.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,11 @@ function common_logger() {
done
fi

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"
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

Expand Down
21 changes: 9 additions & 12 deletions unattended_installer/install_functions/installMain.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,20 +78,27 @@ function main() {
getHelp
fi

arguments=( $@ )
for a in ${arguments[@]}; do
if [ "${a}" != "-dw" ] && [ "${a}" != "--download-wazuh" ] && [ "${a}" != "-V" ] && [ "${a}" != "-h" ]; then
if [[ "${a}" == -* ]]; then
common_checkRoot
fi
fi
done

while [ -n "${1}" ]
do
case "${1}" in
"-a"|"--all-in-one")
AIO=1
common_checkRoot
shift 1
;;
"-ds"|"--disable-spinner")
disableSpinner=1
shift 1
;;
"-c"|"--configfile")
common_checkRoot
if [ -z "${2}" ]; then
common_logger -e "Error on arguments. Probably missing <path-to-config-yml> after -c|--configfile"
getHelp
Expand All @@ -102,35 +109,29 @@ function main() {
shift 2
;;
"-F"|"--force-dashboard")
common_checkRoot
force=1
shift 1
;;
"-g"|"--generate-configurations")
common_checkRoot
configurations=1
shift 1
;;
"-h"|"--help")
getHelp
;;
"-i"|"--ignore-check")
common_checkRoot
ignore=1
shift 1
;;
"-o"|"--overwrite")
common_checkRoot
overwrite=1
shift 1
;;
"-s"|"--start-cluster")
common_checkRoot
start_indexer_cluster=1
shift 1
;;
"-t"|"--tar")
common_checkRoot
if [ -z "${2}" ]; then
common_logger -e "Error on arguments. Probably missing <path-to-certs-tar> after -t|--tar"
getHelp
Expand All @@ -141,7 +142,6 @@ function main() {
shift 2
;;
"-u"|"--uninstall")
common_checkRoot
uninstall=1
shift 1
;;
Expand All @@ -155,7 +155,6 @@ function main() {
shift 1
;;
"-wd"|"--wazuh-dashboard")
common_checkRoot
if [ -z "${2}" ]; then
common_logger -e "Error on arguments. Probably missing <node-name> after -wd|---wazuh-dashboard"
getHelp
Expand All @@ -166,7 +165,6 @@ function main() {
shift 2
;;
"-wi"|"--wazuh-indexer")
common_checkRoot
if [ -z "${2}" ]; then
common_logger -e "Arguments contain errors. Probably missing <node-name> after -wi|--wazuh-indexer."
getHelp
Expand All @@ -177,7 +175,6 @@ function main() {
shift 2
;;
"-ws"|"--wazuh-server")
common_checkRoot
if [ -z "${2}" ]; then
common_logger -e "Error on arguments. Probably missing <node-name> after -ws|--wazuh-server"
getHelp
Expand Down
36 changes: 18 additions & 18 deletions unattended_installer/install_functions/installVariables.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ readonly repository="pre-release" #use 4.x for production

## Links and paths to resources
readonly resources="https://${bucket}/${wazuh_major}"
readonly BASE_URL="https://${bucket}/${repository}"
readonly base_url="https://${bucket}/${repository}"
readonly base_path="$(dirname $(readlink -f "$0"))"
config_file="${base_path}/config.yml"
readonly tar_file_name="wazuh-install-files.tar"
Expand All @@ -33,20 +33,20 @@ readonly logfile="/var/log/wazuh-install.log"
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 FILEBEAT_DEB_BASE_URL="${BASE_URL}/apt/pool/main/f/filebeat"
readonly FILEBEAT_DEB_PACKAGES="filebeat-oss-${filebeat_version}-amd64.deb"
readonly INDEXER_DEB_BASE_URL="${BASE_URL}/apt/pool/main/w/wazuh-indexer"
readonly INDEXER_DEB_PACKAGES="wazuh-indexer_${wazuh_version}-${wazuh_revision}_amd64.deb"
readonly DASHBOARD_DEB_BASE_URL="${BASE_URL}/apt/pool/main/w/wazuh-dashboard"
readonly DASHBOARD_DEB_PACKAGES="wazuh-dashboard_${wazuh_version}-${wazuh_revision}_amd64.deb"
readonly WAZUH_RPM_BASE_URL="${BASE_URL}/yum"
readonly WAZUH_RPM_PACKAGES="wazuh-manager-${wazuh_version}-${wazuh_revision}.x86_64.rpm"
readonly FILEBEAT_RPM_BASE_URL="${BASE_URL}/yum"
readonly FILEBEAT_RPM_PACKAGES="filebeat-oss-${filebeat_version}-x86_64.rpm"
readonly INDEXER_RPM_BASE_URL="${BASE_URL}/yum"
readonly INDEXER_RPM_PACKAGES="wazuh-indexer-${wazuh_version}-${wazuh_revision}.x86_64.rpm"
readonly DASHBOARD_RPM_BASE_URL="${BASE_URL}/yum"
readonly DASHBOARD_RPM_PACKAGES="wazuh-dashboard-${wazuh_version}-${wazuh_revision}.x86_64.rpm"
readonly base_dest_folder="wazuh-offline"
readonly manager_deb_base_url="${base_url}/apt/pool/main/w/wazuh-manager"
readonly manager_deb_package="wazuh-manager_${wazuh_version}-${wazuh_revision}_amd64.deb"
readonly filebeat_deb_base_url="${base_url}/apt/pool/main/f/filebeat"
readonly filebeat_deb_package="filebeat-oss-${filebeat_version}-amd64.deb"
readonly indexer_deb_base_url="${base_url}/apt/pool/main/w/wazuh-indexer"
readonly indexer_deb_package="wazuh-indexer_${wazuh_version}-${wazuh_revision}_amd64.deb"
readonly dashboard_deb_base_url="${base_url}/apt/pool/main/w/wazuh-dashboard"
readonly dashboard_deb_package="wazuh-dashboard_${wazuh_version}-${wazuh_revision}_amd64.deb"
readonly manager_rpm_base_url="${base_url}/yum"
readonly manager_rpm_package="wazuh-manager-${wazuh_version}-${wazuh_revision}.x86_64.rpm"
readonly filebeat_rpm_base_url="${base_url}/yum"
readonly filebeat_rpm_package="filebeat-oss-${filebeat_version}-x86_64.rpm"
readonly indexer_rpm_base_url="${base_url}/yum"
readonly indexer_rpm_package="wazuh-indexer-${wazuh_version}-${wazuh_revision}.x86_64.rpm"
readonly dashboard_rpm_base_url="${base_url}/yum"
readonly dashboard_rpm_package="wazuh-dashboard-${wazuh_version}-${wazuh_revision}.x86_64.rpm"
71 changes: 27 additions & 44 deletions unattended_installer/install_functions/wazuh-offline-download.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,95 +14,78 @@ function offline_download() {

common_logger "Downloading Wazuh ${package_type} packages for ${arch}..."

DEST_PATH="${BASE_DEST_FOLDER}/wazuh-packages"
dest_path="${base_dest_folder}/wazuh-packages"

if [ -d ${DEST_PATH} ]; then
eval "rm -f ${VERBOSE} ${DEST_PATH}/*" # Clean folder before downloading specific versions
eval "chmod 700 ${DEST_PATH}"
if [ -d ${dest_path} ]; then
eval "rm -f ${dest_path}/*" # Clean folder before downloading specific versions
eval "chmod 700 ${dest_path}"
else
eval "mkdir -m700 -p ${DEST_PATH}" # Create folder if it does not exist
eval "mkdir -m700 -p ${dest_path}" # Create folder if it does not exist
fi

case "${package_type}" in
"deb")
for p in ${WAZUH_DEB_PACKAGES[@]}; do
# Download packages for Wazuh
eval "curl -so ${DEST_PATH}/$p ${WAZUH_DEB_BASE_URL}/$p"
eval "curl -so ${dest_path}/${manager_deb_package} ${wazuh_deb_base_url}/${manager_deb_package}"
common_logger "Wazuh deb package downloaded"
done

for p in ${FILEBEAT_DEB_PACKAGES[@]}; do
# Download packages for Filebeat
eval "curl -so ${DEST_PATH}/$p ${FILEBEAT_DEB_BASE_URL}/$p"
eval "curl -so ${dest_path}/${filebeat_deb_package} ${filebeat_deb_base_url}/${filebeat_deb_package}"
common_logger "Filebeat deb package downloaded"
done
for p in ${INDEXER_DEB_PACKAGES[@]}; do
# Download packages for Wazuh Indexer
eval "curl -so ${DEST_PATH}/$p ${INDEXER_DEB_BASE_URL}/$p"
eval "curl -so ${dest_path}/${indexer_deb_package} ${indexer_deb_base_url}/${indexer_deb_package}"
common_logger "Wazuh Indexer deb package downloaded"
done
for p in ${DASHBOARD_DEB_PACKAGES[@]}; do
# Download packages for Wazuh Dashboard
eval "curl -so ${DEST_PATH}/$p ${DASHBOARD_DEB_BASE_URL}/$p"
eval "curl -so ${dest_path}/${dashboard_deb_package} ${dashboard_deb_base_url}/${dashboard_deb_package}"
common_logger "Wazuh Dashboard deb package downloaded"
done
;;
"rpm")
for p in ${WAZUH_RPM_PACKAGES[@]}; do
# Download packages for Wazuh
eval "curl -so ${DEST_PATH}/$p ${WAZUH_RPM_BASE_URL}/$p"
eval "curl -so ${dest_path}/${manager_rpm_package} ${wazuh_rpm_base_url}/${manager_rpm_package}"
common_logger "Wazuh rpm package downloaded"
done
for p in ${FILEBEAT_RPM_PACKAGES[@]}; do
# Download packages for Filebeat
eval "curl -so ${DEST_PATH}/$p ${FILEBEAT_RPM_BASE_URL}/$p"
eval "curl -so ${dest_path}/${filebeat_rpm_package} ${filebeat_rpm_base_url}/${filebeat_rpm_package}"
common_logger "Filebeat rpm package downloaded"
done
for p in ${INDEXER_RPM_PACKAGES[@]}; do
# Download packages for Wazuh Indexer
eval "curl -so ${DEST_PATH}/$p ${INDEXER_RPM_BASE_URL}/$p"
eval "curl -so ${dest_path}/${indexer_rpm_package} ${indexer_rpm_base_url}/${indexer_rpm_package}"
common_logger "Wazuh Indexer rpm package downloaded"
done
for p in ${DASHBOARD_RPM_PACKAGES[@]}; do
# Download packages for Wazuh Dashboard
eval "curl -so ${DEST_PATH}/$p ${DASHBOARD_RPM_BASE_URL}/$p"
eval "curl -so ${dest_path}/${dashboard_rpm_package} ${dashboard_rpm_base_url}/${dashboard_rpm_package}"
common_logger "Wazuh Dashboard rpm package downloaded"
done
;;
*)
print_unknown_args
exit 0
;;
esac

common_logger "The packages are in ${DEST_PATH}"
common_logger "The packages are in ${dest_path}"

common_logger "Downloading Configuration Files"

DEST_PATH="${BASE_DEST_FOLDER}/wazuh-files"
dest_path="${base_dest_folder}/wazuh-files"

if [ -d ${DEST_PATH} ]; then
eval "rm -f ${VERBOSE} ${DEST_PATH}/*" # Clean folder before downloading specific versions
eval "chmod 700 ${DEST_PATH}"
if [ -d ${dest_path} ]; then
eval "rm -f ${dest_path}/*" # Clean folder before downloading specific versions
eval "chmod 700 ${dest_path}"
else
eval "mkdir -m700 -p ${DEST_PATH}" # Create folder if it does not exist
eval "mkdir -m700 -p ${dest_path}" # Create folder if it does not exist
fi

eval "curl -so ${DEST_PATH}/GPG-KEY-WAZUH https://packages.wazuh.com/key/GPG-KEY-WAZUH"
eval "curl -so ${dest_path}/GPG-KEY-WAZUH https://packages.wazuh.com/key/GPG-KEY-WAZUH"

eval "curl -so ${DEST_PATH}/filebeat.yml ${resources}/tpl/wazuh/filebeat/filebeat.yml"
eval "curl -so ${dest_path}/filebeat.yml ${resources}/tpl/wazuh/filebeat/filebeat.yml"

eval "curl -so ${DEST_PATH}/wazuh-template.json https://raw.githubusercontent.com/wazuh/wazuh/${wazuh_major}/extensions/elasticsearch/7.x/wazuh-template.json"
eval "curl -so ${dest_path}/wazuh-template.json https://raw.githubusercontent.com/wazuh/wazuh/${wazuh_major}/extensions/elasticsearch/7.x/wazuh-template.json"

eval "curl -so ${DEST_PATH}/wazuh-filebeat-module.tar.gz ${BASE_URL}/filebeat/wazuh-filebeat-0.1.tar.gz"
eval "curl -so ${dest_path}/wazuh-filebeat-module.tar.gz ${base_url}/filebeat/wazuh-filebeat-0.1.tar.gz"

eval "chmod 500 ${BASE_DEST_FOLDER}"
eval "chmod 500 ${base_dest_folder}"

common_logger "The Configuration Files are in ${DEST_PATH}"
common_logger "The Configuration Files are in ${dest_path}"

eval "tar -czf ${BASE_DEST_FOLDER}.tar.gz ${BASE_DEST_FOLDER}"
eval "tar -czf ${base_dest_folder}.tar.gz ${base_dest_folder}"

eval "chmod -R 700 ${BASE_DEST_FOLDER} && rm -rf ${BASE_DEST_FOLDER}"
eval "chmod -R 700 ${base_dest_folder} && rm -rf ${base_dest_folder}"

common_logger "You can follow the installation guide here https://documentation.wazuh.com/current/installation-guide/more-installation-alternatives/offline-installation.html"

Expand Down

0 comments on commit c77ab55

Please sign in to comment.