From 2c5c3b1d9da2edad91cae783309e823d30a04be7 Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Tue, 10 Jan 2017 11:53:57 -0500 Subject: Update linux instructions to include official debian keyring package --- pages/linux/_via_packages.html.haml | 13 +++++++++---- pages/linux/en.md | 2 +- public/linux/index.en.html | 21 ++++++++++++++------- public/linux/index.es.html | 21 ++++++++++++++------- public/linux/index.pt.html | 21 ++++++++++++++------- public/linux/index.ru.html | 6 ++++-- 6 files changed, 56 insertions(+), 28 deletions(-) diff --git a/pages/linux/_via_packages.html.haml b/pages/linux/_via_packages.html.haml index 3c0dae2..727318f 100644 --- a/pages/linux/_via_packages.html.haml +++ b/pages/linux/_via_packages.html.haml @@ -3,12 +3,18 @@ %p.b= t :to_install %pre - :preserve + - if @locals[:backport] == 'true' + Follow [[instructions for activating Debian Backports => https://backports.debian.org/Instructions]]. + sudo -s + apt install -t #{@locals[:distro]}-backports leap-archive-keyring + \ + - else sudo -s + apt install leap-archive-keyring + :preserve echo "deb http://deb.bitmask.net/debian #{@locals[:distro]} main" > /etc/apt/sources.list.d/bitmask.list - wget -O- https://dl.bitmask.net/apt.key | apt-key add - apt update - apt install bitmask leap-archive-keyring + apt install bitmask %p.b= t :to_remove @@ -16,7 +22,6 @@ :preserve sudo -s apt remove bitmask leap-archive-keyring - apt-key del 0x1E34A1828E207901 rm /etc/apt/sources.list.d/bitmask.list %p.b= t :upgrade_os diff --git a/pages/linux/en.md b/pages/linux/en.md index 4602360..f1eb444 100644 --- a/pages/linux/en.md +++ b/pages/linux/en.md @@ -34,7 +34,7 @@ If you are using Wheezy, then you will need to use the bundle method. ### Debian 8 (Stable/Jessie) -<%= render({:partial => 'via_packages'}, {:distro => 'jessie', :os => 'debian'}) %> +<%= render({:partial => 'via_packages'}, {:distro => 'jessie', :os => 'debian', :backport => 'true'}) %> ### Debian Testing (Stretch) 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

Debian 8 (Stable/Jessie)

To install

-
sudo -s
echo "deb http://deb.bitmask.net/debian jessie main" > /etc/apt/sources.list.d/bitmask.list
wget -O- https://dl.bitmask.net/apt.key | apt-key add -
apt update
apt install bitmask leap-archive-keyring
+
Follow instructions for activating Debian Backports.
+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
apt update
apt install bitmask

To remove

-
sudo -s
apt remove bitmask leap-archive-keyring
apt-key del 0x1E34A1828E207901
rm /etc/apt/sources.list.d/bitmask.list
+
sudo -s
apt remove bitmask leap-archive-keyring
rm /etc/apt/sources.list.d/bitmask.list

When upgrading to this OS

sudo -s
echo "deb http://deb.bitmask.net/debian jessie main" > /etc/apt/sources.list.d/bitmask.list
apt update
apt upgrade

@@ -133,9 +136,11 @@ Bitmask Downloads

Debian Testing (Stretch)

To install

-
sudo -s
echo "deb http://deb.bitmask.net/debian testing main" > /etc/apt/sources.list.d/bitmask.list
wget -O- https://dl.bitmask.net/apt.key | apt-key add -
apt update
apt install bitmask leap-archive-keyring
+
sudo -s
+apt install leap-archive-keyring
+echo "deb http://deb.bitmask.net/debian testing main" > /etc/apt/sources.list.d/bitmask.list
apt update
apt install bitmask

To remove

-
sudo -s
apt remove bitmask leap-archive-keyring
apt-key del 0x1E34A1828E207901
rm /etc/apt/sources.list.d/bitmask.list
+
sudo -s
apt remove bitmask leap-archive-keyring
rm /etc/apt/sources.list.d/bitmask.list

When upgrading to this OS

sudo -s
echo "deb http://deb.bitmask.net/debian testing main" > /etc/apt/sources.list.d/bitmask.list
apt update
apt upgrade

@@ -143,9 +148,11 @@ Bitmask Downloads

Debian Unstable (Sid)

To install

-
sudo -s
echo "deb http://deb.bitmask.net/debian sid main" > /etc/apt/sources.list.d/bitmask.list
wget -O- https://dl.bitmask.net/apt.key | apt-key add -
apt update
apt install bitmask leap-archive-keyring
+
sudo -s
+apt install leap-archive-keyring
+echo "deb http://deb.bitmask.net/debian sid main" > /etc/apt/sources.list.d/bitmask.list
apt update
apt install bitmask

To remove

-
sudo -s
apt remove bitmask leap-archive-keyring
apt-key del 0x1E34A1828E207901
rm /etc/apt/sources.list.d/bitmask.list
+
sudo -s
apt remove bitmask leap-archive-keyring
rm /etc/apt/sources.list.d/bitmask.list

When upgrading to this OS

sudo -s
echo "deb http://deb.bitmask.net/debian sid main" > /etc/apt/sources.list.d/bitmask.list
apt update
apt upgrade

@@ -187,7 +194,7 @@ apt-get dist-upgrade

Latest builds

-

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.

+

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.

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

Debian 8 (Stable/Jessie)

To install

-
sudo -s
echo "deb http://deb.bitmask.net/debian jessie main" > /etc/apt/sources.list.d/bitmask.list
wget -O- https://dl.bitmask.net/apt.key | apt-key add -
apt update
apt install bitmask leap-archive-keyring
+
Follow instructions for activating Debian Backports.
+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
apt update
apt install bitmask

To remove

-
sudo -s
apt remove bitmask leap-archive-keyring
apt-key del 0x1E34A1828E207901
rm /etc/apt/sources.list.d/bitmask.list
+
sudo -s
apt remove bitmask leap-archive-keyring
rm /etc/apt/sources.list.d/bitmask.list

When upgrading to this OS

sudo -s
echo "deb http://deb.bitmask.net/debian jessie main" > /etc/apt/sources.list.d/bitmask.list
apt update
apt upgrade

@@ -133,9 +136,11 @@ Bitmask Downloads

Debian Testing (Stretch)

To install

-
sudo -s
echo "deb http://deb.bitmask.net/debian testing main" > /etc/apt/sources.list.d/bitmask.list
wget -O- https://dl.bitmask.net/apt.key | apt-key add -
apt update
apt install bitmask leap-archive-keyring
+
sudo -s
+apt install leap-archive-keyring
+echo "deb http://deb.bitmask.net/debian testing main" > /etc/apt/sources.list.d/bitmask.list
apt update
apt install bitmask

To remove

-
sudo -s
apt remove bitmask leap-archive-keyring
apt-key del 0x1E34A1828E207901
rm /etc/apt/sources.list.d/bitmask.list
+
sudo -s
apt remove bitmask leap-archive-keyring
rm /etc/apt/sources.list.d/bitmask.list

When upgrading to this OS

sudo -s
echo "deb http://deb.bitmask.net/debian testing main" > /etc/apt/sources.list.d/bitmask.list
apt update
apt upgrade

@@ -143,9 +148,11 @@ Bitmask Downloads

Debian Unstable (Sid)

To install

-
sudo -s
echo "deb http://deb.bitmask.net/debian sid main" > /etc/apt/sources.list.d/bitmask.list
wget -O- https://dl.bitmask.net/apt.key | apt-key add -
apt update
apt install bitmask leap-archive-keyring
+
sudo -s
+apt install leap-archive-keyring
+echo "deb http://deb.bitmask.net/debian sid main" > /etc/apt/sources.list.d/bitmask.list
apt update
apt install bitmask

To remove

-
sudo -s
apt remove bitmask leap-archive-keyring
apt-key del 0x1E34A1828E207901
rm /etc/apt/sources.list.d/bitmask.list
+
sudo -s
apt remove bitmask leap-archive-keyring
rm /etc/apt/sources.list.d/bitmask.list

When upgrading to this OS

sudo -s
echo "deb http://deb.bitmask.net/debian sid main" > /etc/apt/sources.list.d/bitmask.list
apt update
apt upgrade

@@ -187,7 +194,7 @@ apt-get dist-upgrade

Latest builds

-

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.

+

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.

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

Debian 8 (Stable/Jessie)

To install

-
sudo -s
echo "deb http://deb.bitmask.net/debian jessie main" > /etc/apt/sources.list.d/bitmask.list
wget -O- https://dl.bitmask.net/apt.key | apt-key add -
apt update
apt install bitmask leap-archive-keyring
+
Follow instructions for activating Debian Backports.
+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
apt update
apt install bitmask

To remove

-
sudo -s
apt remove bitmask leap-archive-keyring
apt-key del 0x1E34A1828E207901
rm /etc/apt/sources.list.d/bitmask.list
+
sudo -s
apt remove bitmask leap-archive-keyring
rm /etc/apt/sources.list.d/bitmask.list

When upgrading to this OS

sudo -s
echo "deb http://deb.bitmask.net/debian jessie main" > /etc/apt/sources.list.d/bitmask.list
apt update
apt upgrade

@@ -133,9 +136,11 @@ Bitmask Downloads

Debian Testing (Stretch)

To install

-
sudo -s
echo "deb http://deb.bitmask.net/debian testing main" > /etc/apt/sources.list.d/bitmask.list
wget -O- https://dl.bitmask.net/apt.key | apt-key add -
apt update
apt install bitmask leap-archive-keyring
+
sudo -s
+apt install leap-archive-keyring
+echo "deb http://deb.bitmask.net/debian testing main" > /etc/apt/sources.list.d/bitmask.list
apt update
apt install bitmask

To remove

-
sudo -s
apt remove bitmask leap-archive-keyring
apt-key del 0x1E34A1828E207901
rm /etc/apt/sources.list.d/bitmask.list
+
sudo -s
apt remove bitmask leap-archive-keyring
rm /etc/apt/sources.list.d/bitmask.list

When upgrading to this OS

sudo -s
echo "deb http://deb.bitmask.net/debian testing main" > /etc/apt/sources.list.d/bitmask.list
apt update
apt upgrade

@@ -143,9 +148,11 @@ Bitmask Downloads

Debian Unstable (Sid)

To install

-
sudo -s
echo "deb http://deb.bitmask.net/debian sid main" > /etc/apt/sources.list.d/bitmask.list
wget -O- https://dl.bitmask.net/apt.key | apt-key add -
apt update
apt install bitmask leap-archive-keyring
+
sudo -s
+apt install leap-archive-keyring
+echo "deb http://deb.bitmask.net/debian sid main" > /etc/apt/sources.list.d/bitmask.list
apt update
apt install bitmask

To remove

-
sudo -s
apt remove bitmask leap-archive-keyring
apt-key del 0x1E34A1828E207901
rm /etc/apt/sources.list.d/bitmask.list
+
sudo -s
apt remove bitmask leap-archive-keyring
rm /etc/apt/sources.list.d/bitmask.list

When upgrading to this OS

sudo -s
echo "deb http://deb.bitmask.net/debian sid main" > /etc/apt/sources.list.d/bitmask.list
apt update
apt upgrade

@@ -187,7 +194,7 @@ apt-get dist-upgrade

Latest builds

-

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.

+

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.

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

Debian 8.0 (Jessie)

Для установки

-
sudo -s
echo "deb http://deb.bitmask.net/debian jessie main" > /etc/apt/sources.list.d/bitmask.list
wget -O- https://dl.bitmask.net/apt.key | apt-key add -
apt update
apt install bitmask leap-archive-keyring
+
sudo -s
+apt install leap-archive-keyring
+echo "deb http://deb.bitmask.net/debian jessie main" > /etc/apt/sources.list.d/bitmask.list
apt update
apt install bitmask

Для удаления

-
sudo -s
apt remove bitmask leap-archive-keyring
apt-key del 0x1E34A1828E207901
rm /etc/apt/sources.list.d/bitmask.list
+
sudo -s
apt remove bitmask leap-archive-keyring
rm /etc/apt/sources.list.d/bitmask.list

When upgrading to this OS

sudo -s
echo "deb http://deb.bitmask.net/debian jessie main" > /etc/apt/sources.list.d/bitmask.list
apt update
apt upgrade

-- cgit v1.2.3