fix(repositories) change the install method for fusondirectory 1.4

Signed-off-by: Benoit Mortier <benoit.mortier@fusiondirectory.org>

source/fusiondirectory/install/index.rst

@@ -9,5 +9,6 @@ Install FusionDirectory
    ../../gpg/index.rst
    ../../repositories/index.rst
    debian/index.rst
+   ubuntu/index.rst
    centos/index.rst
    web-setup.rst

source/fusiondirectory/install/ubuntu/index.rst

+Install FusionDirectory on Ubuntu
+=================================
+
+Install FusionDirectory
+
+.. toctree::
+   :maxdepth: 4
+
+   ubuntu-fd-install.rst

source/fusiondirectory/install/ubuntu/ubuntu-fd-install.rst

+Installing Dependencies
+'''''''''''''''''''''''
+
+All The needed dependancies are resolved by the ubuntu packages
+
+.. note::
+
+   The repositories are in https for ubuntu
+   so you will need to install **apt-transport-https**
+
+Install FusionDirectory
+'''''''''''''''''''''''
+
+You can then install FusionDirectory by running: 
+
+.. code-block:: shell
+
+   apt-get install fusiondirectory
+   apt-get install fusiondirectory-schema
+
+FusionDirectory Schema Setup
+''''''''''''''''''''''''''''
+
+Now that we have FusionDirectory installed, we need to install the
+FusionDirectory schemas into our LDAP database.
+
+We can easily do this by running:
+
+.. code-block:: shell
+
+   fusiondirectory-schema-manager
+
+You should see the FusionDirectory setup page come up by going to:
+
+http://SERVER-IP/fusiondirectory
+
+
+

source/repositories/centos.rst

@@ -3,35 +3,52 @@
 RPM Repository
 ''''''''''''''
 
-To install FusionDirectory on Centos 7 you will need to add 3 yum repositories
+First add the FusionDirectory tools and libraries repositories
 
-.. _fd-rpm-repository-centos7-label:
+Add a file named **fusiondirectory-integrator.repo** in /etc/yum.repos.d/
 
-CentOS 7 / RHEL 7
-^^^^^^^^^^^^^^^^^
+.. code-block:: shell
 
-Add a file named **fusiondirectory-release.repo** in /etc/yum.repos.d/
+   [fusiondirectory-integrator]
+   name=Fusiondirectory Integrator Packages for CentOS 7
+   baseurl=https://public.fusiondirectory.org/centos/fusiondirectory-integrator/RPMS
+   enabled=1
+   gpgcheck=1
+   gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-FUSIONDIRECTORY
+
+Add a file named **fusiondirectory-utilities.repo** in /etc/yum.repos.d/
 
 .. code-block:: shell
 
-  [fusiondirectory-release]
-  name=Fusiondirectory Packages for CentOS 7
-  baseurl=https://public.fusiondirectory.org/centos7-fusiondirectory-release/RPMS
-  enabled=1
-  gpgcheck=1
-  gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-FUSIONDIRECTORY
+   [fusiondirectory-Utilities]
+   name=Fusiondirectory Utilities Packages for CentOS 7
+   baseurl=https://public.fusiondirectory.org/centos/fusiondirectory-utilities//RPMS
+   enabled=1 
+   gpgcheck=1
+   gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-FUSIONDIRECTORY
 
-Add a file named **fusiondirectory-extra.repo** in /etc/yum.repos.d/
+Add a file named **fusiondirectory-external-libraries.repo** in /etc/yum.repos.d/
 
 .. code-block:: shell
 
-   [fusiondirectory-extra]
-   name=Fusiondirectory Packages for CentOS 7
-   baseurl=https://public.fusiondirectory.org/centos7-fusiondirectory-extra/RPMS
+   [fusiondirectory-External-Libraries]
+   name=Fusiondirectory External Libraries Packages for CentOS 7
+   baseurl=https://public.fusiondirectory.org/centos/fusiondirectory-external-libraries/RPMS
    enabled=1
    gpgcheck=1
    gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-FUSIONDIRECTORY
 
+CentOS 7
+^^^^^^^^
 
+Add a file named **fusiondirectory-release.repo** in /etc/yum.repos.d/
+
+.. code-block:: shell
 
+  [fusiondirectory-release]
+  name=Fusiondirectory Packages for CentOS 7
+  baseurl=https://public.fusiondirectory.org/centos/centos7-fusiondirectory-release/RPMS
+  enabled=1
+  gpgcheck=1
+  gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-FUSIONDIRECTORY
 

source/repositories/debian.rst

 .. _fd-debian-repository-label:
 
-
 Debian Repository
 '''''''''''''''''
 
-.. _fd-debian-repository-stretch-label:
+First add the FusionDirectory tools and libraries repositories
+
+
+Add a file named **fusiondirectory-integrator.list** in /etc/apt/sources.list.d/
+
+.. code-block:: shell
+
+   #fusiondirectory integrator
+   deb https://public.fusiondirectory.org/debian/fusiondirectory-integrator/ bulleyes main
+
+Add a file named **fusiondirectory-utilities.list** in /etc/apt/sources.list.d/
+
+.. code-block:: shell
+
+   #fusiondirectory utilities
+   deb https://public.fusiondirectory.org/debian/fusiondirectory-utilities/ bulleyes main
+
+Add a file named **fusiondirectory-external-libraries.list** in /etc/apt/sources.list.d/
+
+.. code-block:: shell
+
+   #fusiondirectory libraries
+   deb https://public.fusiondirectory.org/debian/fusiondirectory-external-libraries/ bullseye main
+
+
+Debian Buster
+^^^^^^^^^^^^^
+
+Add a file named **fusiondirectory-release.list** in /etc/apt/sources.list.d/
 
-Debian Stretch
-^^^^^^^^^^^^^^
+.. code-block:: shell
+
+   #fusiondirectory repository
+   deb https://public.fusiondirectory.org/debian/buster-fusiondirectory-release/ buster main
+
+
+Debian Bullseye
+^^^^^^^^^^^^^^^
 
 Add a file named **fusiondirectory-release.list** in /etc/apt/sources.list.d/
 
 .. code-block:: shell
 
    #fusiondirectory repository
-   deb https://public.fusiondirectory.org/stretch-fusiondirectory-release/ stretch main
+   deb https://public.fusiondirectory.org/debian/buster-fusiondirectory-release/ bullseye main
+

source/repositories/index.rst

@@ -11,5 +11,6 @@ We also provide enterprise packages for customers who have signed for a subscrip
    :maxdepth: 2
 
    debian.rst
+   ubuntu.rst
    centos.rst
    subscription.rst

source/repositories/subscription.rst

@@ -3,14 +3,6 @@ Subscription Repository
 
 When buying a subscription you will receive a set of files
 
-
-For FusionDirectory
-'''''''''''''''''''
-
-The **yourcompany-subscription-fusiondirectory.ini** is the file to be imported into FusionDirectory to show that you have a valid subscription.
-
-See :ref:`fd-activate-a-subscription-label`
-
 For Debian
 ''''''''''
 
@@ -101,3 +93,11 @@ Install repositories
    (6/9): remi-safe/primary_db                                                   | 2.1 MB  00:00:01     
    (7/9): remi-php72/primary_db                                                  | 254 kB  00:00:01     
    (8/9): epel/x86_64/primary_db                                                 | 7.0 MB  00:00:03     
+
+
+For FusionDirectory
+^^^^^^^^^^^^^^^^^^^
+
+The **yourcompany-subscription-fusiondirectory.ini** is the file to be imported into FusionDirectory to show that you have a valid subscription.
+
+See :ref:`fd-activate-a-subscription-label`

source/repositories/ubuntu.rst

+.. _fd-ubuntu-repository-label:
+
+Ubuntu Repository
+'''''''''''''''''
+
+First add the FusionDirectory tools and libraries repositories
+
+
+Add a file named **fusiondirectory-integrator.list** in /etc/apt/sources.list.d/
+
+.. code-block:: shell
+
+   #fusiondirectory integrator
+   deb https://public.fusiondirectory.org/debian/fusiondirectory-integrator/ bulleyes main
+
+Add a file named **fusiondirectory-utilities.list** in /etc/apt/sources.list.d/
+
+.. code-block:: shell
+
+   #fusiondirectory utilities
+   deb https://public.fusiondirectory.org/debian/fusiondirectory-utilities/ bulleyes main
+
+Add a file named **fusiondirectory-external-libraries.list** in /etc/apt/sources.list.d/
+
+.. code-block:: shell
+
+   #fusiondirectory libraries
+   deb https://public.fusiondirectory.org/debian/fusiondirectory-external-libraries/ bullseye main
+
+
+Second install the repository corresponding to your distribution 
+
+Ubuntu Focal
+^^^^^^^^^^^^
+
+Add a file named **fusiondirectory-release.list** in /etc/apt/sources.list.d/
+
+.. code-block:: shell
+
+   #fusiondirectory repository
+   deb https://public.fusiondirectory.org/ubuntu/focal-fusiondirectory-release/ focal main
+
+Ubuntu bionic      
+^^^^^^^^^^^^^ 
+
+Add a file named **fusiondirectory-release.list** in /etc/apt/sources.list.d/
+
+.. code-block:: shell
+
+   #fusiondirectory repository
+   deb https://public.fusiondirectory.org/ubuntu/bionic-fusiondirectory-release/ bionic main
+
+
+