Merge commit '6c4c33ea3bff4e92b5942c6d82b0c2cd9488a2b8' into HEAD

installation/linux.md

@@ -68,10 +68,10 @@ Alternatively resort to the [manual installation approach](#manual-installation)
 
 {% include collapsible/body.html %}
 
-First, add the openHAB 2 Bintray repository key to your package manager and allow Apt to use the HTTPS Protocol:
+First, add the openHAB repository key to your package manager and allow Apt to use the HTTPS Protocol:
 
 ```shell
-wget -qO - 'https://bintray.com/user/downloadSubjectPublicKey?username=openhab' | sudo apt-key add -
+wget -qO - 'https://openhab.jfrog.io/artifactory/api/gpg/key/public' | sudo apt-key add -
 sudo apt-get install apt-transport-https
 ```
 
@@ -84,7 +84,7 @@ Then, you can choose between, *Official (Stable)*, *Beta* or *Snapshot* builds:
     Add the **openHAB 2 Stable Repository** to your systems apt sources list:
 
     ```shell
-    echo 'deb https://dl.bintray.com/openhab/apt-repo2 stable main' | sudo tee /etc/apt/sources.list.d/openhab2.list
+    echo 'deb https://openhab.jfrog.io/artifactory/openhab-linuxpkg stable main' | sudo tee /etc/apt/sources.list.d/openhab2.list
     ```
 
 -   **Testing Release**
@@ -144,10 +144,10 @@ You may add all three to the same file, but make sure the desired repo is is set
 
     ```text
     [openHAB-Stable]
-    name=openHAB 2.x.x Stable
-    baseurl=https://dl.bintray.com/openhab/rpm-repo2/stable
+    name=openHAB Stable
+    baseurl=https://openhab.jfrog.io/artifactory/openhab-linuxpkg-rpm/stable
     gpgcheck=1
-    gpgkey=https://bintray.com/user/downloadSubjectPublicKey?username=openhab
+    gpgkey=https://openhab.jfrog.io/artifactory/api/gpg/key/public
     enabled=1
     ```
 
@@ -160,7 +160,7 @@ You may add all three to the same file, but make sure the desired repo is is set
     name=openHAB 2.x.x Testing
     baseurl=https://openhab.jfrog.io/openhab/openhab-linuxpkg-rpm/testing
     gpgcheck=1
-    gpgkey=https://bintray.com/user/downloadSubjectPublicKey?username=openhab
+    gpgkey=https://openhab.jfrog.io/artifactory/api/gpg/key/public
     enabled=1
     ```
 
@@ -174,7 +174,7 @@ You may add all three to the same file, but make sure the desired repo is is set
     name=openHAB 2.x.x Snapshots
     baseurl=https://openhab.jfrog.io/openhab/openhab-linuxpkg-rpm/unstable
     gpgcheck=1
-    gpgkey=https://openhab.jfrog.io/openhab/api/gpg/key/public
+    gpgkey=https://openhab.jfrog.io/artifactory/api/gpg/key/public
     enabled=1
     ```
 
@@ -430,8 +430,8 @@ As openHAB 2 is still in an evolving state, the snapshot may be the **preferred
 
     ```shell
     cd /tmp
-    wget -O openhab-download.zip https://bintray.com/... # Insert download link here
-    sudo unzip openhab-download.zip -d /opt/openhab2
+    wget -O openhab-download.zip https://www.openhab.org/download/releases... # Insert download link here
+    sudo unzip openhab-download.zip -d /opt/openhab
     rm openhab-download.zip
     ```