From 12e766db1cd7cd4eb5a2ae5413700aaf4a3bd2f6 Mon Sep 17 00:00:00 2001 From: Ivan Alejandro Date: Tue, 27 Oct 2015 15:16:39 -0300 Subject: Reorder install methods Also remove other methods, they are already listed on leap.se docs. --- pages/install/linux/en.text | 40 +++++++++++++++++----------------------- 1 file changed, 17 insertions(+), 23 deletions(-) (limited to 'pages') diff --git a/pages/install/linux/en.text b/pages/install/linux/en.text index 482df21..a300ced 100644 --- a/pages/install/linux/en.text +++ b/pages/install/linux/en.text @@ -18,26 +18,6 @@ bc. sudo add-apt-repository "deb http://deb.bitmask.net/debian vivid main" This is because the Ubuntu upgrade process probably commented out all your prior custom repository lines in @/etc/apt/sources.list@. -h2. 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. - -h3. Ubuntu 15.04 (Vivid Vervet) - -<%= render({:partial => 'via_packages'}, {:distro => 'vivid'}) %> - -h3. Ubuntu 14.04 LTS (Trusty Tahr) - -<%= render({:partial => 'via_packages'}, {:distro => 'trusty'}) %> - -h3. Debian 7.0 (Wheezy) - -<%= render({:partial => 'via_packages'}, {:distro => 'wheezy', :os => 'debian'}) %> - -h3. Debian 8.0 (Jessie) - -<%= render({:partial => 'via_packages'}, {:distro => 'jessie', :os => 'debian'}) %> - h2. Install stand-alone bundle Alternately, you can run Bitmask from a stand alone bundle. This is useful if want to run Bitmask from a thumb drive. The bundle should work on most recent Linux distributions that are derived from Debian (e.g. Ubuntu, Mint, Trisquel, etc). @@ -71,8 +51,22 @@ h3. 64 bit kernel [[Signature file => https://dl.bitmask.net/client/linux/stable/Bitmask-linux64-latest.tar.bz2.asc]] -h3. Other options +h2. 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. + +h3. Ubuntu 15.04 (Vivid Vervet) + +<%= render({:partial => 'via_packages'}, {:distro => 'vivid'}) %> + +h3. Ubuntu 14.04 LTS (Trusty Tahr) -You can [[browse all releases => https://dl.bitmask.net/client/linux/]] for old or experimental downloads. +<%= render({:partial => 'via_packages'}, {:distro => 'trusty'}) %> -You should install the latest stable release. Downloads tagged with "RC" are "Release Candidates" and receive frequent experimental updates that may break the application. +h3. Debian 7.0 (Wheezy) + +<%= render({:partial => 'via_packages'}, {:distro => 'wheezy', :os => 'debian'}) %> + +h3. Debian 8.0 (Jessie) + +<%= render({:partial => 'via_packages'}, {:distro => 'jessie', :os => 'debian'}) %> -- cgit v1.2.3 From e34a5c12fc86b31ce068a1f3f99a09a6a385e933 Mon Sep 17 00:00:00 2001 From: Ivan Alejandro Date: Wed, 28 Oct 2015 15:30:19 -0300 Subject: Reduce h3 size, lot smaller than h2 --- pages/assets/style.scss | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'pages') diff --git a/pages/assets/style.scss b/pages/assets/style.scss index 2a7eb96..47e4d21 100644 --- a/pages/assets/style.scss +++ b/pages/assets/style.scss @@ -40,6 +40,12 @@ h2.hidey { margin: 0; } +h3 { + @extend h3; + font-size: 21px; +} + + h4 { margin-top: 20px; } -- cgit v1.2.3 From d2b37d3150e9d48434e21507bd4cf3248cfd0b3a Mon Sep 17 00:00:00 2001 From: Ivan Alejandro Date: Fri, 30 Oct 2015 17:08:45 -0300 Subject: Remove 'coming soon' for email service --- pages/home/_intro.en.text | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pages') diff --git a/pages/home/_intro.en.text b/pages/home/_intro.en.text index 5361337..8c1b884 100644 --- a/pages/home/_intro.en.text +++ b/pages/home/_intro.en.text @@ -1 +1 @@ -*Bitmask* is an open source application to provide easy and secure encrypted communication. You can choose among [[several different service providers => #providers]] or [[start your own => https://leap.se/en/docs/platform]]. Currently, Bitmask supports encrypted internet (VPN) with encrypted email coming soon. +*Bitmask* is an open source application to provide easy and secure encrypted communication. You can choose among [[several different service providers => #providers]] or [[start your own => https://leap.se/en/docs/platform]]. Currently, Bitmask supports encrypted internet (VPN) with encrypted email. -- cgit v1.2.3 From 30f3da85a215fdc7f75cd55e771626597e43c3b8 Mon Sep 17 00:00:00 2001 From: Ivan Alejandro Date: Fri, 30 Oct 2015 17:09:23 -0300 Subject: Add info for testers on which provider to use --- pages/install/en.haml | 6 ++++++ pages/install/es.haml | 6 ++++++ 2 files changed, 12 insertions(+) (limited to 'pages') diff --git a/pages/install/en.haml b/pages/install/en.haml index aa4a44f..a7044a3 100644 --- a/pages/install/en.haml +++ b/pages/install/en.haml @@ -7,6 +7,12 @@ %i.fa.fa-warning = t :warning +.row + .col-sm-8.col-sm-offset-2 + .p.alert.alert-info + %i.fa.fa-info-circle + = t :providers_for_testers + .row.bm-front-buttons .col-sm-3.col-xs-6 %a.btn.btn-default{:href=>"android"} diff --git a/pages/install/es.haml b/pages/install/es.haml index ada090b..f996a85 100644 --- a/pages/install/es.haml +++ b/pages/install/es.haml @@ -7,6 +7,12 @@ %i.fa.fa-warning = t :warning +.row + .col-sm-8.col-sm-offset-2 + .p.alert.alert-info + %i.fa.fa-info-circle + = t :providers_for_testers + .row.bm-front-buttons .col-sm-3.col-xs-6 %a.btn.btn-default{:href=>"android"} -- cgit v1.2.3 From 917d88f4be1d5a1c674cd0ef203ddc377cbd505b Mon Sep 17 00:00:00 2001 From: Ivan Alejandro Date: Fri, 30 Oct 2015 17:11:43 -0300 Subject: Add mail.bitmask.net to out list of providers --- pages/assets/providers/mail.bitmask.net.png | Bin 0 -> 49412 bytes pages/home/_about.en.text | 2 +- pages/home/_about.es.text | 2 +- pages/home/_text.haml | 5 +++++ 4 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 pages/assets/providers/mail.bitmask.net.png (limited to 'pages') diff --git a/pages/assets/providers/mail.bitmask.net.png b/pages/assets/providers/mail.bitmask.net.png new file mode 100644 index 0000000..580bbac Binary files /dev/null and b/pages/assets/providers/mail.bitmask.net.png differ diff --git a/pages/home/_about.en.text b/pages/home/_about.en.text index 753dab1..642f062 100644 --- a/pages/home/_about.en.text +++ b/pages/home/_about.en.text @@ -2,4 +2,4 @@ The *Bitmask* application is lovingly hand-crafted by a team of paid and volunteer programmers from seven different countries. Development is principally sponsored by the [[LEAP Encryption Access Project => https://leap.se]], an non-profit organization dedicated to defending democracy by *protecting the right to whisper*. -The service provider https://demo.bitmask.net is operated by LEAP in order to demonstrate usage of the *Bitmask* application. However, we actively encourage other organizations to start their own compatible service providers by using our free software [[platform for server automation => https://leap.se/en/platform]]. \ No newline at end of file +The service providers https://demo.bitmask.net and https://mail.bitmask.net are operated by LEAP in order to demonstrate usage of the *Bitmask* application. However, we actively encourage other organizations to start their own compatible service providers by using our free software [[platform for server automation => https://leap.se/en/platform]]. diff --git a/pages/home/_about.es.text b/pages/home/_about.es.text index 1b8c684..7e32189 100644 --- a/pages/home/_about.es.text +++ b/pages/home/_about.es.text @@ -2,4 +2,4 @@ La aplicación *Bitmask* está cuidadosamente manufacturada por un equipo de programadores, pagados y voluntarios, repartidos por siete países diferentes. El desarrollo está esponsorizado principalmente por el proyecto [[LEAP Encryption Access Project => https://leap.se]], una organización sin ánimo de lucro dedicada a la defensa de la democracia al *proteger el derecho a susurrar*. -LEAP opera el proveedor de servicios *demo.bitmask.net* a efectos de demostración del uso de la aplicación *Bitmask*. Al mismo tiempo, animamos activamente a otras organizaciones a montar sus propios proveedores de servicios compatibles, usando nuestra [[plataforma para la automatización de servidores => https://leap.se/es/platform]], que es software libre. +LEAP opera los proveedores de servicios https://demo.bitmask.net y https://mail.bitmask.net a efectos de demostración del uso de la aplicación *Bitmask*. Al mismo tiempo, animamos activamente a otras organizaciones a montar sus propios proveedores de servicios compatibles, usando nuestra [[plataforma para la automatización de servidores => https://leap.se/es/platform]], que es software libre. diff --git a/pages/home/_text.haml b/pages/home/_text.haml index a6338cd..be722d9 100644 --- a/pages/home/_text.haml +++ b/pages/home/_text.haml @@ -32,6 +32,11 @@ %img(src='/assets/providers/demo.bitmask.net.png') .b [[demo.bitmask.net => https://demo.bitmask.net]] + .col-lg-2.col-md-3.col-sm-3.col-xs-4 + .thumbnail + %img(src='/assets/providers/mail.bitmask.net.png') + .b + [[mail.bitmask.net => https://mail.bitmask.net]] .col-lg-2.col-md-3.col-sm-3.col-xs-4 .thumbnail %img(src='/assets/providers/calyx.net.png') -- cgit v1.2.3 From a364427136ec896f4da7c781b66776c0bb479a08 Mon Sep 17 00:00:00 2001 From: Ivan Alejandro Date: Fri, 30 Oct 2015 17:39:38 -0300 Subject: Reorder and simplify bundle installation docs --- pages/install/linux/en.text | 35 +++++++++++++++++++++-------------- 1 file changed, 21 insertions(+), 14 deletions(-) (limited to 'pages') diff --git a/pages/install/linux/en.text b/pages/install/linux/en.text index a300ced..8ecdf55 100644 --- a/pages/install/linux/en.text +++ b/pages/install/linux/en.text @@ -18,16 +18,26 @@ bc. sudo add-apt-repository "deb http://deb.bitmask.net/debian vivid main" This is because the Ubuntu upgrade process probably commented out all your prior custom repository lines in @/etc/apt/sources.list@. -h2. Install stand-alone bundle +--- -Alternately, you can run Bitmask from a stand alone bundle. This is useful if want to run Bitmask from a thumb drive. The bundle should work on most recent Linux distributions that are derived from Debian (e.g. Ubuntu, Mint, Trisquel, etc). +There are two ways to install Bitmask - via the stand-alone bundles or via packages. -There are two disadvantages to the stand-alone bundle: +h2. Download stand-alone bundle -* The Bitmask app will be less well integrated with the desktop environment. -* Running from the bundle is slower to start than via packages. +h3. 64 bit kernel + +<%= render({:partial => 'common/download_button'}, {:link => 'https://dl.bitmask.net/client/linux/stable/Bitmask-linux64-latest.tar.bz2', :text => 'Download 64 bit'}) %> + +[[Signature file => https://dl.bitmask.net/client/linux/stable/Bitmask-linux64-latest.tar.bz2.asc]] -Optionally, you can [[authenticate the signature => signature-verification]] for the Bitmask files before you run them. +h3. 32 bit kernel + +<%= render({:partial => 'common/download_button'}, {:link => 'https://dl.bitmask.net/client/linux/stable/Bitmask-linux32-latest.tar.bz2', :text => 'Download 32 bit'}) %> + +[[Signature file => https://dl.bitmask.net/client/linux/stable/Bitmask-linux32-latest.tar.bz2.asc]] + +If you want to make sure that the Bitmask wasn't messed with during download +you can [[authenticate the signature => signature-verification]]. How do you tell if you running a 32 bit or 64 bit kernel? Run the following command: @@ -39,17 +49,14 @@ If the result is: * @i686@, you have *32 bit* * @i386@, you have *32 bit* -h3. 32 bit kernel -<%= render({:partial => 'common/download_button'}, {:link => 'https://dl.bitmask.net/client/linux/stable/Bitmask-linux32-latest.tar.bz2', :text => 'Download 32 bit'}) %> -[[Signature file => https://dl.bitmask.net/client/linux/stable/Bitmask-linux32-latest.tar.bz2.asc]] +NOTE: + Stand-alone bundles are useful if want to run Bitmask from a thumb drive. + There are two disadvantages to the stand-alone bundle: + * The Bitmask app will be less well integrated with the desktop environment. + * Running from the bundle is slower to start than via packages. -h3. 64 bit kernel - -<%= render({:partial => 'common/download_button'}, {:link => 'https://dl.bitmask.net/client/linux/stable/Bitmask-linux64-latest.tar.bz2', :text => 'Download 64 bit'}) %> - -[[Signature file => https://dl.bitmask.net/client/linux/stable/Bitmask-linux64-latest.tar.bz2.asc]] h2. Install as packages -- cgit v1.2.3 From 7192a29353c0167874f3ffdb9ad94a8dbab66c75 Mon Sep 17 00:00:00 2001 From: Ivan Alejandro Date: Mon, 2 Nov 2015 13:22:56 -0300 Subject: Fix wording VPN/email --- pages/home/_intro.en.text | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pages') diff --git a/pages/home/_intro.en.text b/pages/home/_intro.en.text index 8c1b884..798ad04 100644 --- a/pages/home/_intro.en.text +++ b/pages/home/_intro.en.text @@ -1 +1 @@ -*Bitmask* is an open source application to provide easy and secure encrypted communication. You can choose among [[several different service providers => #providers]] or [[start your own => https://leap.se/en/docs/platform]]. Currently, Bitmask supports encrypted internet (VPN) with encrypted email. +*Bitmask* is an open source application to provide easy and secure encrypted communication. You can choose among [[several different service providers => #providers]] or [[start your own => https://leap.se/en/docs/platform]]. Currently, Bitmask supports encrypted internet (VPN) and encrypted email. -- cgit v1.2.3 From ee978e16ee3f6fa85510dfccb9b23efcecbc2220 Mon Sep 17 00:00:00 2001 From: Ivan Alejandro Date: Mon, 2 Nov 2015 13:23:16 -0300 Subject: Move upgrade instructions to bottom --- pages/install/linux/en.text | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-) (limited to 'pages') diff --git a/pages/install/linux/en.text b/pages/install/linux/en.text index 8ecdf55..06e5028 100644 --- a/pages/install/linux/en.text +++ b/pages/install/linux/en.text @@ -3,23 +3,6 @@ <%= render({:partial => 'common/notice'}, {:type => 'info', :text => 'NOTE: Encrypted email support in Bitmask is still experimental.'}) %> -h2. Upgrading - -*From stand-alone bundles*: Bitmask should upgrade itself automatically (for versions equal or later than 0.7.0). If you are running a version prior to 0.7.0, you can download the new bundle and copy the "config" folder from the old bundle directory. - -*From packages*: If you are running from packages, then you can trigger an update like so: - -bc. apt-get update -apt-get dist-upgrade - -NOTE: When upgrading Ubuntu from 14.10 (Utopic) to 15.04 (Vivid), you may need to run this command again: - -bc. sudo add-apt-repository "deb http://deb.bitmask.net/debian vivid main" - -This is because the Ubuntu upgrade process probably commented out all your prior custom repository lines in @/etc/apt/sources.list@. - ---- - There are two ways to install Bitmask - via the stand-alone bundles or via packages. h2. Download stand-alone bundle @@ -77,3 +60,18 @@ h3. Debian 7.0 (Wheezy) h3. Debian 8.0 (Jessie) <%= render({:partial => 'via_packages'}, {:distro => 'jessie', :os => 'debian'}) %> + +h2. Upgrading + +*From stand-alone bundles*: Bitmask should upgrade itself automatically (for versions equal or later than 0.7.0). If you are running a version prior to 0.7.0, you can download the new bundle and copy the "config" folder from the old bundle directory. + +*From packages*: If you are running from packages, then you can trigger an update like so: + +bc. apt-get update +apt-get dist-upgrade + +NOTE: When upgrading Ubuntu from 14.10 (Utopic) to 15.04 (Vivid), you may need to run this command again: + +bc. sudo add-apt-repository "deb http://deb.bitmask.net/debian vivid main" + +This is because the Ubuntu upgrade process probably commented out all your prior custom repository lines in @/etc/apt/sources.list@. -- cgit v1.2.3 From a53659fdd4a4b9213bb5b277a51aa01c2148b6d2 Mon Sep 17 00:00:00 2001 From: kwadronaut Date: Mon, 2 Nov 2015 18:25:05 +0100 Subject: update package installation for Wheezy, Trusty (dropped) and Wily (added) --- pages/install/linux/en.text | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) (limited to 'pages') diff --git a/pages/install/linux/en.text b/pages/install/linux/en.text index 06e5028..05bda76 100644 --- a/pages/install/linux/en.text +++ b/pages/install/linux/en.text @@ -3,7 +3,7 @@ <%= render({:partial => 'common/notice'}, {:type => 'info', :text => 'NOTE: Encrypted email support in Bitmask is still experimental.'}) %> -There are two ways to install Bitmask - via the stand-alone bundles or via packages. +There are two ways to install Bitmask - via the stand-alone bundles or via packages. h2. Download stand-alone bundle @@ -33,9 +33,8 @@ If the result is: * @i386@, you have *32 bit* - NOTE: - Stand-alone bundles are useful if want to run Bitmask from a thumb drive. + Stand-alone bundles are useful if want to run Bitmask from a thumb drive. Or from a distribution which we don't support with packages. There are two disadvantages to the stand-alone bundle: * The Bitmask app will be less well integrated with the desktop environment. * Running from the bundle is slower to start than via packages. @@ -45,18 +44,13 @@ h2. 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. +h3. Ubuntu 15.10 (Wily Werewolf) +<%= render({:partial => 'via_packages'}, {:distro => 'wily'}) %> + h3. Ubuntu 15.04 (Vivid Vervet) <%= render({:partial => 'via_packages'}, {:distro => 'vivid'}) %> -h3. Ubuntu 14.04 LTS (Trusty Tahr) - -<%= render({:partial => 'via_packages'}, {:distro => 'trusty'}) %> - -h3. Debian 7.0 (Wheezy) - -<%= render({:partial => 'via_packages'}, {:distro => 'wheezy', :os => 'debian'}) %> - h3. Debian 8.0 (Jessie) <%= render({:partial => 'via_packages'}, {:distro => 'jessie', :os => 'debian'}) %> @@ -74,4 +68,8 @@ NOTE: When upgrading Ubuntu from 14.10 (Utopic) to 15.04 (Vivid), you may need t bc. sudo add-apt-repository "deb http://deb.bitmask.net/debian vivid main" +Similar is needed for the upgrade from 15.04 to 15.10 (Wily): + +bc. sudo add-apt-repository "deb http://deb.bitmask.net/debian wily main" + This is because the Ubuntu upgrade process probably commented out all your prior custom repository lines in @/etc/apt/sources.list@. -- cgit v1.2.3 From 7fe1eed396d8f96754c705289aaf2509d47a5a24 Mon Sep 17 00:00:00 2001 From: kwadronaut Date: Mon, 2 Nov 2015 19:56:27 +0100 Subject: update russian install instructions for wheezy, wily and trusty --- pages/install/linux/ru.text | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'pages') diff --git a/pages/install/linux/ru.text b/pages/install/linux/ru.text index d27ab91..b65fdf9 100644 --- a/pages/install/linux/ru.text +++ b/pages/install/linux/ru.text @@ -22,6 +22,9 @@ h2. Установить как пакет Это рекомендуемый способ установки Bitmask. При установке в качестве пакета Bitmask будет работать быстрее, будет лучше интегрирована с системой, а также будет постоянно обновляться. +h3. Ubuntu 15.10 (Wily Werewolf) +<%= render({:partial => 'via_packages'}, {:distro => 'wily'}) %> + h3. Ubuntu 15.04 (Vivid Vervet) <%= render({:partial => 'via_packages'}, {:distro => 'vivid'}) %> @@ -30,10 +33,6 @@ h3. Ubuntu 14.04 LTS (Trusty Tahr) <%= render({:partial => 'via_packages'}, {:distro => 'trusty'}) %> -h3. Debian 7.0 (Wheezy) - -<%= render({:partial => 'via_packages'}, {:distro => 'wheezy', :os => 'debian'}) %> - h3. Debian 8.0 (Jessie) <%= render({:partial => 'via_packages'}, {:distro => 'jessie', :os => 'debian'}) %> -- cgit v1.2.3