From c09dc4197a44bcd0299f21e0a9e640fbd5af2a8a Mon Sep 17 00:00:00 2001
From: Guillaume28 <guillaume-baldo@hotmail.fr>
Date: Fri, 10 Feb 2017 11:08:23 +0100
Subject: [PATCH] Update documentation in english
---
doc/en/installation/from_packages.rst | 120 +++++++++++++++-----------
doc/fr/installation/from_packages.rst | 3 +-
2 files changed, 73 insertions(+), 50 deletions(-)
diff --git a/doc/en/installation/from_packages.rst b/doc/en/installation/from_packages.rst
index 48d280f851..d82b5061e6 100644
--- a/doc/en/installation/from_packages.rst
+++ b/doc/en/installation/from_packages.rst
@@ -35,64 +35,33 @@ For CentOS 7.
The repository is now installed.
-Any operating system
---------------------
-
-Disable SELinux
-^^^^^^^^^^^^^^^
-
-SELinux should be disabled; for this, you have to modify the file "/etc/sysconfig/selinux" and replace "enforcing" by "disabled":
-
-::
-
- SELINUX=disabled
-
-PHP timezone
-^^^^^^^^^^^^
-
-PHP timezone should be set; go to /etc/php.d directory and create a file named php-timezone.ini who contain the following line :
-
-::
-
- date.timezone = Europe/Paris
-
-After saving the file, please don't forget to restart apache server.
-
-Firewall
-^^^^^^^^
-
-Add firewall rules or disable it. To disable it execute folowwing commands:
-
-* **iptables** (CentOS v6) ::
+*********************
+Centreon installation
+*********************
- # /etc/init.d/iptables save
- # /etc/init.d/iptables stop
- # chkconfig iptables off
+Install globaly Centreon
+------------------------
-* **firewalld** (CentOS v7) ::
+Ce chapitre décrit l'installation golable de Centreon.
+The chapter describes the global installation of Centreon.
- # systemctl stop firewalld
- # systemctl disable firewalld
- # systemctl status firewalld
+Perform the command:
-DataBase Management System
-^^^^^^^^^^^^^^^^^^^^^^^^^^
+ ::
-The Mysql database server should be available to complete installation (locally or not). MariaDB is recommended.
+ $ yum install centreon
+ $ yum update
-For CentOS / RHEL in version 7, it is necessary to modify **LimitNOFILE** limitation.
-Edit **/etc/systemd/system/mysqld.service** file and change ::
+Vous devez aussi récupérer la clef GPG et la placer dans le dossier rpm-gpg.
+You also have to recover the GPG key and place it in the rpm-gpg file.
- LimitNOFILE=32000
+Perform the command:
-Save the file and execute the folowwing commands::
+ ::
- # systemctl daemon-reload
- # service mysqld restart
+ $ cd /etc/pki/rpm-gpg/
+ $ wget http://yum-1.centreon.com/standard/3.4/el7/stable/RPM-GPG-KEY-CES
-*********************
-Centreon installation
-*********************
Install a central server
------------------------
@@ -144,6 +113,61 @@ Copy this key on the collector:
.. _installation_web:
+Any operating system
+--------------------
+
+Disable SELinux
+^^^^^^^^^^^^^^^
+
+SELinux should be disabled; for this, you have to modify the file "/etc/sysconfig/selinux" and replace "enforcing" by "disabled":
+
+::
+
+ SELINUX=disabled
+
+PHP timezone
+^^^^^^^^^^^^
+
+PHP timezone should be set; go to /etc/php.d directory and create a file named php-timezone.ini who contain the following line :
+
+::
+
+ date.timezone = Europe/Paris
+
+After saving the file, please don't forget to restart apache server.
+
+Firewall
+^^^^^^^^
+
+Add firewall rules or disable it. To disable it execute folowwing commands:
+
+* **iptables** (CentOS v6) ::
+
+ # /etc/init.d/iptables save
+ # /etc/init.d/iptables stop
+ # chkconfig iptables off
+
+* **firewalld** (CentOS v7) ::
+
+ # systemctl stop firewalld
+ # systemctl disable firewalld
+ # systemctl status firewalld
+
+DataBase Management System
+^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+The Mysql database server should be available to complete installation (locally or not). MariaDB is recommended.
+
+For CentOS / RHEL in version 7, it is necessary to modify **LimitNOFILE** limitation.
+Edit **/etc/systemd/system/mysqld.service** file and change ::
+
+ LimitNOFILE=32000
+
+Save the file and execute the folowwing commands::
+
+ # systemctl daemon-reload
+ # service mysqld restart
+
Web Installation
================
diff --git a/doc/fr/installation/from_packages.rst b/doc/fr/installation/from_packages.rst
index 45603d8d36..ae6fe35db3 100644
--- a/doc/fr/installation/from_packages.rst
+++ b/doc/fr/installation/from_packages.rst
@@ -53,8 +53,7 @@ Exécutez la commande :
$ yum install centreon
$ yum update
-Un échec de récupération de la GPG peut empêcher l'installation de Centreon.
-Pour éviter cela vous devez renseigner la clef concernée.
+Vous devez aussi récupérer la clef GPG et la placer dans le dossier rpm-gpg.
Exécutez la commande :
--
GitLab