Updating installation instructions

Signed-off-by: Scott R. Shinn <[email protected]>

Author: atomicturtle

about.rst

@@ -86,19 +86,12 @@ for each release. You can find out more about Atomicorp product and support offe
 their sales team at [email protected] or visiting their products listing page at: 
 `<https://atomicorp.com/product-listing/>`_.
 
-**Wazuh** 
-
-Wazuh provides `support and professional services <http://www.wazuh.com/professional-services/>`_ to Wazuh OSSEC users. The services include training, deployment assistance, health-checks, tuning and commercial support. You can reach Wazuh team at: [email protected].
-
-Wazuh also contributes to the OSSEC project maintaining `installers <http://ossec.wazuh.com>`_ and providing an Open Source `ruleset <http://www.wazuh.com/ossec-ruleset/>`_ to improve OSSEC detection and log analysis capabilities. Wazuh has developed its own modules for OSSEC integration with Log management systems like Splunk or `Elasticsearch <http://wazuh.com/elk-stack/>`_. Their website includes documentation explaining how to use OSSEC to get in compliance with `PCI-DSS <http://www.wazuh.com/pci-dss>`_, and to monitor Amazon AWS environments. 
-
 OSSEC Team
 ~~~~~~~~~~
 
 Currently the core OSSEC Team consists of the following developers and committers:
 
 
-
 **Scott R. Shinn** – OSSEC Development Manager – scott (at) atomicorp.com
 
 **Dan Parriott** – Community support, docs, rules, testing – ddpbsd (at) gmail.com

docs/manual/installation/installation-package.rst

@@ -34,25 +34,13 @@ And for an agent run:
 Deb Installation
 ----------------
 
-OSSEC's deb packages are available in the Wazuh repository.
+OSSEC's DEB packages are made available by `Atomicorp <http://www.atomicorp.com>`_.
 
-Install the apt-get repository key:
+Run the Repo installer:
 
 .. code-block:: console
     
-    # apt-key adv --fetch-keys http://ossec.wazuh.com/repos/apt/conf/ossec-key.gpg.key
-
-Add the repository for Debian (available distributions are Sid, Jessie and Wheezy):
-
-.. code-block:: console
-
-    # echo 'deb http://ossec.wazuh.com/repos/apt/debian wheezy main' >> /etc/apt/sources.list
-
-Or add the repository for Ubuntu (available distributions are Precise, Trusty and Utopic):
-
-.. code-block:: console
-
-    # echo 'deb http://ossec.wazuh.com/repos/apt/ubuntu precise main' >> /etc/apt/sources.list
+    # wget -q -O - https://updates.atomicorp.com/installers/atomic | sudo bash
 
 Update the repository:
 

docs/manual/installation/installation-requirements.rst

@@ -1,6 +1,6 @@
 .. _install_req:
 
-Installations requirements
+Installation requirements
 ==========================
 
 For UNIX systems, OSSEC only requires gnu make, gcc, and libc.
@@ -51,82 +51,70 @@ To use the included version of zlib, simply set `ZLIB_SYSTEM` to `no`:
    # cd ossec-hids-*
    # ZLIB_SYSTEM=no ./install.sh
 
-Ubuntu
+RedHat / Centos / Fedora / Amazon Linux
 ------
 
-At a minimum, the following packages should be installed:
+Step 1) At a minimum, the following packages should be installed:
 
 .. code-block:: console
 
-   apt-get install build-essential make zlib1g-dev libpcre2-dev
-
-On Ubuntu you will need the *build-essential* package in order to
-compile and install OSSEC.
+   yum install zlib-devel pcre2-devel make gcc zlib-devel pcre2-devel sqlite-devel openssl-devel
 
-To install the package run the following command.
+Step 2) For optional database support add thepackage mysql-devel and/or postgresql-devel packages
 
 .. code-block:: console
 
-    # apt-get install build-essential zlib1g-dev
-
-To use the system's pcre2 libraries, install the libpcre2 development package:
-
-.. code-block:: console
+   yum install mysql-devel postgresql-devel
 
-   # apt-get install libpcre2-dev
 
-If database support is needed *mysql-dev* or *postgresql-dev* should be
-installed. Run the following command to install these packages.
-
-.. code-block:: console 
-
-    # apt-get install mysql-dev postgresql-dev
-
-To use the SQLite features, the `libsqlite3-dev` package is necessary.
-
-.. versionadded:: 3.0
+Step 3) Run the installation script
 
 .. code-block:: console
 
-   # apt-get install libsqlite3-dev
+   ./install.sh
 
 
-RedHat
+
+Ubuntu / Debian
 ------
 
 At a minimum, the following packages should be installed:
 
 .. code-block:: console
 
-   yum install zlib-devel pcre2-devel make gcc
+   apt-get install build-essential make zlib1g-dev libpcre2-dev
 
-RedHat should have most of the packages needed by default. The zlib development package
-should be installed:
+On Ubuntu you will need the *build-essential* package in order to
+compile and install OSSEC.
+
+To install the package run the following command.
 
 .. code-block:: console
 
-   # yum install zlib-devel
+   apt-get install build-essential zlib1g-dev
 
-To use the system's pcre2 libraries, add the pcre2 development package:
+To use the system's pcre2 libraries, install the libpcre2 development package:
 
 .. code-block:: console
 
-   # yum install pcre2-devel
+   apt-get install libpcre2-dev
 
-If database support is needed the package mysql-devel and/or postgresql-devel will
-need to be installed.
+If database support is needed *mysql-dev* or *postgresql-dev* should be
+installed. Run the following command to install these packages.
 
-.. code-block:: console
+.. code-block:: console 
 
-    # yum install mysql-devel postgresql-devel
+    apt-get install mysql-dev postgresql-dev
 
-To use the SQLite features, the `sqlite-devel` package is necessary.
+To use the SQLite features, the `libsqlite3-dev` package is necessary.
 
 .. versionadded:: 3.0
 
 .. code-block:: console
 
-   # yum install sqlite-devel
+   apt-get install libsqlite3-dev
+
+
 
 OpenSuse
 --------
@@ -135,20 +123,20 @@ The zlib development package should be installed:
 
 .. code-block:: console
 
-   # zypper install zlib-devel
+   zypper install zlib-devel
 
 To use the system's pcre2 libraries, add the pcre2 development package:
 
 .. code-block:: console
 
-   # zypper install pcre2-devel
+   zypper install pcre2-devel
 
 If database support is needed the package mysql-devel and/or postgresql-devel will
 need to be installed.
 
 .. code-block:: console
 
-   # zypper install postgresql-devel mysql-devel
+   zypper install postgresql-devel mysql-devel
 
 FreeBSD
 -------
@@ -183,8 +171,8 @@ It only offers **security/ossec-hids**, so:
 
 .. code-block:: console
 
-   # cd /usr/ports/security/ossec-hids
-   # make
+   cd /usr/ports/security/ossec-hids
+   make
 
 Just like the previous example with FreeBSD, if you want to install it all (not just the
 dependencies) you must run ``make install`` instead. Another option would be using
@@ -219,6 +207,6 @@ This can also be avoided by using bash to run ``install.sh``:
 
 .. code-block:: console
 
-   # bash ./install.sh
+   bash ./install.sh