Skip to content

Commit

Permalink
Merge pull request #5475 from wazuh/revert-rename-config-yml
Browse files Browse the repository at this point in the history
Reverted wazuh-config.yml renaming
  • Loading branch information
s-ocando authored Jul 18, 2022
2 parents 5b1120a + 046f85e commit d2391ea
Show file tree
Hide file tree
Showing 10 changed files with 29 additions and 29 deletions.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.. Copyright (C) 2015-2022 Wazuh, Inc.
#. Replace ``<dashboard-node-name>`` with your Wazuh dashboard node name, the same used in ``wazuh-config.yml`` to create the certificates, and move the certificates to their corresponding location.
#. Replace ``<dashboard-node-name>`` with your Wazuh dashboard node name, the same used in ``config.yml`` to create the certificates, and move the certificates to their corresponding location.

.. code-block:: console
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@

#. ``network.host``: Sets the address of this node for both HTTP and transport traffic. The node will bind to this address and will also use it as its publish address. Accepts an IP address or a hostname.

Use the same node address set in ``wazuh-config.yml`` to create the SSL certificates.
Use the same node address set in ``config.yml`` to create the SSL certificates.

#. ``node.name``: Name of the Wazuh indexer node as defined in the ``wazuh-config.yml`` file. For example, ``node-1``.
#. ``node.name``: Name of the Wazuh indexer node as defined in the ``config.yml`` file. For example, ``node-1``.

#. ``cluster.initial_master_nodes``: List of the names of the master-eligible nodes. These names are defined in the ``wazuh-config.yml`` file. Uncomment the ``node-2`` and ``node-3`` lines, change the names, or add more lines, according to your ``wazuh-config.yml`` definitions.
#. ``cluster.initial_master_nodes``: List of the names of the master-eligible nodes. These names are defined in the ``config.yml`` file. Uncomment the ``node-2`` and ``node-3`` lines, change the names, or add more lines, according to your ``config.yml`` definitions.

.. code-block:: yaml
Expand All @@ -29,7 +29,7 @@
- "10.0.0.2"
- "10.0.0.3"
#. ``plugins.security.nodes_dn``: List of the Distinguished Names of the certificates of all the Wazuh indexer cluster nodes. Uncomment the lines for ``node-2`` and ``node-3`` and change the common names (CN) and values according to your settings and your ``wazuh-config.yml`` definitions.
#. ``plugins.security.nodes_dn``: List of the Distinguished Names of the certificates of all the Wazuh indexer cluster nodes. Uncomment the lines for ``node-2`` and ``node-3`` and change the common names (CN) and values according to your settings and your ``config.yml`` definitions.

.. code-block:: yaml
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.. Copyright (C) 2015-2022 Wazuh, Inc.
#. Run the following commands replacing ``<indexer-node-name>`` with the name of the Wazuh indexer node you are configuring as defined in ``wazuh-config.yml``. For example ``node-1``. This is to deploy the SSL certificates to encrypt communications between the Wazuh central components.
#. Run the following commands replacing ``<indexer-node-name>`` with the name of the Wazuh indexer node you are configuring as defined in ``config.yml``. For example ``node-1``. This is to deploy the SSL certificates to encrypt communications between the Wazuh central components.

.. code-block:: console
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
.. Copyright (C) 2015-2022 Wazuh, Inc.
#. Download the ``wazuh-certs-tool.sh`` script and the ``wazuh-config.yml`` configuration file. This is to create the certificates that will encrypt communications between the Wazuh central components.
#. Download the ``wazuh-certs-tool.sh`` script and the ``config.yml`` configuration file. This is to create the certificates that will encrypt communications between the Wazuh central components.

.. code-block:: console
# curl -sO https://packages.wazuh.com/4.3/wazuh-certs-tool.sh
# curl -sO https://packages.wazuh.com/4.3/wazuh-config.yml
# curl -sO https://packages.wazuh.com/4.3/config.yml
#. Edit ``./wazuh-config.yml`` and replace the node names and IP values with the corresponding names and IP addresses. You need to do this for all the Wazuh server, the Wazuh indexer, and the Wazuh dashboard nodes. Add as many node fields as needed.
#. Edit ``./config.yml`` and replace the node names and IP values with the corresponding names and IP addresses. You need to do this for all the Wazuh server, the Wazuh indexer, and the Wazuh dashboard nodes. Add as many node fields as needed.

.. code-block:: yaml
Expand Down
24 changes: 12 additions & 12 deletions source/deployment-options/offline-installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -40,19 +40,19 @@ Download the packages and configuration files

.. code-block:: console
# curl -sO https://packages.wazuh.com/|WAZUH_CURRENT_MINOR|/wazuh-config.yml
# curl -sO https://packages.wazuh.com/|WAZUH_CURRENT_MINOR|/config.yml
Edit ``wazuh-config.yml`` and replace ``<indexer-node-ip>``, ``<wazuh-manager-ip>``, and ``<dashboard-node-ip>`` with ``127.0.0.1``.
Edit ``config.yml`` and replace ``<indexer-node-ip>``, ``<wazuh-manager-ip>``, and ``<dashboard-node-ip>`` with ``127.0.0.1``.

- Distributed deployment

If you are performing a distributed deployment, do the following:

.. code-block:: console
# curl -sO https://packages.wazuh.com/|WAZUH_CURRENT_MINOR|/wazuh-config.yml
# curl -sO https://packages.wazuh.com/|WAZUH_CURRENT_MINOR|/config.yml
Edit ``wazuh-config.yml`` and replace the node names and IP values with the corresponding names and IP addresses. You need to do this for all the Wazuh server, the Wazuh indexer, and the Wazuh dashboard nodes. Add as many node fields as needed.
Edit ``config.yml`` and replace the node names and IP values with the corresponding names and IP addresses. You need to do this for all the Wazuh server, the Wazuh indexer, and the Wazuh dashboard nodes. Add as many node fields as needed.


#. Run the ``./wazuh-certs-tool.sh`` to create the certificates. For a multi-node cluster, these certificates need to be later deployed to all Wazuh instances in your cluster.
Expand Down Expand Up @@ -98,7 +98,7 @@ Installing the Wazuh indexer
# dpkg -i ./wazuh-offline/wazuh-packages/wazuh-indexer*.deb
#. Run the following commands replacing ``<indexer-node-name>`` with the name of the Wazuh indexer node you are configuring as defined in ``wazuh-config.yml``. For example, ``node-1``. This is to deploy the SSL certificates to encrypt communications between the Wazuh central components.
#. Run the following commands replacing ``<indexer-node-name>`` with the name of the Wazuh indexer node you are configuring as defined in ``config.yml``. For example, ``node-1``. This is to deploy the SSL certificates to encrypt communications between the Wazuh central components.

.. code-block:: console
Expand All @@ -122,11 +122,11 @@ Installing the Wazuh indexer

#. ``network.host``: Sets the address of this node for both HTTP and transport traffic. The node will bind to this address and will also use it as its publish address. Accepts an IP address or a hostname.

Use the same node address set in ``wazuh-config.yml`` to create the SSL certificates.
Use the same node address set in ``config.yml`` to create the SSL certificates.

#. ``node.name``: Name of the Wazuh indexer node as defined in the ``wazuh-config.yml`` file. For example, ``node-1``.
#. ``node.name``: Name of the Wazuh indexer node as defined in the ``config.yml`` file. For example, ``node-1``.

#. ``cluster.initial_master_nodes``: List of the names of the master-eligible nodes. These names are defined in the ``wazuh-config.yml`` file. Uncomment the ``node-2`` and ``node-3`` lines, change the names, or add more lines, according to your ``wazuh-config.yml`` definitions.
#. ``cluster.initial_master_nodes``: List of the names of the master-eligible nodes. These names are defined in the ``config.yml`` file. Uncomment the ``node-2`` and ``node-3`` lines, change the names, or add more lines, according to your ``config.yml`` definitions.

.. code-block:: yaml
Expand All @@ -145,7 +145,7 @@ Installing the Wazuh indexer
- "10.0.0.2"
- "10.0.0.3"
#. ``plugins.security.nodes_dn``: List of the Distinguished Names of the certificates of all the Wazuh indexer cluster nodes. Uncomment the lines for ``node-2`` and ``node-3`` and change the common names (CN) and values according to your settings and your ``wazuh-config.yml`` definitions.
#. ``plugins.security.nodes_dn``: List of the Distinguished Names of the certificates of all the Wazuh indexer cluster nodes. Uncomment the lines for ``node-2`` and ``node-3`` and change the common names (CN) and values according to your settings and your ``config.yml`` definitions.

.. code-block:: yaml
Expand Down Expand Up @@ -288,7 +288,7 @@ Filebeat must be installed and configured on the same server as the Wazuh manage
- Distributed deployment

Change the value of ``hosts`` to the IP address of the Wazuh indexer node. In case of having more than one Wazuh indexer node, you can separate the addresses using commas. For example, ``hosts: ["10.0.0.1:9200", "10.0.0.2:9200", "10.0.0.3:9200"]``. Ensure to replace the ``<indexer-node-*-ip>`` with the addresses or hostnames of the Wazuh indexer nodes specified in ``wazuh-config.yml``.
Change the value of ``hosts`` to the IP address of the Wazuh indexer node. In case of having more than one Wazuh indexer node, you can separate the addresses using commas. For example, ``hosts: ["10.0.0.1:9200", "10.0.0.2:9200", "10.0.0.3:9200"]``. Ensure to replace the ``<indexer-node-*-ip>`` with the addresses or hostnames of the Wazuh indexer nodes specified in ``config.yml``.

Also change the value of ``username`` and ``password`` to the configured credentials. The default username and password is ``admin``.

Expand All @@ -307,7 +307,7 @@ Filebeat must be installed and configured on the same server as the Wazuh manage
# tar -xzf ./wazuh-offline/wazuh-files/wazuh-filebeat-0.2.tar.gz -C /usr/share/filebeat/module
#. Replace ``<server-node-name>`` with your Wazuh server node certificate name, the same used in ``wazuh-config.yml`` when creating the certificates. Then, move the certificates to their corresponding location.
#. Replace ``<server-node-name>`` with your Wazuh server node certificate name, the same used in ``config.yml`` when creating the certificates. Then, move the certificates to their corresponding location.

.. code-block:: console
Expand Down Expand Up @@ -437,7 +437,7 @@ Installing the Wazuh dashboard
# dpkg -i ./wazuh-offline/wazuh-packages/wazuh-dashboard*.deb
#. Replace ``<dashboard-node-name>`` with your Wazuh dashboard node name, the same used in ``wazuh-config.yml`` to create the certificates, and move the certificates to their corresponding location.
#. Replace ``<dashboard-node-name>`` with your Wazuh dashboard node name, the same used in ``config.yml`` to create the certificates, and move the certificates to their corresponding location.

.. code-block:: console
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ Wazuh dashboard installation
# curl -sO https://packages.wazuh.com/|WAZUH_CURRENT_MINOR|/wazuh-install.sh
#. Run the assistant with the option ``--wazuh-dashboard`` and the node name to install and configure the Wazuh dashboard. The node name must be the same used in ``wazuh-config.yml`` for the initial configuration, for example, ``dashboard``.
#. Run the assistant with the option ``--wazuh-dashboard`` and the node name to install and configure the Wazuh dashboard. The node name must be the same used in ``config.yml`` for the initial configuration, for example, ``dashboard``.

.. note::

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@ Indicate your deployment configuration, create the SSL certificates to encrypt c
.. code-block:: console
# curl -sO https://packages.wazuh.com/|WAZUH_CURRENT_MINOR|/wazuh-install.sh
# curl -sO https://packages.wazuh.com/|WAZUH_CURRENT_MINOR|/wazuh-config.yml
# curl -sO https://packages.wazuh.com/|WAZUH_CURRENT_MINOR|/config.yml
#. Edit ``./wazuh-config.yml`` and replace the node names and IP values with the corresponding names and IP addresses. You need to do this for all the Wazuh server, the Wazuh indexer, and the Wazuh dashboard nodes. Add as many node fields as needed.
#. Edit ``./config.yml`` and replace the node names and IP values with the corresponding names and IP addresses. You need to do this for all the Wazuh server, the Wazuh indexer, and the Wazuh dashboard nodes. Add as many node fields as needed.

.. code-block:: yaml
Expand Down Expand Up @@ -86,7 +86,7 @@ Install and configure the Wazuh indexer nodes.
# curl -sO https://packages.wazuh.com/|WAZUH_CURRENT_MINOR|/wazuh-install.sh
#. Run the assistant with the option ``--wazuh-indexer`` and the node name to install and configure the Wazuh indexer. The node name must be the same used in ``wazuh-config.yml`` for the initial configuration, for example, ``node-1``.
#. Run the assistant with the option ``--wazuh-indexer`` and the node name to install and configure the Wazuh indexer. The node name must be the same used in ``config.yml`` for the initial configuration, for example, ``node-1``.

.. note:: Make sure that a copy of ``wazuh-install-files.tar``, created during the initial configuration step, is placed in your working directory.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Wazuh server cluster installation
# curl -sO https://packages.wazuh.com/|WAZUH_CURRENT_MINOR|/wazuh-install.sh
#. Run the assistant with the option ``--wazuh-server`` followed by the node name to install the Wazuh server. The node name must be the same used in ``wazuh-config.yml`` for the initial configuration, for example, ``wazuh-1``.
#. Run the assistant with the option ``--wazuh-server`` followed by the node name to install the Wazuh server. The node name must be the same used in ``config.yml`` for the initial configuration, for example, ``wazuh-1``.

.. note:: Make sure that a copy of ``wazuh-install-files.tar``, created during the Wazuh indexer installation, is placed in your working directory.

Expand Down
2 changes: 1 addition & 1 deletion source/installation-guide/wazuh-server/step-by-step.rst
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ Deploying certificates
.. note::
Make sure that a copy of ``wazuh-certificates.tar``, created during the Wazuh indexer installation, is placed in your working directory.

#. Replace ``<server-node-name>`` with your Wazuh server node certificate name, the same used in ``wazuh-config.yml`` when creating the certificates. Then, move the certificates to their corresponding location.
#. Replace ``<server-node-name>`` with your Wazuh server node certificate name, the same used in ``config.yml`` when creating the certificates. Then, move the certificates to their corresponding location.

.. include:: /_templates/installations/filebeat/opensearch/copy_certificates_filebeat_wazuh_cluster.rst

Expand Down
4 changes: 2 additions & 2 deletions source/user-manual/certificates.rst
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ These certificates are created with the following additional information:
- ``CN``: Name of the node


To create the certificates, edit the ``wazuh-config.yml`` file and replace the node names and IP values with the corresponding names and IP addresses. The ``<node-ip>`` can be either an IP address or a DNS name. The ``wazuh-config.yml`` template can be found here: `wazuh-config.yml <https://packages.wazuh.com/|WAZUH_CURRENT_MINOR|/wazuh-config.yml>`_.
To create the certificates, edit the ``config.yml`` file and replace the node names and IP values with the corresponding names and IP addresses. The ``<node-ip>`` can be either an IP address or a DNS name. The ``config.yml`` template can be found here: `config.yml <https://packages.wazuh.com/|WAZUH_CURRENT_MINOR|/config.yml>`_.

.. code-block:: yaml
Expand Down Expand Up @@ -62,7 +62,7 @@ To create the certificates, edit the ``wazuh-config.yml`` file and replace the n
- name: dashboard
ip: <dashboard-node-ip>
After configuring the ``wazuh-config.yml``, run the script with option ``-A`` to create all the certificates.
After configuring the ``config.yml``, run the script with option ``-A`` to create all the certificates.

.. code-block:: console
Expand Down

0 comments on commit d2391ea

Please sign in to comment.