From 4269a6f961eba222e6cecacab20bdd37cc43a4a6 Mon Sep 17 00:00:00 2001 From: elijah Date: Sun, 11 Oct 2015 15:53:23 -0700 Subject: rebuild --- public/apt.key | Bin 17108 -> 4648 bytes public/common/_download_button.haml | 3 --- public/common/_email.md | 24 ------------------------ public/common/_notice.haml | 9 --------- public/linux/index.en.html | 32 ++++++++------------------------ 5 files changed, 8 insertions(+), 60 deletions(-) delete mode 100644 public/common/_download_button.haml delete mode 100644 public/common/_email.md delete mode 100644 public/common/_notice.haml diff --git a/public/apt.key b/public/apt.key index 18fd398..b6b5077 100644 Binary files a/public/apt.key and b/public/apt.key differ diff --git a/public/common/_download_button.haml b/public/common/_download_button.haml deleted file mode 100644 index 3e98432..0000000 --- a/public/common/_download_button.haml +++ /dev/null @@ -1,3 +0,0 @@ -%a{:href => @locals[:link], :class => 'btn btn-primary btn-large'} - %i.fa.fa-cloud-download.fa-lg - = @locals[:text] || t(:download) diff --git a/public/common/_email.md b/public/common/_email.md deleted file mode 100644 index 2db279e..0000000 --- a/public/common/_email.md +++ /dev/null @@ -1,24 +0,0 @@ -## Configuring email - -To get encrypted email to work, you have two options: - -1. [Bitmask Thunderbird Extension](https://addons.mozilla.org/en-us/thunderbird/addon/bitmask/) (recommended) -2. Manual email client configuration - -#### Bitmask Thunderbird Extension - -1. Install Bitmask app and register for an account. -2. Install the [Bitmask Thunderbird Extension](https://addons.mozilla.org/en-us/thunderbird/addon/bitmask/). -3. Select the Thunderbird menu item `File` > `New` > `Bitmask Account...` - -#### Manual email client configuration - -* IMAP -- `localhost:1984` - * username: the full email address you use with the Bitmask app. - * password: ignored, can be anything. - * SSL/TLS: off -* SMTP -- `localhost:2013` - * authentication: none - * SSL/TLS: off - -You should also disable any local caching in your email client, if applicable. All the data stored by Bitmask is kept on disk in an encrypted format, but your mail client might cache your email in clear text, so it is good to disable caching if you can. Also, all your Bitmask email is sync'ed locally anyway, so there is no benefit to local caching. diff --git a/public/common/_notice.haml b/public/common/_notice.haml deleted file mode 100644 index dc15c96..0000000 --- a/public/common/_notice.haml +++ /dev/null @@ -1,9 +0,0 @@ -.row - .col-sm-8.col-sm-offset-2 - - if @locals[:type] == 'warning' - .p.alert.alert-danger - %i.fa.fa-warning - = @locals[:text] - - elsif @locals[:type] == 'info' - .p.alert.alert-info - = @locals[:text] diff --git a/public/linux/index.en.html b/public/linux/index.en.html index e76d16a..4eab0b7 100644 --- a/public/linux/index.en.html +++ b/public/linux/index.en.html @@ -73,43 +73,27 @@ apt-get dist-upgrade

Install as packages

This is the recommended method of installing Bitmask. If installed as a package, Bitmask will run faster, be better integrated in the system, and will be kept up to date.

Ubuntu 15.04 (Vivid Vervet)

-

- To install -

+

To install

sudo -s
add-apt-repository "deb http://deb.bitmask.net/debian vivid main"
wget -O- https://dl.bitmask.net/apt.key | apt-key add -
apt-get update
apt-get install bitmask leap-keyring
-

- To remove -

+

To remove

sudo -s
apt-get remove bitmask leap-keyring
apt-key del 0x1E34A1828E207901
add-apt-repository --remove "deb http://deb.bitmask.net/debian vivid main"

Ubuntu 14.04 LTS (Trusty Tahr)

-

- To install -

+

To install

sudo -s
add-apt-repository "deb http://deb.bitmask.net/debian trusty main"
wget -O- https://dl.bitmask.net/apt.key | apt-key add -
apt-get update
apt-get install bitmask leap-keyring
-

- To remove -

+

To remove

sudo -s
apt-get remove bitmask leap-keyring
apt-key del 0x1E34A1828E207901
add-apt-repository --remove "deb http://deb.bitmask.net/debian trusty main"

Debian 7.0 (Wheezy)

-

- To install -

+

To install

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

- To remove -

+

To remove

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

Debian 8.0 (Jessie)

-

- To install -

+

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-get update
apt-get install bitmask leap-keyring
-

- To remove -

+

To remove

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

Install stand-alone bundle

-- cgit v1.2.3