summaryrefslogtreecommitdiff
path: root/public
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2017-01-10 11:53:57 -0500
committerMicah Anderson <micah@riseup.net>2017-01-10 11:53:57 -0500
commit2c5c3b1d9da2edad91cae783309e823d30a04be7 (patch)
tree8e48fc96dc1f5e57193ced3baa482b79d8ae54ab /public
parenta480b8d0f52ff1503b509a28c353520025b602a3 (diff)
Update linux instructions to include official debian keyring package
Diffstat (limited to 'public')
-rw-r--r--public/linux/index.en.html21
-rw-r--r--public/linux/index.es.html21
-rw-r--r--public/linux/index.pt.html21
-rw-r--r--public/linux/index.ru.html6
4 files changed, 46 insertions, 23 deletions
diff --git a/public/linux/index.en.html b/public/linux/index.en.html
index 684e4f4..db72175 100644
--- a/public/linux/index.en.html
+++ b/public/linux/index.en.html
@@ -123,9 +123,12 @@ Bitmask Downloads
<h3><a name="debian-8-stablejessie"></a>Debian 8 (Stable/Jessie)</h3>
<p><p class='b'>To install</p>
-<pre>sudo -s&#x000A;echo "deb http://deb.bitmask.net/debian jessie main" > /etc/apt/sources.list.d/bitmask.list&#x000A;wget -O- https://dl.bitmask.net/apt.key | apt-key add -&#x000A;apt update&#x000A;apt install bitmask leap-archive-keyring&#x000A;</pre>
+<pre>Follow <a href="https://backports.debian.org/Instructions">instructions for activating Debian Backports</a>.
+sudo -s
+apt install -t jessie-backports leap-archive-keyring
+echo "deb http://deb.bitmask.net/debian jessie main" > /etc/apt/sources.list.d/bitmask.list&#x000A;apt update&#x000A;apt install bitmask&#x000A;</pre>
<p class='b'>To remove</p>
-<pre>sudo -s&#x000A;apt remove bitmask leap-archive-keyring&#x000A;apt-key del 0x1E34A1828E207901&#x000A;rm /etc/apt/sources.list.d/bitmask.list&#x000A;</pre>
+<pre>sudo -s&#x000A;apt remove bitmask leap-archive-keyring&#x000A;rm /etc/apt/sources.list.d/bitmask.list&#x000A;</pre>
<p class='b'>When upgrading to this OS</p>
<pre>sudo -s&#x000A;echo "deb http://deb.bitmask.net/debian jessie main" > /etc/apt/sources.list.d/bitmask.list&#x000A;apt update&#x000A;apt upgrade&#x000A;</pre>
</p>
@@ -133,9 +136,11 @@ Bitmask Downloads
<h3><a name="debian-testing-stretch"></a>Debian Testing (Stretch)</h3>
<p><p class='b'>To install</p>
-<pre>sudo -s&#x000A;echo "deb http://deb.bitmask.net/debian testing main" > /etc/apt/sources.list.d/bitmask.list&#x000A;wget -O- https://dl.bitmask.net/apt.key | apt-key add -&#x000A;apt update&#x000A;apt install bitmask leap-archive-keyring&#x000A;</pre>
+<pre>sudo -s
+apt install leap-archive-keyring
+echo "deb http://deb.bitmask.net/debian testing main" > /etc/apt/sources.list.d/bitmask.list&#x000A;apt update&#x000A;apt install bitmask&#x000A;</pre>
<p class='b'>To remove</p>
-<pre>sudo -s&#x000A;apt remove bitmask leap-archive-keyring&#x000A;apt-key del 0x1E34A1828E207901&#x000A;rm /etc/apt/sources.list.d/bitmask.list&#x000A;</pre>
+<pre>sudo -s&#x000A;apt remove bitmask leap-archive-keyring&#x000A;rm /etc/apt/sources.list.d/bitmask.list&#x000A;</pre>
<p class='b'>When upgrading to this OS</p>
<pre>sudo -s&#x000A;echo "deb http://deb.bitmask.net/debian testing main" > /etc/apt/sources.list.d/bitmask.list&#x000A;apt update&#x000A;apt upgrade&#x000A;</pre>
</p>
@@ -143,9 +148,11 @@ Bitmask Downloads
<h3><a name="debian-unstable-sid"></a>Debian Unstable (Sid)</h3>
<p><p class='b'>To install</p>
-<pre>sudo -s&#x000A;echo "deb http://deb.bitmask.net/debian sid main" > /etc/apt/sources.list.d/bitmask.list&#x000A;wget -O- https://dl.bitmask.net/apt.key | apt-key add -&#x000A;apt update&#x000A;apt install bitmask leap-archive-keyring&#x000A;</pre>
+<pre>sudo -s
+apt install leap-archive-keyring
+echo "deb http://deb.bitmask.net/debian sid main" > /etc/apt/sources.list.d/bitmask.list&#x000A;apt update&#x000A;apt install bitmask&#x000A;</pre>
<p class='b'>To remove</p>
-<pre>sudo -s&#x000A;apt remove bitmask leap-archive-keyring&#x000A;apt-key del 0x1E34A1828E207901&#x000A;rm /etc/apt/sources.list.d/bitmask.list&#x000A;</pre>
+<pre>sudo -s&#x000A;apt remove bitmask leap-archive-keyring&#x000A;rm /etc/apt/sources.list.d/bitmask.list&#x000A;</pre>
<p class='b'>When upgrading to this OS</p>
<pre>sudo -s&#x000A;echo "deb http://deb.bitmask.net/debian sid main" > /etc/apt/sources.list.d/bitmask.list&#x000A;apt update&#x000A;apt upgrade&#x000A;</pre>
</p>
@@ -187,7 +194,7 @@ apt-get dist-upgrade
<h1><a name="latest-builds"></a>Latest builds</h1>
-<p>For the more adventurous we make stand alone bundle builds available after each commit or merge. Currently best tested again clientdev.bitmask.net, because of ongoing changes of Soledad.</p>
+<p>For the more adventurous we make stand alone bundle builds available after each commit or merge. Currently best tested again cdev.bitmask.net, because of ongoing changes of Soledad.</p>
<p> <a class='btn btn-primary btn-large' href='https://0xacab.org/leap/bitmask-dev/builds/artifacts/master/download?job=bitmask_latest_bundle'>
<i class='fa fa-cloud-download fa-lg'></i>
diff --git a/public/linux/index.es.html b/public/linux/index.es.html
index 1c3eac4..924b30f 100644
--- a/public/linux/index.es.html
+++ b/public/linux/index.es.html
@@ -123,9 +123,12 @@ Bitmask Downloads
<h3><a name="debian-8-stablejessie"></a>Debian 8 (Stable/Jessie)</h3>
<p><p class='b'>To install</p>
-<pre>sudo -s&#x000A;echo "deb http://deb.bitmask.net/debian jessie main" > /etc/apt/sources.list.d/bitmask.list&#x000A;wget -O- https://dl.bitmask.net/apt.key | apt-key add -&#x000A;apt update&#x000A;apt install bitmask leap-archive-keyring&#x000A;</pre>
+<pre>Follow <a href="https://backports.debian.org/Instructions">instructions for activating Debian Backports</a>.
+sudo -s
+apt install -t jessie-backports leap-archive-keyring
+echo "deb http://deb.bitmask.net/debian jessie main" > /etc/apt/sources.list.d/bitmask.list&#x000A;apt update&#x000A;apt install bitmask&#x000A;</pre>
<p class='b'>To remove</p>
-<pre>sudo -s&#x000A;apt remove bitmask leap-archive-keyring&#x000A;apt-key del 0x1E34A1828E207901&#x000A;rm /etc/apt/sources.list.d/bitmask.list&#x000A;</pre>
+<pre>sudo -s&#x000A;apt remove bitmask leap-archive-keyring&#x000A;rm /etc/apt/sources.list.d/bitmask.list&#x000A;</pre>
<p class='b'>When upgrading to this OS</p>
<pre>sudo -s&#x000A;echo "deb http://deb.bitmask.net/debian jessie main" > /etc/apt/sources.list.d/bitmask.list&#x000A;apt update&#x000A;apt upgrade&#x000A;</pre>
</p>
@@ -133,9 +136,11 @@ Bitmask Downloads
<h3><a name="debian-testing-stretch"></a>Debian Testing (Stretch)</h3>
<p><p class='b'>To install</p>
-<pre>sudo -s&#x000A;echo "deb http://deb.bitmask.net/debian testing main" > /etc/apt/sources.list.d/bitmask.list&#x000A;wget -O- https://dl.bitmask.net/apt.key | apt-key add -&#x000A;apt update&#x000A;apt install bitmask leap-archive-keyring&#x000A;</pre>
+<pre>sudo -s
+apt install leap-archive-keyring
+echo "deb http://deb.bitmask.net/debian testing main" > /etc/apt/sources.list.d/bitmask.list&#x000A;apt update&#x000A;apt install bitmask&#x000A;</pre>
<p class='b'>To remove</p>
-<pre>sudo -s&#x000A;apt remove bitmask leap-archive-keyring&#x000A;apt-key del 0x1E34A1828E207901&#x000A;rm /etc/apt/sources.list.d/bitmask.list&#x000A;</pre>
+<pre>sudo -s&#x000A;apt remove bitmask leap-archive-keyring&#x000A;rm /etc/apt/sources.list.d/bitmask.list&#x000A;</pre>
<p class='b'>When upgrading to this OS</p>
<pre>sudo -s&#x000A;echo "deb http://deb.bitmask.net/debian testing main" > /etc/apt/sources.list.d/bitmask.list&#x000A;apt update&#x000A;apt upgrade&#x000A;</pre>
</p>
@@ -143,9 +148,11 @@ Bitmask Downloads
<h3><a name="debian-unstable-sid"></a>Debian Unstable (Sid)</h3>
<p><p class='b'>To install</p>
-<pre>sudo -s&#x000A;echo "deb http://deb.bitmask.net/debian sid main" > /etc/apt/sources.list.d/bitmask.list&#x000A;wget -O- https://dl.bitmask.net/apt.key | apt-key add -&#x000A;apt update&#x000A;apt install bitmask leap-archive-keyring&#x000A;</pre>
+<pre>sudo -s
+apt install leap-archive-keyring
+echo "deb http://deb.bitmask.net/debian sid main" > /etc/apt/sources.list.d/bitmask.list&#x000A;apt update&#x000A;apt install bitmask&#x000A;</pre>
<p class='b'>To remove</p>
-<pre>sudo -s&#x000A;apt remove bitmask leap-archive-keyring&#x000A;apt-key del 0x1E34A1828E207901&#x000A;rm /etc/apt/sources.list.d/bitmask.list&#x000A;</pre>
+<pre>sudo -s&#x000A;apt remove bitmask leap-archive-keyring&#x000A;rm /etc/apt/sources.list.d/bitmask.list&#x000A;</pre>
<p class='b'>When upgrading to this OS</p>
<pre>sudo -s&#x000A;echo "deb http://deb.bitmask.net/debian sid main" > /etc/apt/sources.list.d/bitmask.list&#x000A;apt update&#x000A;apt upgrade&#x000A;</pre>
</p>
@@ -187,7 +194,7 @@ apt-get dist-upgrade
<h1><a name="latest-builds"></a>Latest builds</h1>
-<p>For the more adventurous we make stand alone bundle builds available after each commit or merge. Currently best tested again clientdev.bitmask.net, because of ongoing changes of Soledad.</p>
+<p>For the more adventurous we make stand alone bundle builds available after each commit or merge. Currently best tested again cdev.bitmask.net, because of ongoing changes of Soledad.</p>
<p> <a class='btn btn-primary btn-large' href='https://0xacab.org/leap/bitmask-dev/builds/artifacts/master/download?job=bitmask_latest_bundle'>
<i class='fa fa-cloud-download fa-lg'></i>
diff --git a/public/linux/index.pt.html b/public/linux/index.pt.html
index ca2bcb1..ec1cb5c 100644
--- a/public/linux/index.pt.html
+++ b/public/linux/index.pt.html
@@ -123,9 +123,12 @@ Bitmask Downloads
<h3><a name="debian-8-stablejessie"></a>Debian 8 (Stable/Jessie)</h3>
<p><p class='b'>To install</p>
-<pre>sudo -s&#x000A;echo "deb http://deb.bitmask.net/debian jessie main" > /etc/apt/sources.list.d/bitmask.list&#x000A;wget -O- https://dl.bitmask.net/apt.key | apt-key add -&#x000A;apt update&#x000A;apt install bitmask leap-archive-keyring&#x000A;</pre>
+<pre>Follow <a href="https://backports.debian.org/Instructions">instructions for activating Debian Backports</a>.
+sudo -s
+apt install -t jessie-backports leap-archive-keyring
+echo "deb http://deb.bitmask.net/debian jessie main" > /etc/apt/sources.list.d/bitmask.list&#x000A;apt update&#x000A;apt install bitmask&#x000A;</pre>
<p class='b'>To remove</p>
-<pre>sudo -s&#x000A;apt remove bitmask leap-archive-keyring&#x000A;apt-key del 0x1E34A1828E207901&#x000A;rm /etc/apt/sources.list.d/bitmask.list&#x000A;</pre>
+<pre>sudo -s&#x000A;apt remove bitmask leap-archive-keyring&#x000A;rm /etc/apt/sources.list.d/bitmask.list&#x000A;</pre>
<p class='b'>When upgrading to this OS</p>
<pre>sudo -s&#x000A;echo "deb http://deb.bitmask.net/debian jessie main" > /etc/apt/sources.list.d/bitmask.list&#x000A;apt update&#x000A;apt upgrade&#x000A;</pre>
</p>
@@ -133,9 +136,11 @@ Bitmask Downloads
<h3><a name="debian-testing-stretch"></a>Debian Testing (Stretch)</h3>
<p><p class='b'>To install</p>
-<pre>sudo -s&#x000A;echo "deb http://deb.bitmask.net/debian testing main" > /etc/apt/sources.list.d/bitmask.list&#x000A;wget -O- https://dl.bitmask.net/apt.key | apt-key add -&#x000A;apt update&#x000A;apt install bitmask leap-archive-keyring&#x000A;</pre>
+<pre>sudo -s
+apt install leap-archive-keyring
+echo "deb http://deb.bitmask.net/debian testing main" > /etc/apt/sources.list.d/bitmask.list&#x000A;apt update&#x000A;apt install bitmask&#x000A;</pre>
<p class='b'>To remove</p>
-<pre>sudo -s&#x000A;apt remove bitmask leap-archive-keyring&#x000A;apt-key del 0x1E34A1828E207901&#x000A;rm /etc/apt/sources.list.d/bitmask.list&#x000A;</pre>
+<pre>sudo -s&#x000A;apt remove bitmask leap-archive-keyring&#x000A;rm /etc/apt/sources.list.d/bitmask.list&#x000A;</pre>
<p class='b'>When upgrading to this OS</p>
<pre>sudo -s&#x000A;echo "deb http://deb.bitmask.net/debian testing main" > /etc/apt/sources.list.d/bitmask.list&#x000A;apt update&#x000A;apt upgrade&#x000A;</pre>
</p>
@@ -143,9 +148,11 @@ Bitmask Downloads
<h3><a name="debian-unstable-sid"></a>Debian Unstable (Sid)</h3>
<p><p class='b'>To install</p>
-<pre>sudo -s&#x000A;echo "deb http://deb.bitmask.net/debian sid main" > /etc/apt/sources.list.d/bitmask.list&#x000A;wget -O- https://dl.bitmask.net/apt.key | apt-key add -&#x000A;apt update&#x000A;apt install bitmask leap-archive-keyring&#x000A;</pre>
+<pre>sudo -s
+apt install leap-archive-keyring
+echo "deb http://deb.bitmask.net/debian sid main" > /etc/apt/sources.list.d/bitmask.list&#x000A;apt update&#x000A;apt install bitmask&#x000A;</pre>
<p class='b'>To remove</p>
-<pre>sudo -s&#x000A;apt remove bitmask leap-archive-keyring&#x000A;apt-key del 0x1E34A1828E207901&#x000A;rm /etc/apt/sources.list.d/bitmask.list&#x000A;</pre>
+<pre>sudo -s&#x000A;apt remove bitmask leap-archive-keyring&#x000A;rm /etc/apt/sources.list.d/bitmask.list&#x000A;</pre>
<p class='b'>When upgrading to this OS</p>
<pre>sudo -s&#x000A;echo "deb http://deb.bitmask.net/debian sid main" > /etc/apt/sources.list.d/bitmask.list&#x000A;apt update&#x000A;apt upgrade&#x000A;</pre>
</p>
@@ -187,7 +194,7 @@ apt-get dist-upgrade
<h1><a name="latest-builds"></a>Latest builds</h1>
-<p>For the more adventurous we make stand alone bundle builds available after each commit or merge. Currently best tested again clientdev.bitmask.net, because of ongoing changes of Soledad.</p>
+<p>For the more adventurous we make stand alone bundle builds available after each commit or merge. Currently best tested again cdev.bitmask.net, because of ongoing changes of Soledad.</p>
<p> <a class='btn btn-primary btn-large' href='https://0xacab.org/leap/bitmask-dev/builds/artifacts/master/download?job=bitmask_latest_bundle'>
<i class='fa fa-cloud-download fa-lg'></i>
diff --git a/public/linux/index.ru.html b/public/linux/index.ru.html
index 7c8dfd9..a8649a9 100644
--- a/public/linux/index.ru.html
+++ b/public/linux/index.ru.html
@@ -92,9 +92,11 @@ apt-get dist-upgrade</code></pre>
</p>
<h3><a name="debian-80-jessie"></a>Debian 8.0 (Jessie)</h3>
<p><p class='b'>Для установки</p>
-<pre>sudo -s&#x000A;echo "deb http://deb.bitmask.net/debian jessie main" > /etc/apt/sources.list.d/bitmask.list&#x000A;wget -O- https://dl.bitmask.net/apt.key | apt-key add -&#x000A;apt update&#x000A;apt install bitmask leap-archive-keyring&#x000A;</pre>
+<pre>sudo -s
+apt install leap-archive-keyring
+echo "deb http://deb.bitmask.net/debian jessie main" > /etc/apt/sources.list.d/bitmask.list&#x000A;apt update&#x000A;apt install bitmask&#x000A;</pre>
<p class='b'>Для удаления</p>
-<pre>sudo -s&#x000A;apt remove bitmask leap-archive-keyring&#x000A;apt-key del 0x1E34A1828E207901&#x000A;rm /etc/apt/sources.list.d/bitmask.list&#x000A;</pre>
+<pre>sudo -s&#x000A;apt remove bitmask leap-archive-keyring&#x000A;rm /etc/apt/sources.list.d/bitmask.list&#x000A;</pre>
<p class='b'>When upgrading to this OS</p>
<pre>sudo -s&#x000A;echo "deb http://deb.bitmask.net/debian jessie main" > /etc/apt/sources.list.d/bitmask.list&#x000A;apt update&#x000A;apt upgrade&#x000A;</pre>
</p>