Merge branch '1444-remove-xivo-solutions-distribution' into 'master'

1444 Change distribution xivo-solutions to xivo-dist

See merge request !125

source/administrator/xivo/upgrade/upgrade.rst

@@ -25,6 +25,8 @@ There are two cases:
 #. :ref:`Upgrade to an LTS version of XiVO PBX <upgrade_latest_version_xpbx>`,
 #. :ref:`Upgrade to an Intermediate version of XiVO PBX <upgrade_specific_version_xpbx>`,
 
+.. warning:: Note that it is not possible to downgrade to any version.
+
 
 .. _upgrade_latest_version_xpbx:
 
@@ -46,19 +48,16 @@ Currently there are two XiVO PBX **LTS** versions:
     xivo-dist xivo-five
 
 
-.. note:: Note that it is not possible to downgrade to any version.
-
-
 .. _upgrade_specific_version_xpbx:
 
 Upgrade to an **Intermediate** version
 --------------------------------------
 
-.. note:: **Intermediate** version have a limited support. You should install LTS version only.
+.. note:: **Intermediate** versions have a limited support. You should install LTS version only.
 
 Between XiVO PBX LTS versions we release **Intermediate** versions (to which is given a limited support). To upgrade to a *specific* **Intermediate** version, you have to update the sources to point to this *specific* version. You have to do it with the ``xivo-dist`` command. For example, if you want to upgrade to **2017.06**::
 
-	xivo-dist xivo-2017.12-latest
+	xivo-dist xivo-2017.06-latest
 
 
 Preparing the upgrade

source/administrator/xivocc/install_and_config/installation/installation.rst

@@ -173,10 +173,13 @@ Also, check that you have following information:
 
 Install the *xivocc-installer* package via *apt*:
 
-#. Add the sources list with the key (in the following URL, replace **VERSION** with the current version, e.g.
-   *2017.03*)::
+#. Create the xivo sources list file :file:`/etc/apt/sources.list.d/xivo-dist.list` and add the following line
+   (replace **VERSION** with the current version, e.g. *2017.11*)::
+
+    deb http://mirror.xivo.solutions/archive/ xivo-VERSION-latest main
+
+#. Add GPG key of XiVO repository::
 
-    echo "deb http://mirror.xivo.solutions/archive/ xivo-solutions-VERSION-latest main" > /etc/apt/sources.list.d/xivo-solutions.list
     wget http://mirror.xivo.solutions/xivo_current.key -O - | apt-key add -
 
 #. Update your source list and install the package::

source/administrator/xivocc/upgrade/upgrade.rst

@@ -14,7 +14,7 @@ The following components will be upgraded :
 
 
 Before upgrading you have to check or change your sources list.
-It should be located in the file :file:`/etc/apt/sources.list.d/xivo-solutions.list`.
+It should be located in the file :file:`/etc/apt/sources.list.d/xivo-dist.list`.
 
 There are three cases:
 
@@ -22,21 +22,21 @@ There are three cases:
 #. :ref:`Upgrade to an Intermediate version <upgrade_specific_version_xcc>`,
 #. :ref:`Upgrade to the latest subversion <upgrade_latest_subversion_xcc>` of your current installed version.
 
+.. warning:: Note that it is not possible to downgrade to any version.
+
 
 .. _upgrade_latest_version_xcc:
 
 Upgrade to an **LTS** version
 -----------------------------
 
-Currently XiVO CC *latest* **LTS** version is 2017.LTS1 and is the numeric release 2017.03. To upgrade to the latest version the sources list must point towards *debian* URI and *xivo-solutions* suite::
-
-    deb http://mirror.xivo.solutions/debian/ xivo-solutions main
+Currently XiVO CC *latest* **LTS** version is 2017.LTS2 and is the numeric release 2017.11. To upgrade to the latest version the sources list must point towards *debian* URI and *xivo-polaris* suite::
 
-or point towards *archive* URI and *xivo-solutions-2017.03-latest* suite::
+    deb http://mirror.xivo.solutions/debian/ xivo-polaris main
 
-    deb http://mirror.xivo.solutions/archive/ xivo-solutions-2017.03-latest main
+or point towards *archive* URI and *xivo-2017.11-latest* suite::
 
-.. note:: If you’re in a version newer than 2017.03 (or XiVO 2017.LTS1 Five) like 2017.05, you can’t downgrade to the 2017.03 version.
+    deb http://mirror.xivo.solutions/archive/ xivo-2017.11-latest main
 
 
 .. _upgrade_specific_version_xcc:
@@ -44,31 +44,31 @@ or point towards *archive* URI and *xivo-solutions-2017.03-latest* suite::
 Upgrade to an **Intermediate** version
 --------------------------------------
 
-Between two LTS versions we release **Intermediate** versions (to which is given a limited support). To upgrade to a *specific* **Intermediate** version the sources list must point towards *archive* URI and *xivo-solutions-VERSION-latest* suite.
+.. note:: **Intermediate** versions have a limited support. You should install LTS version only.
+
+Between two LTS versions we release **Intermediate** versions (to which is given a limited support).To upgrade to a *specific* **Intermediate** version the sources list must point towards *archive* URI and *xivo-VERSION-latest* suite.
 
 For example if you want to upgrade to **2017.06** version you should have::
 
-    deb http://mirror.xivo.solutions/archive/ xivo-solutions-2017.06-latest main
+    deb http://mirror.xivo.solutions/archive/ xivo-2017.06-latest main
 
 Note the ``/archive/`` and ``-2017.06-latest`` above.
 
-.. note:: **Intermediate** version have a limited support. You should install LTS version only.
-
 
 .. _upgrade_latest_subversion_xcc:
 
 Upgrade to latest **subversion**
 --------------------------------
 
-After the release of a *version* (e.g. *2017.03*) we may backport some bugfixes in this version.
-We will then create a **subversion** (e.g. 2017.03 **.01**) shipping these bugfixes.
+After the release of a *version* (e.g. *2017.11*) we may backport some bugfixes in this version.
+We will then create a **subversion** (e.g. 2017.11 **.01**) shipping these bugfixes.
 To upgrade to the **latest subversion** of your current installed *version* you need to:
 
 *XiVO CC >= 2017.03* :
 
 #. Verify that the :file:`/etc/docker/compose/factory.env` file has
 
-   #. ``XIVOCC_TAG=VERSION`` (where ``VERSION`` is your current installed *version* - e.g. *2017.03*)
+   #. ``XIVOCC_TAG=VERSION`` (where ``VERSION`` is your current installed *version* - e.g. *2017.11*)
    #. and ``XIVOCC_DIST=latest``
 #. Then update the images with ``xivocc-dcomp pull`` command,
 #. And upgrade the containers with ``xivocc-dcomp up -d`` command.

source/centralized_user_management/installation.rst

@@ -42,10 +42,13 @@ Installation by installer package
 
 Install the *gcu-installer* package via *apt*:
 
-#. Add the sources list with the key (in the following URL, replace **VERSION** with the current version, e.g.
-   *2017.06*)::
+#. Create the xivo sources list file :file:`/etc/apt/sources.list.d/xivo-dist.list` and add the following line
+   (replace **VERSION** with the current version, e.g. *2017.11*)::
+
+    deb http://mirror.xivo.solutions/archive/ xivo-VERSION-latest main
+
+#. Add GPG key of XiVO repository::
 
-    echo "deb http://mirror.xivo.solutions/archive/ xivo-solutions-VERSION-latest main" > /etc/apt/sources.list.d/xivo-solutions.list
     wget http://mirror.xivo.solutions/xivo_current.key -O - | apt-key add -
 
 #. Update your source list and install the package::

source/centralized_user_management/upgrade.rst

@@ -10,26 +10,26 @@ Prepare sources list
 ====================
 
 Before upgrading you have to create or change your sources list.
-It should be located in the file :file:`/etc/apt/sources.list.d/xivo-solutions.list`.
+It should be located in the file :file:`/etc/apt/sources.list.d/xivo-dist.list`.
 
 Set sources list for upgrade to **latest** version
 --------------------------------------------------
 
-To upgrade to the latest version the sources list must point towards *debian* URI and *xivo-solutions* suite::
+To upgrade to the latest version the sources list must point towards *debian* URI and *xivo-polaris* suite::
 
-    deb http://mirror.xivo.solutions/debian/ xivo-solutions main
+    deb http://mirror.xivo.solutions/debian/ xivo-polaris main
 
 
 Set sources list for upgrade to **specific** version
 ----------------------------------------------------
 
-To upgrade to a **specific** version the sources list must point towards *archive* URI and *xivo-solutions-VERSION-latest* suite.
+To upgrade to a **specific** version the sources list must point towards *archive* URI and *xivo-VERSION-latest* suite.
 
-For example if you want to upgrade to **2017.06** version you should have::
+For example if you want to upgrade to **2017.11** version you should have::
 
-    deb http://mirror.xivo.solutions/archive/ xivo-solutions-2017.06-latest main
+    deb http://mirror.xivo.solutions/archive/ xivo-2017.11-latest main
 
-Note the ``/archive/`` and ``-2017.06-latest`` above.
+Note the ``/archive/`` and ``-2017.11-latest`` above.
 
 Upgrade steps
 =============

source/releasenotes/upgrade_from_five_to_polaris.rst

@@ -22,7 +22,7 @@ Remove apt source list file::
 
 Add new list file::
 
- echo "deb http://mirror.xivo.solutions/debian xivo-polaris main" > /etc/apt/sources.list.d/xivo.list
+ echo "deb http://mirror.xivo.solutions/debian xivo-polaris main" > /etc/apt/sources.list.d/xivo-dist.list
 
 
 After Upgrade