From 8036462ae9067ff6afc69dd48371bfcf488a54f4 Mon Sep 17 00:00:00 2001 From: miguelfdez99 Date: Wed, 22 Jun 2022 12:32:11 +0200 Subject: [PATCH 1/5] Changed config.yml to wazuh-config.yml --- .gitignore | 2 +- stack/dashboard/rpm/wazuh-dashboard.spec | 2 +- stack/indexer/deb/debian/rules | 6 ++--- stack/indexer/rpm/wazuh-indexer.spec | 6 ++--- .../unit/suites/test-certFunctions.sh | 26 +++++++++---------- .../unit/suites/test-installCommon.sh | 6 ++--- .../cert_tool/certFunctions.sh | 4 +-- .../cert_tool/certVariables.sh | 2 +- .../{config.yml => wazuh-config.yml} | 0 .../install_functions/checks.sh | 2 +- .../install_functions/installCommon.sh | 9 ++++--- .../install_functions/installMain.sh | 6 ++--- .../install_functions/installVariables.sh | 4 +-- 13 files changed, 38 insertions(+), 37 deletions(-) rename unattended_installer/config/certificate/{config.yml => wazuh-config.yml} (100%) diff --git a/.gitignore b/.gitignore index 06622ad57b..8b6d1561ee 100644 --- a/.gitignore +++ b/.gitignore @@ -31,7 +31,7 @@ solaris/packer/sol-10-u11-ga-x86-dvd.iso solaris/packer/sol-11_3-text-x86.iso unattended_installer/certs* unattended_installer/configurations* -unattended_installer/config.yml +unattended_installer/wazuh-config.yml unattended_installer/.vscode unattended_installer/wazuh-install-files* unattended_installer/wazuh-install.sh diff --git a/stack/dashboard/rpm/wazuh-dashboard.spec b/stack/dashboard/rpm/wazuh-dashboard.spec index 21a2225c5a..35af953252 100644 --- a/stack/dashboard/rpm/wazuh-dashboard.spec +++ b/stack/dashboard/rpm/wazuh-dashboard.spec @@ -336,7 +336,7 @@ rm -fr %{buildroot} %attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/cli/cli.js" %attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/cli/serve/serve.js" %attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/cli/serve/read_keystore.js" -%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/cli/serve/integration_tests/__fixtures__/invalid_config.yml" +%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/cli/serve/integration_tests/__fixtures__/invalid_wazuh-config.yml" %attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/cli/serve/integration_tests/__fixtures__/reload_logging_config/opensearch_dashboards_log_file.test.yml" %attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/cli/serve/integration_tests/__fixtures__/reload_logging_config/opensearch_dashboards_log_console.test.yml" %attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/cli/serve/integration_tests/__fixtures__/reload_logging_config/opensearch_dashboards.test.yml" diff --git a/stack/indexer/deb/debian/rules b/stack/indexer/deb/debian/rules index a971f42469..285a82f1c1 100644 --- a/stack/indexer/deb/debian/rules +++ b/stack/indexer/deb/debian/rules @@ -101,7 +101,7 @@ override_dh_install: # Copy the security tools cp $(REPO_DIR)/wazuh-certs-tool.sh $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/tools/ cp $(REPO_DIR)/wazuh-passwords-tool.sh $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/tools/ - cp /root/documentation-templates/wazuh/config.yml $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/tools/config.yml + cp /root/documentation-templates/wazuh/wazuh-config.yml $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/tools/wazuh-config.yml # Copy Wazuh's config files for the security plugin cp -pr $(REPO_DIR)/config/indexer/roles/roles_mapping.yml $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/securityconfig/ @@ -492,7 +492,7 @@ override_dh_fixperms: chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/securityconfig/nodes_dn.yml chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/securityconfig/audit.yml chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/securityconfig/action_groups.yml - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/securityconfig/config.yml + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/securityconfig/wazuh-config.yml chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/securityconfig/roles_mapping.yml chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/securityconfig/roles.yml chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/securityconfig/opensearch.yml.example @@ -506,7 +506,7 @@ override_dh_fixperms: chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/json-smart-2.4.7.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/xmlsec-2.2.3.jar chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/tools - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/tools/config.yml + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/tools/wazuh-config.yml chmod 740 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/tools/hash.sh chmod 740 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/tools/securityadmin.sh chmod 740 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/tools/audit_config_migrater.sh diff --git a/stack/indexer/rpm/wazuh-indexer.spec b/stack/indexer/rpm/wazuh-indexer.spec index 3610486e62..461e1e3145 100644 --- a/stack/indexer/rpm/wazuh-indexer.spec +++ b/stack/indexer/rpm/wazuh-indexer.spec @@ -91,7 +91,7 @@ cp -pr wazuh-indexer-*/* ${RPM_BUILD_ROOT}%{INSTALL_DIR}/ cp %{REPO_DIR}/wazuh-certs-tool.sh ${RPM_BUILD_ROOT}%{INSTALL_DIR}/plugins/opensearch-security/tools/ cp %{REPO_DIR}/wazuh-passwords-tool.sh ${RPM_BUILD_ROOT}%{INSTALL_DIR}/plugins/opensearch-security/tools/ -cp /root/documentation-templates/wazuh/config.yml ${RPM_BUILD_ROOT}%{INSTALL_DIR}/plugins/opensearch-security/tools/config.yml +cp /root/documentation-templates/wazuh/wazuh-config.yml ${RPM_BUILD_ROOT}%{INSTALL_DIR}/plugins/opensearch-security/tools/wazuh-config.yml cp %{REPO_DIR}/config/indexer/roles/internal_users.yml ${RPM_BUILD_ROOT}%{INSTALL_DIR}/plugins/opensearch-security/securityconfig/ cp %{REPO_DIR}/config/indexer/roles/roles.yml ${RPM_BUILD_ROOT}%{INSTALL_DIR}/plugins/opensearch-security/securityconfig/ @@ -645,7 +645,7 @@ rm -fr %{buildroot} %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/securityconfig/nodes_dn.yml %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/securityconfig/audit.yml %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/securityconfig/action_groups.yml -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/securityconfig/config.yml +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/securityconfig/wazuh-config.yml %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/securityconfig/roles_mapping.yml %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/securityconfig/roles.yml %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/securityconfig/opensearch.yml.example @@ -659,7 +659,7 @@ rm -fr %{buildroot} %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/json-smart-2.4.7.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/xmlsec-2.2.3.jar %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/tools -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/tools/config.yml +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/tools/wazuh-config.yml %attr(740, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/tools/hash.sh %attr(740, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/tools/securityadmin.sh %attr(740, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/tools/audit_config_migrater.sh diff --git a/tests/unattended/unit/suites/test-certFunctions.sh b/tests/unattended/unit/suites/test-certFunctions.sh index 8bd89417f7..c4beb6fbb6 100644 --- a/tests/unattended/unit/suites/test-certFunctions.sh +++ b/tests/unattended/unit/suites/test-certFunctions.sh @@ -232,7 +232,7 @@ test-14-generateKibanacertificates-two-nodes-assert() { function load-cert_readConfig() { @load_function "${base_dir}/wazuh-cert-tool.sh" cert_readConfig - config_file="${base_path}/config.yml" + config_file="${base_path}/wazuh-config.yml" } test-ASSERT-FAIL-15-cert_readConfig-empty-file() { @@ -256,7 +256,7 @@ test-ASSERT-FAIL-17-cert_readConfig-duplicated-elastic-node-names() { @touch "${config_file}" @echo "config_file" > "${config_file}" - @mock cert_parseYaml /tmp/wazuh-cert-tool/config.yml === @out + @mock cert_parseYaml /tmp/wazuh-cert-tool/wazuh-config.yml === @out @mock grep nodes_elasticsearch_name === @out "elastic1 elastic1 elastic2" @mock sed 's/nodes_elasticsearch_name=//' @mock grep nodes_wazuh_servers_name === @out "wazuh1 wazuh2" @@ -303,7 +303,7 @@ test-ASSERT-FAIL-18-cert_readConfig-duplicated-elastic-node-ips() { @touch "${config_file}" @echo "config_file" > "${config_file}" - @mock cert_parseYaml /tmp/wazuh-cert-tool/config.yml === @out + @mock cert_parseYaml /tmp/wazuh-cert-tool/wazuh-config.yml === @out @mock grep nodes_elasticsearch_name === @out "elastic1 elastic2" @mock sed 's/nodes_elasticsearch_name=//' @mock grep nodes_wazuh_servers_name === @out "wazuh1 wazuh2" @@ -350,7 +350,7 @@ test-ASSERT-FAIL-19-cert_readConfig-duplicated-wazuh-node-names() { @touch "${config_file}" @echo "config_file" > "${config_file}" - @mock cert_parseYaml /tmp/wazuh-cert-tool/config.yml === @out + @mock cert_parseYaml /tmp/wazuh-cert-tool/wazuh-config.yml === @out @mock grep nodes_elasticsearch_name === @out "elastic1 elastic2" @mock sed 's/nodes_elasticsearch_name=//' @mock grep nodes_wazuh_servers_name === @out "wazuh1 wazuh2" @@ -396,7 +396,7 @@ test-ASSERT-FAIL-20-cert_readConfig-duplicated-wazuh-node-ips() { @touch "${config_file}" @echo "config_file" > "${config_file}" - @mock cert_parseYaml /tmp/wazuh-cert-tool/config.yml === @out + @mock cert_parseYaml /tmp/wazuh-cert-tool/wazuh-config.yml === @out @mock grep nodes_elasticsearch_name === @out "elastic1 elastic2" @mock sed 's/nodes_elasticsearch_name=//' @mock grep nodes_wazuh_servers_name === @out "wazuh1 wazuh2" @@ -443,7 +443,7 @@ test-ASSERT-FAIL-21-cert_readConfig-duplicated-kibana-node-names() { @touch "${config_file}" @echo "config_file" > "${config_file}" - @mock cert_parseYaml /tmp/wazuh-cert-tool/config.yml === @out + @mock cert_parseYaml /tmp/wazuh-cert-tool/wazuh-config.yml === @out @mock grep nodes_elasticsearch_name === @out "elastic1 elastic2" @mock sed 's/nodes_elasticsearch_name=//' @mock grep nodes_wazuh_servers_name === @out "wazuh1 wazuh2" @@ -490,7 +490,7 @@ test-ASSERT-FAIL-22-cert_readConfig-duplicated-kibana-node-ips() { @touch "${config_file}" @echo "config_file" > "${config_file}" - @mock cert_parseYaml /tmp/wazuh-cert-tool/config.yml === @out + @mock cert_parseYaml /tmp/wazuh-cert-tool/wazuh-config.yml === @out @mock grep nodes_elasticsearch_name === @out "elastic1 elastic2" @mock sed 's/nodes_elasticsearch_name=//' @mock grep nodes_wazuh_servers_name === @out "wazuh1 wazuh2" @@ -536,7 +536,7 @@ test-ASSERT-FAIL-23-cert_readConfig-different-number-of-wazuh-names-and-ips() { @touch "${config_file}" @echo "config_file" > "${config_file}" - @mock cert_parseYaml /tmp/wazuh-cert-tool/config.yml === @out + @mock cert_parseYaml /tmp/wazuh-cert-tool/wazuh-config.yml === @out @mock grep nodes_elasticsearch_name === @out "elastic1 elastic2" @mock sed 's/nodes_elasticsearch_name=//' @mock grep nodes_wazuh_servers_name === @out "wazuh1" @@ -582,7 +582,7 @@ test-ASSERT-FAIL-24-cert_readConfig-incorrect-wazuh-node-type() { @touch "${config_file}" @echo "config_file" > "${config_file}" - @mock cert_parseYaml /tmp/wazuh-cert-tool/config.yml === @out + @mock cert_parseYaml /tmp/wazuh-cert-tool/wazuh-config.yml === @out @mock grep nodes_elasticsearch_name === @out "elastic1 elastic2" @mock sed 's/nodes_elasticsearch_name=//' @mock grep nodes_wazuh_servers_name === @out "wazuh1 wazuh2" @@ -629,7 +629,7 @@ test-ASSERT-FAIL-25-cert_readConfig-wazuh-node-type-one-node() { @touch "${config_file}" @echo "config_file" > "${config_file}" - @mock cert_parseYaml /tmp/wazuh-cert-tool/config.yml === @out + @mock cert_parseYaml /tmp/wazuh-cert-tool/wazuh-config.yml === @out @mock grep nodes_elasticsearch_name === @out "elastic1 elastic2" @mock sed 's/nodes_elasticsearch_name=//' @mock grep nodes_wazuh_servers_name === @out "wazuh1" @@ -675,7 +675,7 @@ test-ASSERT-FAIL-26-cert_readConfig-less-wazuh-node-types-than-nodes() { @touch "${config_file}" @echo "config_file" > "${config_file}" - @mock cert_parseYaml /tmp/wazuh-cert-tool/config.yml === @out + @mock cert_parseYaml /tmp/wazuh-cert-tool/wazuh-config.yml === @out @mock grep nodes_elasticsearch_name === @out "elastic1 elastic2" @mock sed 's/nodes_elasticsearch_name=//' @mock grep nodes_wazuh_servers_name === @out "wazuh1 wazuh2" @@ -722,7 +722,7 @@ test-ASSERT-FAIL-27-cert_readConfig-different-number-of-kibana-names-and-ips() { @touch "${config_file}" @echo "config_file" > "${config_file}" - @mock cert_parseYaml /tmp/wazuh-cert-tool/config.yml === @out + @mock cert_parseYaml /tmp/wazuh-cert-tool/wazuh-config.yml === @out @mock grep nodes_elasticsearch_name === @out "elastic1 elastic2" @mock sed 's/nodes_elasticsearch_name=//' @mock grep nodes_wazuh_servers_name === @out "wazuh1 wazuh2" @@ -769,7 +769,7 @@ test-28-cert_readConfig-everything-correct() { @touch "${config_file}" @echo "config_file" > "${config_file}" - @mock cert_parseYaml /tmp/wazuh-cert-tool/config.yml === @out + @mock cert_parseYaml /tmp/wazuh-cert-tool/wazuh-config.yml === @out @mock grep nodes_elasticsearch_name === @out "elastic1 elastic2" @mock sed 's/nodes_elasticsearch_name=//' @mock grep nodes_wazuh_servers_name === @out "wazuh1 wazuh2" diff --git a/tests/unattended/unit/suites/test-installCommon.sh b/tests/unattended/unit/suites/test-installCommon.sh index 933f434016..5975caed24 100644 --- a/tests/unattended/unit/suites/test-installCommon.sh +++ b/tests/unattended/unit/suites/test-installCommon.sh @@ -26,7 +26,7 @@ test-03-installCommon_getConfig() { @mocktrue echo certificate/config_aio.yml @mock sed 's|/|_|g;s|.yml||' === @out "certificate_config_aio" @mock echo === @echo "Hello World" - installCommon_getConfig certificate/config_aio.yml ./config.yml + installCommon_getConfig certificate/config_aio.yml ./wazuh-config.yml } test-03-installCommon_getConfig-assert() { @@ -39,7 +39,7 @@ test-04-installCommon_getConfig-error() { @mocktrue echo certificate/config_aio.yml @mock sed 's|/|_|g;s|.yml||' === @out "certificate_config_aio" @mock echo === @echo "" - installCommon_getConfig certificate/config_aio.yml ./config.yml + installCommon_getConfig certificate/config_aio.yml ./wazuh-config.yml } test-04-installCommon_getConfig-error-assert() { @@ -908,7 +908,7 @@ test-45-installCommon_createCertificates-aio() { } test-45-installCommon_createCertificates-aio-assert() { - installCommon_getConfig certificate/config_aio.yml /tmp/config.yml + installCommon_getConfig certificate/config_aio.yml /tmp/wazuh-config.yml cert_readConfig diff --git a/unattended_installer/cert_tool/certFunctions.sh b/unattended_installer/cert_tool/certFunctions.sh index 91f7cac1ef..6cb9b8c632 100644 --- a/unattended_installer/cert_tool/certFunctions.sh +++ b/unattended_installer/cert_tool/certFunctions.sh @@ -292,6 +292,6 @@ function cert_convertCRLFtoLF() { mkdir "/tmp/wazuh-install-files" fi eval "chmod -R 755 /tmp/wazuh-install-files ${debug}" - eval "tr -d '\015' < $1 > /tmp/wazuh-install-files/new_config.yml" - eval "mv /tmp/wazuh-install-files/new_config.yml $1" + eval "tr -d '\015' < $1 > /tmp/wazuh-install-files/new_wazuh-config.yml" + eval "mv /tmp/wazuh-install-files/new_wazuh-config.yml $1" } diff --git a/unattended_installer/cert_tool/certVariables.sh b/unattended_installer/cert_tool/certVariables.sh index 57e959bd58..50b311457f 100644 --- a/unattended_installer/cert_tool/certVariables.sh +++ b/unattended_installer/cert_tool/certVariables.sh @@ -7,6 +7,6 @@ # Foundation. readonly base_path="$(dirname "$(readlink -f "$0")")" -readonly config_file="${base_path}/config.yml" +readonly config_file="${base_path}/wazuh-config.yml" readonly logfile="" debug=">> /dev/null 2>&1" \ No newline at end of file diff --git a/unattended_installer/config/certificate/config.yml b/unattended_installer/config/certificate/wazuh-config.yml similarity index 100% rename from unattended_installer/config/certificate/config.yml rename to unattended_installer/config/certificate/wazuh-config.yml diff --git a/unattended_installer/install_functions/checks.sh b/unattended_installer/install_functions/checks.sh index 9948209422..fec6e87cc0 100644 --- a/unattended_installer/install_functions/checks.sh +++ b/unattended_installer/install_functions/checks.sh @@ -234,7 +234,7 @@ function checks_health() { } -# This function ensures different names in the config.yml file. +# This function ensures different names in the wazuh-config.yml file. function checks_names() { if [ -n "${indxname}" ] && [ -n "${dashname}" ] && [ "${indxname}" == "${dashname}" ]; then diff --git a/unattended_installer/install_functions/installCommon.sh b/unattended_installer/install_functions/installCommon.sh index 98256a4727..e6ebd3c9ef 100644 --- a/unattended_installer/install_functions/installCommon.sh +++ b/unattended_installer/install_functions/installCommon.sh @@ -146,10 +146,11 @@ function installCommon_createInstallFiles() { gen_file="/tmp/wazuh-install-files/passwords.wazuh" passwords_generatePasswordFile # Using cat instead of simple cp because OpenSUSE unknown error. - eval "cat '${config_file}' > '/tmp/wazuh-install-files/config.yml'" + eval "cat '${config_file}' > '/tmp/wazuh-install-files/wazuh-config.yml'" eval "chown root:root /tmp/wazuh-install-files/*" eval "tar -zcf '${tar_file}' -C '/tmp/' wazuh-install-files/ ${debug}" eval "rm -rf '/tmp/wazuh-install-files' ${debug}" + eval "rm -rf ${config_file} ${debug}" common_logger "Created ${tar_file_name}. It contains the Wazuh cluster key, certificates, and passwords necessary for installation." else common_logger -e "Unable to create /tmp/wazuh-install-files" @@ -189,11 +190,11 @@ function installCommon_changePasswords() { function installCommon_extractConfig() { - if ! $(tar -tf "${tar_file}" | grep -q wazuh-install-files/config.yml); then - common_logger -e "There is no config.yml file in ${tar_file}." + if ! $(tar -tf "${tar_file}" | grep -q wazuh-install-files/wazuh-config.yml); then + common_logger -e "There is no wazuh-config.yml file in ${tar_file}." exit 1 fi - eval "tar -xf ${tar_file} -C /tmp wazuh-install-files/config.yml ${debug}" + eval "tar -xf ${tar_file} -C /tmp wazuh-install-files/wazuh-config.yml ${debug}" } diff --git a/unattended_installer/install_functions/installMain.sh b/unattended_installer/install_functions/installMain.sh index 41697d3793..649cccf0ab 100755 --- a/unattended_installer/install_functions/installMain.sh +++ b/unattended_installer/install_functions/installMain.sh @@ -20,13 +20,13 @@ function getHelp() { echo -e " Install and configure Wazuh server, Wazuh indexer, Wazuh dashboard." echo -e "" echo -e " -c, --config-file " - echo -e " Path to the configuration file used to generate wazuh-install-files.tar file containing the files that will be needed for installation. By default, the Wazuh installation assistant will search for a file named config.yml in the same path as the script." + echo -e " Path to the configuration file used to generate wazuh-install-files.tar file containing the files that will be needed for installation. By default, the Wazuh installation assistant will search for a file named wazuh-config.yml in the same path as the script." echo -e "" echo -e " -fd, --force-install-dashboard" echo -e " Force Wazuh dashboard installation to continue even when it is not capable of connecting to the Wazuh indexer." echo -e "" echo -e " -g, --generate-config-files" - echo -e " Generate wazuh-install-files.tar file containing the files that will be needed for installation from config.yml. In distributed deployments you will need to copy this file to all hosts." + echo -e " Generate wazuh-install-files.tar file containing the files that will be needed for installation from wazuh-config.yml. In distributed deployments you will need to copy this file to all hosts." echo -e "" echo -e " -h, --help" echo -e " Display this help and exit." @@ -242,7 +242,7 @@ function main() { if [ -z "${configurations}" ] && [ -z "${download}" ]; then installCommon_extractConfig - config_file="/tmp/wazuh-install-files/config.yml" + config_file="/tmp/wazuh-install-files/wazuh-config.yml" cert_readConfig fi diff --git a/unattended_installer/install_functions/installVariables.sh b/unattended_installer/install_functions/installVariables.sh index 9406078292..5be497c568 100644 --- a/unattended_installer/install_functions/installVariables.sh +++ b/unattended_installer/install_functions/installVariables.sh @@ -8,7 +8,7 @@ ## Package vars readonly wazuh_major="4.3" -readonly wazuh_version="4.3.5" +readonly wazuh_version="4.3.4" readonly wazuh_revision_deb="1" readonly wazuh_revision_rpm="1" readonly indexer_revision_deb="1" @@ -22,7 +22,7 @@ readonly wazuh_install_vesion="0.1" readonly resources="https://${bucket}/${wazuh_major}" readonly base_url="https://${bucket}/${repository}" readonly base_path="$(dirname $(readlink -f "$0"))" -config_file="${base_path}/config.yml" +config_file="${base_path}/wazuh-config.yml" readonly tar_file_name="wazuh-install-files.tar" tar_file="${base_path}/${tar_file_name}" From be093c1501e474218af044340e917a3933282d4d Mon Sep 17 00:00:00 2001 From: miguelfdez99 Date: Wed, 22 Jun 2022 12:38:15 +0200 Subject: [PATCH 2/5] Version changed --- unattended_installer/install_functions/installVariables.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/unattended_installer/install_functions/installVariables.sh b/unattended_installer/install_functions/installVariables.sh index 5be497c568..dd1c12ae98 100644 --- a/unattended_installer/install_functions/installVariables.sh +++ b/unattended_installer/install_functions/installVariables.sh @@ -8,7 +8,7 @@ ## Package vars readonly wazuh_major="4.3" -readonly wazuh_version="4.3.4" +readonly wazuh_version="4.3.5" readonly wazuh_revision_deb="1" readonly wazuh_revision_rpm="1" readonly indexer_revision_deb="1" From cc0f4ac2313675fbc00ed2400a4cc72efc5ac391 Mon Sep 17 00:00:00 2001 From: miguelfdez99 Date: Wed, 29 Jun 2022 12:06:19 +0200 Subject: [PATCH 3/5] Improved name style --- stack/dashboard/rpm/wazuh-dashboard.spec | 2 +- unattended_installer/cert_tool/certFunctions.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/stack/dashboard/rpm/wazuh-dashboard.spec b/stack/dashboard/rpm/wazuh-dashboard.spec index 95e084dcfb..45cb8a10e1 100644 --- a/stack/dashboard/rpm/wazuh-dashboard.spec +++ b/stack/dashboard/rpm/wazuh-dashboard.spec @@ -338,7 +338,7 @@ rm -fr %{buildroot} %attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/cli/cli.js" %attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/cli/serve/serve.js" %attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/cli/serve/read_keystore.js" -%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/cli/serve/integration_tests/__fixtures__/invalid_wazuh-config.yml" +%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/cli/serve/integration_tests/__fixtures__/invalid-wazuh-config.yml" %attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/cli/serve/integration_tests/__fixtures__/reload_logging_config/opensearch_dashboards_log_file.test.yml" %attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/cli/serve/integration_tests/__fixtures__/reload_logging_config/opensearch_dashboards_log_console.test.yml" %attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/cli/serve/integration_tests/__fixtures__/reload_logging_config/opensearch_dashboards.test.yml" diff --git a/unattended_installer/cert_tool/certFunctions.sh b/unattended_installer/cert_tool/certFunctions.sh index 6cb9b8c632..7a336eff26 100644 --- a/unattended_installer/cert_tool/certFunctions.sh +++ b/unattended_installer/cert_tool/certFunctions.sh @@ -292,6 +292,6 @@ function cert_convertCRLFtoLF() { mkdir "/tmp/wazuh-install-files" fi eval "chmod -R 755 /tmp/wazuh-install-files ${debug}" - eval "tr -d '\015' < $1 > /tmp/wazuh-install-files/new_wazuh-config.yml" - eval "mv /tmp/wazuh-install-files/new_wazuh-config.yml $1" + eval "tr -d '\015' < $1 > /tmp/wazuh-install-files/new-wazuh-config.yml" + eval "mv /tmp/wazuh-install-files/new-wazuh-config.yml $1" } From 855b5338d7ee13c9b39f73d9b1b60a7e4ff4de9c Mon Sep 17 00:00:00 2001 From: miguelfdez99 Date: Fri, 1 Jul 2022 13:06:48 +0200 Subject: [PATCH 4/5] Rollback --- stack/dashboard/rpm/wazuh-dashboard.spec | 2 +- stack/indexer/deb/debian/rules | 6 +++--- stack/indexer/rpm/wazuh-indexer.spec | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/stack/dashboard/rpm/wazuh-dashboard.spec b/stack/dashboard/rpm/wazuh-dashboard.spec index 433994654b..2473bd036d 100644 --- a/stack/dashboard/rpm/wazuh-dashboard.spec +++ b/stack/dashboard/rpm/wazuh-dashboard.spec @@ -342,7 +342,7 @@ rm -fr %{buildroot} %attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/cli/cli.js" %attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/cli/serve/serve.js" %attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/cli/serve/read_keystore.js" -%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/cli/serve/integration_tests/__fixtures__/invalid-wazuh-config.yml" +%attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/cli/serve/integration_tests/__fixtures__/invalid_config.yml" %attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/cli/serve/integration_tests/__fixtures__/reload_logging_config/opensearch_dashboards_log_file.test.yml" %attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/cli/serve/integration_tests/__fixtures__/reload_logging_config/opensearch_dashboards_log_console.test.yml" %attr(640, %{USER}, %{GROUP}) "%{INSTALL_DIR}/src/cli/serve/integration_tests/__fixtures__/reload_logging_config/opensearch_dashboards.test.yml" diff --git a/stack/indexer/deb/debian/rules b/stack/indexer/deb/debian/rules index 7369f84b77..78b5a2e4ac 100644 --- a/stack/indexer/deb/debian/rules +++ b/stack/indexer/deb/debian/rules @@ -101,7 +101,7 @@ override_dh_install: # Copy the security tools cp $(REPO_DIR)/wazuh-certs-tool.sh $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/tools/ cp $(REPO_DIR)/wazuh-passwords-tool.sh $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/tools/ - cp /root/documentation-templates/wazuh/wazuh-config.yml $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/tools/wazuh-config.yml + cp /root/documentation-templates/wazuh/config.yml $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/tools/config.yml # Copy Wazuh's config files for the security plugin cp -pr $(REPO_DIR)/config/indexer/roles/roles_mapping.yml $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/securityconfig/ @@ -495,7 +495,7 @@ override_dh_fixperms: chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/securityconfig/nodes_dn.yml chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/securityconfig/audit.yml chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/securityconfig/action_groups.yml - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/securityconfig/wazuh-config.yml + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/securityconfig/config.yml chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/securityconfig/roles_mapping.yml chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/securityconfig/roles.yml chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/securityconfig/opensearch.yml.example @@ -509,7 +509,7 @@ override_dh_fixperms: chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/json-smart-2.4.7.jar chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/xmlsec-2.2.3.jar chmod 750 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/tools - chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/tools/wazuh-config.yml + chmod 640 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/tools/config.yml chmod 740 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/tools/hash.sh chmod 740 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/tools/securityadmin.sh chmod 740 $(TARGET_DIR)$(INSTALLATION_DIR)/plugins/opensearch-security/tools/audit_config_migrater.sh diff --git a/stack/indexer/rpm/wazuh-indexer.spec b/stack/indexer/rpm/wazuh-indexer.spec index 1573e4b0c9..13a8ea696d 100755 --- a/stack/indexer/rpm/wazuh-indexer.spec +++ b/stack/indexer/rpm/wazuh-indexer.spec @@ -92,7 +92,7 @@ cp -pr wazuh-indexer-*/* ${RPM_BUILD_ROOT}%{INSTALL_DIR}/ cp %{REPO_DIR}/wazuh-certs-tool.sh ${RPM_BUILD_ROOT}%{INSTALL_DIR}/plugins/opensearch-security/tools/ cp %{REPO_DIR}/wazuh-passwords-tool.sh ${RPM_BUILD_ROOT}%{INSTALL_DIR}/plugins/opensearch-security/tools/ -cp /root/documentation-templates/wazuh/wazuh-config.yml ${RPM_BUILD_ROOT}%{INSTALL_DIR}/plugins/opensearch-security/tools/wazuh-config.yml +cp /root/documentation-templates/wazuh/config.yml ${RPM_BUILD_ROOT}%{INSTALL_DIR}/plugins/opensearch-security/tools/config.yml cp %{REPO_DIR}/config/indexer/roles/internal_users.yml ${RPM_BUILD_ROOT}%{INSTALL_DIR}/plugins/opensearch-security/securityconfig/ cp %{REPO_DIR}/config/indexer/roles/roles.yml ${RPM_BUILD_ROOT}%{INSTALL_DIR}/plugins/opensearch-security/securityconfig/ @@ -650,7 +650,7 @@ rm -fr %{buildroot} %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/securityconfig/nodes_dn.yml %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/securityconfig/audit.yml %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/securityconfig/action_groups.yml -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/securityconfig/wazuh-config.yml +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/securityconfig/config.yml %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/securityconfig/roles_mapping.yml %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/securityconfig/roles.yml %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/securityconfig/opensearch.yml.example @@ -664,7 +664,7 @@ rm -fr %{buildroot} %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/json-smart-2.4.7.jar %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/xmlsec-2.2.3.jar %dir %attr(750, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/tools -%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/tools/wazuh-config.yml +%attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/tools/config.yml %attr(740, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/tools/hash.sh %attr(740, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/tools/securityadmin.sh %attr(740, %{USER}, %{GROUP}) %{INSTALL_DIR}/plugins/opensearch-security/tools/audit_config_migrater.sh From 2f32afd73a31012e90ff16ddbe068ba729d07daa Mon Sep 17 00:00:00 2001 From: miguelfdez99 Date: Mon, 4 Jul 2022 10:10:18 +0200 Subject: [PATCH 5/5] Change variable name if needed --- unattended_installer/builder.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/unattended_installer/builder.sh b/unattended_installer/builder.sh index 867b5f541b..9a74bc346b 100755 --- a/unattended_installer/builder.sh +++ b/unattended_installer/builder.sh @@ -89,6 +89,7 @@ function buildInstaller() { configuration_files=($(find "${resources_config}" -type f)) config_file_name=($(eval "echo "${configuration_files[@]}" | sed 's|${resources_config}||g;s|/|_|g;s|.yml||g'")) for index in "${!config_file_name[@]}"; do + config_file_name[$index]=$(echo "${config_file_name[$index]}" | sed 's|-|_|g') echo "config_file${config_file_name[$index]}=\"$(cat "${configuration_files[$index]}" | sed 's|\"|\\\"|g;s|\$|\\\$|g')\"" >> "${output_script_path}" echo >> "${output_script_path}" done