diff options
| author | Micah Anderson <micah@riseup.net> | 2017-01-10 11:53:57 -0500 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2017-01-10 11:53:57 -0500 |
| commit | 2c5c3b1d9da2edad91cae783309e823d30a04be7 (patch) | |
| tree | 8e48fc96dc1f5e57193ced3baa482b79d8ae54ab | |
| parent | a480b8d0f52ff1503b509a28c353520025b602a3 (diff) | |
Update linux instructions to include official debian keyring package
| -rw-r--r-- | pages/linux/_via_packages.html.haml | 13 | ||||
| -rw-r--r-- | pages/linux/en.md | 2 | ||||
| -rw-r--r-- | public/linux/index.en.html | 21 | ||||
| -rw-r--r-- | public/linux/index.es.html | 21 | ||||
| -rw-r--r-- | public/linux/index.pt.html | 21 | ||||
| -rw-r--r-- | 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 <h3><a name="debian-8-stablejessie"></a>Debian 8 (Stable/Jessie)</h3> <p><p class='b'>To install</p> -<pre>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
</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
apt update
apt install bitmask
</pre> <p class='b'>To remove</p> -<pre>sudo -s
apt remove bitmask leap-archive-keyring
apt-key del 0x1E34A1828E207901
rm /etc/apt/sources.list.d/bitmask.list
</pre> +<pre>sudo -s
apt remove bitmask leap-archive-keyring
rm /etc/apt/sources.list.d/bitmask.list
</pre> <p class='b'>When upgrading to this OS</p> <pre>sudo -s
echo "deb http://deb.bitmask.net/debian jessie main" > /etc/apt/sources.list.d/bitmask.list
apt update
apt upgrade
</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
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
</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
apt update
apt install bitmask
</pre> <p class='b'>To remove</p> -<pre>sudo -s
apt remove bitmask leap-archive-keyring
apt-key del 0x1E34A1828E207901
rm /etc/apt/sources.list.d/bitmask.list
</pre> +<pre>sudo -s
apt remove bitmask leap-archive-keyring
rm /etc/apt/sources.list.d/bitmask.list
</pre> <p class='b'>When upgrading to this OS</p> <pre>sudo -s
echo "deb http://deb.bitmask.net/debian testing main" > /etc/apt/sources.list.d/bitmask.list
apt update
apt upgrade
</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
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
</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
apt update
apt install bitmask
</pre> <p class='b'>To remove</p> -<pre>sudo -s
apt remove bitmask leap-archive-keyring
apt-key del 0x1E34A1828E207901
rm /etc/apt/sources.list.d/bitmask.list
</pre> +<pre>sudo -s
apt remove bitmask leap-archive-keyring
rm /etc/apt/sources.list.d/bitmask.list
</pre> <p class='b'>When upgrading to this OS</p> <pre>sudo -s
echo "deb http://deb.bitmask.net/debian sid main" > /etc/apt/sources.list.d/bitmask.list
apt update
apt upgrade
</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
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
</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
apt update
apt install bitmask
</pre> <p class='b'>To remove</p> -<pre>sudo -s
apt remove bitmask leap-archive-keyring
apt-key del 0x1E34A1828E207901
rm /etc/apt/sources.list.d/bitmask.list
</pre> +<pre>sudo -s
apt remove bitmask leap-archive-keyring
rm /etc/apt/sources.list.d/bitmask.list
</pre> <p class='b'>When upgrading to this OS</p> <pre>sudo -s
echo "deb http://deb.bitmask.net/debian jessie main" > /etc/apt/sources.list.d/bitmask.list
apt update
apt upgrade
</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
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
</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
apt update
apt install bitmask
</pre> <p class='b'>To remove</p> -<pre>sudo -s
apt remove bitmask leap-archive-keyring
apt-key del 0x1E34A1828E207901
rm /etc/apt/sources.list.d/bitmask.list
</pre> +<pre>sudo -s
apt remove bitmask leap-archive-keyring
rm /etc/apt/sources.list.d/bitmask.list
</pre> <p class='b'>When upgrading to this OS</p> <pre>sudo -s
echo "deb http://deb.bitmask.net/debian testing main" > /etc/apt/sources.list.d/bitmask.list
apt update
apt upgrade
</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
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
</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
apt update
apt install bitmask
</pre> <p class='b'>To remove</p> -<pre>sudo -s
apt remove bitmask leap-archive-keyring
apt-key del 0x1E34A1828E207901
rm /etc/apt/sources.list.d/bitmask.list
</pre> +<pre>sudo -s
apt remove bitmask leap-archive-keyring
rm /etc/apt/sources.list.d/bitmask.list
</pre> <p class='b'>When upgrading to this OS</p> <pre>sudo -s
echo "deb http://deb.bitmask.net/debian sid main" > /etc/apt/sources.list.d/bitmask.list
apt update
apt upgrade
</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
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
</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
apt update
apt install bitmask
</pre> <p class='b'>To remove</p> -<pre>sudo -s
apt remove bitmask leap-archive-keyring
apt-key del 0x1E34A1828E207901
rm /etc/apt/sources.list.d/bitmask.list
</pre> +<pre>sudo -s
apt remove bitmask leap-archive-keyring
rm /etc/apt/sources.list.d/bitmask.list
</pre> <p class='b'>When upgrading to this OS</p> <pre>sudo -s
echo "deb http://deb.bitmask.net/debian jessie main" > /etc/apt/sources.list.d/bitmask.list
apt update
apt upgrade
</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
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
</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
apt update
apt install bitmask
</pre> <p class='b'>To remove</p> -<pre>sudo -s
apt remove bitmask leap-archive-keyring
apt-key del 0x1E34A1828E207901
rm /etc/apt/sources.list.d/bitmask.list
</pre> +<pre>sudo -s
apt remove bitmask leap-archive-keyring
rm /etc/apt/sources.list.d/bitmask.list
</pre> <p class='b'>When upgrading to this OS</p> <pre>sudo -s
echo "deb http://deb.bitmask.net/debian testing main" > /etc/apt/sources.list.d/bitmask.list
apt update
apt upgrade
</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
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
</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
apt update
apt install bitmask
</pre> <p class='b'>To remove</p> -<pre>sudo -s
apt remove bitmask leap-archive-keyring
apt-key del 0x1E34A1828E207901
rm /etc/apt/sources.list.d/bitmask.list
</pre> +<pre>sudo -s
apt remove bitmask leap-archive-keyring
rm /etc/apt/sources.list.d/bitmask.list
</pre> <p class='b'>When upgrading to this OS</p> <pre>sudo -s
echo "deb http://deb.bitmask.net/debian sid main" > /etc/apt/sources.list.d/bitmask.list
apt update
apt upgrade
</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
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
</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
apt update
apt install bitmask
</pre> <p class='b'>Для удаления</p> -<pre>sudo -s
apt remove bitmask leap-archive-keyring
apt-key del 0x1E34A1828E207901
rm /etc/apt/sources.list.d/bitmask.list
</pre> +<pre>sudo -s
apt remove bitmask leap-archive-keyring
rm /etc/apt/sources.list.d/bitmask.list
</pre> <p class='b'>When upgrading to this OS</p> <pre>sudo -s
echo "deb http://deb.bitmask.net/debian jessie main" > /etc/apt/sources.list.d/bitmask.list
apt update
apt upgrade
</pre> </p> |