centreon · lpinsivy · Nov 19, 2018 · Nov 2, 2018 · Nov 2, 2018 · Nov 2, 2018
diff --git a/doc/en/administration_guide/poller/enable_remote.rst b/doc/en/administration_guide/poller/enable_remote.rst
@@ -0,0 +1,23 @@
+***************************
+Enable Remote Server option
+***************************
+
+Connect to your **Remoter Server** and execute following command::
+
+    # /usr/share/centreon/bin/centreon -u admin -p centreon -a enableRemote -o CentreonRemoteServer -v @IP_CENTREON_CENTRAL
+
+.. note::
+    Replace **@IP_CENTREON_CENTRAL** by the IP of the Centreon server seen by the poller
+
+This command will enable **Remote Server** mode::
+
+    Starting Centreon Remote enable process:
+
+      Limiting Menu Access...Success
+      Limiting Actions...Done
+
+      Notifying Master...Success
+
+      Set 'remote' instance type...Done
+
+      Centreon Remote enabling finished.
diff --git a/doc/en/administration_guide/poller/index.rst b/doc/en/administration_guide/poller/index.rst
@@ -16,7 +16,5 @@ The Centreon distributed architectures are describe into the architecture chapte
 
    install_poller
    install_remote_server
-   ssh_key
-   wizard_add_poller
    pollersstats
    advanced_configuration_broker
diff --git a/doc/en/administration_guide/poller/install_poller.rst b/doc/en/administration_guide/poller/install_poller.rst
@@ -2,50 +2,10 @@
 Install a poller
 ================
 
-Using Centreon ISO
-------------------
+Select your installation method:
 
-The installation process is identical to a Centreon central server installed from the ISO file of Centreon.
+.. toctree::
+   :maxdepth: 1
 
-.. note::
-    Refer to the documentation: :ref:`installation<installisoel7>`
-
-For the question **Which server type would you like to install?** choose the option **Poller server**.
-
-.. image:: /images/user/configuration/10advanced_configuration/07installpoller.png
-    :align: center
-
-Go to :ref:`SSH Key Exchange chapter to continue<sskkeypoller>`.
-
-Using Centreon packages
------------------------
-
-SELinux should be disabled. In order to do this, you have to edit the file
-*/etc/selinux/config* and replace "enforcing" by "disabled"::
-
-    SELINUX=disabled
-
-.. note::
-    After saving the file, please reboot your operating system to apply the
-    changes.
-
-A quick check of SELinux status::
-
-    $ getenforce
-    Disabled
-
-To install Centreon software from the repository, you should first install
-centreon-release package which will provide the repository file.
-
-Centreon repository installation::
-
-    # wget http://yum.centreon.com/standard/18.10/el7/stable/noarch/RPMS/centreon-release-18.10-2.el7.centos.noarch.rpm -O /tmp/centreon-release-18.10-2.el7.centos.noarch.rpm
-    # yum install --nogpgcheck /tmp/centreon-release-18.10-2.el7.centos.noarch.rpm
-
-The repository is now installed.
-
-Perform the command::
-
-    # yum install centreon-poller-centreon-engine
-
-Go to :ref:`SSH Key Exchange chapter to continue<sskkeypoller>`.
+   install_poller_iso
+   install_poller_packages
diff --git a/doc/en/administration_guide/poller/install_poller_iso.rst b/doc/en/administration_guide/poller/install_poller_iso.rst
@@ -0,0 +1,23 @@
+======================
+Using Centreon el7 ISO
+======================
+
+************
+Installation
+************
+
+The installation process is identical to a Centreon Central server installed
+from the ISO file of Centreon.
+
+.. note::
+    Refer to the documentation: :ref:`installation<installisoel7>`
+
+For the question **Which server type would you like to install?** choose the
+option **Poller server**.
+
+.. image:: /images/user/configuration/10advanced_configuration/07installpoller.png
+    :align: center
+
+.. include:: ssh_key.rst
+
+.. include:: wizard_add_poller.rst
diff --git a/doc/en/administration_guide/poller/install_poller_packages.rst b/doc/en/administration_guide/poller/install_poller_packages.rst
@@ -0,0 +1,45 @@
+=======================
+Using Centreon packages
+=======================
+
+************
+Installation
+************
+
+SELinux should be disabled. In order to do this, you have to edit the file
+*/etc/selinux/config* and replace "enforcing" by "disabled"::
+
+    SELINUX=disabled
+
+.. note::
+    After saving the file, please reboot your operating system to apply the
+    changes.
+
+A quick check of SELinux status::
+
+    $ getenforce
+    Disabled
+
+Add firewall rules or disable the firewall by running following commands: ::
+
+    # systemctl stop firewalld
+    # systemctl disable firewalld
+    # systemctl status firewalld
+
+To install Centreon software from the repository, you should first install
+centreon-release package which will provide the repository file.
+
+Centreon repository installation::
+
+    # wget http://yum.centreon.com/standard/18.10/el7/stable/noarch/RPMS/centreon-release-18.10-2.el7.centos.noarch.rpm -O /tmp/centreon-release-18.10-2.el7.centos.noarch.rpm
+    # yum install --nogpgcheck /tmp/centreon-release-18.10-2.el7.centos.noarch.rpm
+
+The repository is now installed.
+
+Perform the command::
+
+    # yum install centreon-poller-centreon-engine
+
+.. include:: ssh_key.rst
+
+.. include:: wizard_add_poller.rst
diff --git a/doc/en/administration_guide/poller/install_remote_server.rst b/doc/en/administration_guide/poller/install_remote_server.rst
@@ -2,44 +2,11 @@
 Install a Remote Server
 =======================
 
-------------
-Installation
-------------
+The installation of a Remote Server is quite similar to install a Centreon.
+Select your installation method:
 
-The installation of a Remote Server is quite similar to install a Centreon
-Central server.
+.. toctree::
+   :maxdepth: 1
 
-Using Centreon ISO
-------------------
-
-Follow the :ref:`Using Centreon ISO el7<installisoel7>` documentation to install a Centreon
-Central server. 
-
-Using Centreon packages
------------------------
-
-Follow the :ref:`Using packages<install_from_packages>` documentation to install a Centreon
-Central Server.
-
----------------------------
-Enable Remote Server option
----------------------------
-
-Connect to your **Remoter Server** and execute following command::
-
-    # /usr/share/centreon/bin/centreon -u admin -p centreon -a enableRemote -o CentreonRemoteServer -v @IP_CENTREON_CENTRAL
-
-.. note::
-    Replace **@IP_CENTREON_CENTRAL** by the IP of the Centreon server seen by the poller
-
-This command will enable **Remote Server** mode::
-
-    Starting Centreon Remote enable process:
-
-      Limiting Menu Access...Success
-      Limiting Actions...Done
-
-      Notifying Master...Success
-      Centreon Remote enabling finished.
-
-Go to :ref:`SSH Key Exchange chapter to continu<sskkeypoller>`.
+   install_remote_server_iso
+   install_remote_server_packages
diff --git a/doc/en/administration_guide/poller/install_remote_server_iso.rst b/doc/en/administration_guide/poller/install_remote_server_iso.rst
@@ -0,0 +1,13 @@
+======================
+Using Centreon el7 ISO
+======================
+
+.. include:: ../../installation/common/install_iso.rst
+
+.. include:: ../../installation/common/web_install.rst
+
+.. include:: enable_remote.rst
+
+.. include:: ssh_key.rst
+
+.. include:: wizard_add_remote.rst
diff --git a/doc/en/administration_guide/poller/install_remote_server_packages.rst b/doc/en/administration_guide/poller/install_remote_server_packages.rst
@@ -0,0 +1,13 @@
+=======================
+Using Centreon packages
+=======================
+
+.. include:: ../../installation/common/install_packages.rst
+
+.. include:: ../../installation/common/web_install.rst
+
+.. include:: enable_remote.rst
+
+.. include:: ssh_key.rst
+
+.. include:: wizard_add_remote.rst
diff --git a/doc/en/administration_guide/poller/ssh_key.rst b/doc/en/administration_guide/poller/ssh_key.rst
@@ -1,21 +1,22 @@
-.. _sskkeypoller:
-
-----------------
+****************
 SSH Key exchange
-----------------
+****************
 
 The communication between a central server and a poller server is done by SSH.
 
 You should exchange the SSH keys between the servers.
 
-If you don’t have any private SSH keys on the central server for the Centreon user: ::
+If you don’t have any private SSH keys on the central server for the
+**centreon** user: ::
 
     # su - centreon
     $ ssh-keygen -t rsa
 
+Generate a password for the **centreon** user on the new server: ::
+
+    # passwd centreon
+
 Copy this key on the new server: ::
 
     # su - centreon
     $ ssh-copy-id -i .ssh/id_rsa.pub centreon@IP_POLLER
-
-Go to the :ref:`Configure a server in Centreon<wizard_add_poller>`.
diff --git a/doc/en/administration_guide/poller/wizard_add_poller.rst b/doc/en/administration_guide/poller/wizard_add_poller.rst
@@ -1,22 +1,14 @@
-.. _wizard_add_poller:
+********************************
+Configure new poller in Centreon
+********************************
 
-================================
-Configure new server in Centreon
-================================
-
-Since Centreon 18.10, a new wizard is available to define a new server (poller
-or Remote Server) to a Centreon platform
-
-Choose the correct chapter regarding the type of server.
+Since Centreon 18.10, a new wizard is available to define a new poller to a
+Centreon platform.
 
 .. note::
     It is possible to configure a new Poller :ref:`manually<add_manual_poller>`,
     however Centreon recommends using the following procedure.
 
-------------------
-Configure a Poller
-------------------
-
 Go to the **Configuration > Pollers** menu and click **Add server with wizard**
 to configure a new poller.
 
@@ -60,53 +52,3 @@ The Poller is now configured:
 
 Go to the :ref:`Simplified configuration of Centreon with IMP<impconfiguration>`
 chapter to configure your first monitoring.
-
-.. _confremoteserver:
-
--------------------------
-Configure a Remote Server
--------------------------
-
-Go to the **Configuration > Pollers** menu and click **Add server with wizard** to
-configure a new poller.
-
-Select **Add a Centreon Remote Server** and click **Next**:
-
-.. image:: /images/poller/wizard_add_remote_1.png
-    :align: center
-
-If you define a new Server, select  **Manual input** option and fill the form:
-
-.. image:: /images/poller/wizard_add_remote_2a.png
-    :align: center
-
-If you enabled the **Remote Server** option during the installation of your server,
-select the option **Select a Remote Server**, then select your server and fill
-the form:
-
-.. image:: /images/poller/wizard_add_remote_2b.png
-    :align: center
-
-.. note::
-    The **Database user** and **Database password** are the credentials defined
-    during the installation of the Remote Server
-
-Click on **Next**
-
-Select the poller(s) to link to this Remote Server , then click on **Apply**:
-
-.. image:: /images/poller/wizard_add_remote_3.png
-    :align: center
-
-The wizard will configure your new server:
-
-.. image:: /images/poller/wizard_add_remote_4.png
-    :align: center
-
-The Remote Server is now configured:
-
-.. image:: /images/poller/wizard_add_remote_5.png
-    :align: center
-
-Go to the :ref:`Simplified configuration of Centreon with IMP<impconfiguration>`
-chapter to configure your first monitoring.