diff options
Diffstat (limited to 'pages/install')
| -rw-r--r-- | pages/install/android/en.text | 2 | ||||
| -rw-r--r-- | pages/install/android/ru.text | 2 | ||||
| -rw-r--r-- | pages/install/en.haml | 23 | ||||
| -rw-r--r-- | pages/install/es.haml | 21 | ||||
| -rw-r--r-- | pages/install/linux/_notice.haml | 5 | ||||
| -rw-r--r-- | pages/install/linux/_via_packages.html.haml | 68 | ||||
| -rw-r--r-- | pages/install/linux/debs/en.md | 45 | ||||
| -rw-r--r-- | pages/install/linux/en.md | 57 | ||||
| -rw-r--r-- | pages/install/linux/en.text | 18 | ||||
| -rw-r--r-- | pages/install/linux/ru.text | 78 | ||||
| -rw-r--r-- | pages/install/mac/en.text | 12 | ||||
| -rw-r--r-- | pages/install/ru.haml | 20 | ||||
| -rw-r--r-- | pages/install/signature-verification/ru.text | 2 | ||||
| -rw-r--r-- | pages/install/windows/en.text | 10 |
14 files changed, 46 insertions, 317 deletions
diff --git a/pages/install/android/en.text b/pages/install/android/en.text index 7b38af0..59199a0 100644 --- a/pages/install/android/en.text +++ b/pages/install/android/en.text @@ -9,8 +9,6 @@ }); </script> -<%= render({:partial => 'common/notice'}, {:type => 'info', :text => '<b>NOTE:</b> Bitmask for Android does not yet support encrypted email.'}) %> - h2. Install from Google Play You can search for "Bitmask" in the Google Play store or use this link: diff --git a/pages/install/android/ru.text b/pages/install/android/ru.text index 317f395..1dd28e2 100644 --- a/pages/install/android/ru.text +++ b/pages/install/android/ru.text @@ -9,8 +9,6 @@ }); </script> -<%= render({:partial => 'common/notice'}, {:type => 'info', :text => '<b>ПРИМЕЧАНИЕ:</b> Bitmask для Android все еще не поддерживает зашифрованную электронную почту.'}) %> - h2. Установить с Google Play Вы можете поискать "Bitmask" в Google Play или использовать эти ссылки: diff --git a/pages/install/en.haml b/pages/install/en.haml index 2fefed5..a18e106 100644 --- a/pages/install/en.haml +++ b/pages/install/en.haml @@ -8,40 +8,31 @@ %br %b Android %br - %small Version 1.0.3 + %small Bitmask Version 1.0.5 %p %small %a{:href=>"android"} get .apk .col-sm-3.col-xs-6.text-center - %a.btn.btn-default{:href=>"https://dl.bitmask.net/client/linux/stable/Bitmask-linux64-latest.tar.gz"} + %a.btn.btn-default{:href=>"https://dl.bitmask.net/RiseupVPN/linux/riseup-vpn_latest.snap"} %i.fa.fa-linux.fa-4x %br %b GNU/Linux %br - %small Version 0.10 - %p - %small - %a{:href=>"linux"} - bundles, .deb + %small RiseupVPN Version 0.20.4 .col-sm-3.col-xs-6.text-center - %a.btn.btn-default{:href=>"https://dl.bitmask.net/client/osx/stable/Bitmask-OSX-latest.pkg"} + %a.btn.btn-default{:href=>"https://dl.bitmask.net/RiseupVPN/osx/RiseupVPN-OSX-latest.pkg"} %i.fa.fa-apple.fa-4x %br %b macOS %br - %small Version 0.10 + %small RiseupVPN Version 0.20.1 .col-sm-3.col-xs-6.text-center - %a.btn.btn-default.disabled{:href=>"windows"} + %a.btn.btn-default{:href=>"https://dl.bitmask.net/RiseupVPN/windows/RiseupVPN-win-latest.exe"} %i.fa.fa-windows.fa-4x %br %b Windows %br - %small Coming soon... + %small RiseupVPN Version 0.20.4 -.row - .col-sm-8.col-sm-offset-2 - .p.text-center - = t :warning - = t :warning_disabled diff --git a/pages/install/es.haml b/pages/install/es.haml index a861bfe..f271313 100644 --- a/pages/install/es.haml +++ b/pages/install/es.haml @@ -8,7 +8,7 @@ %br %b Android %br - %small Version 1.0.3 + %small Bitmask Version 1.0.5 %p %small %a{:href=>"android"} @@ -19,29 +19,18 @@ %br %b GNU/Linux %br - %small Version 0.10 - %p - %small - %a{:href=>"linux"} - bundles, .deb + %small RiseupVPN Version 0.20.4 .col-sm-3.col-xs-6.text-center %a.btn.btn-default{:href=>"https://dl.bitmask.net/client/osx/stable/Bitmask-OSX-latest.pkg"} %i.fa.fa-apple.fa-4x %br %b Mac OS %br - %small Version 0.10 + %small RiseupVPN Version 0.20.1 .col-sm-3.col-xs-6.text-center - %a.btn.btn-default.disabled{:href=>"windows"} + %a.btn.btn-default{:href=>"https://dl.bitmask.net/RiseupVPN/windows/RiseupVPN-win-latest.exe"} %i.fa.fa-windows.fa-4x %br %b Windows %br - %small Pronto... - -.row - .col-sm-8.col-sm-offset-2 - .p.text-center - = t :warning - = t :warning_disabled - + %small RiseupVPN Version 0.20.4 diff --git a/pages/install/linux/_notice.haml b/pages/install/linux/_notice.haml deleted file mode 100644 index 314b1c7..0000000 --- a/pages/install/linux/_notice.haml +++ /dev/null @@ -1,5 +0,0 @@ -.row - .col-sm-8.col-sm-offset-2 - .p.alert.alert-info - %i.fa.fa-envelope - <b>NOTE:</b> Encrypted email support in Bitmask is still experimental. diff --git a/pages/install/linux/_via_packages.html.haml b/pages/install/linux/_via_packages.html.haml deleted file mode 100644 index e1367ac..0000000 --- a/pages/install/linux/_via_packages.html.haml +++ /dev/null @@ -1,68 +0,0 @@ -- if @locals[:os] == 'debian' - - %p.b= t :to_install - - %pre - - 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/client #{@locals[:distro]} release" > /etc/apt/sources.list.d/bitmask.list - apt update - apt install bitmask - - %p.b= t :to_remove - - %pre - :preserve - sudo -s - apt remove bitmask leap-archive-keyring - rm /etc/apt/sources.list.d/bitmask.list - - %p.b= t :upgrade_os - - %pre - :preserve - sudo -s - echo "deb http://deb.bitmask.net/client #{@locals[:distro]} release" > /etc/apt/sources.list.d/bitmask.list - apt update - apt upgrade - -- else - - - prior = {"xenial" => "wily", "wily" => "vivid", "vivid" => "utopic"} - - %p.b= t :to_install - - %pre - :preserve - sudo -s - add-apt-repository "deb http://deb.bitmask.net/client #{@locals[:distro]} release" - wget -O- https://dl.bitmask.net/apt.key | apt-key add - - apt update - apt install bitmask leap-archive-keyring - - %p.b= t :to_remove - - %pre - :preserve - sudo -s - apt remove bitmask leap-archive-keyring - apt-key del 0x1E34A1828E207901 - add-apt-repository --remove "deb http://deb.bitmask.net/client #{@locals[:distro]} release" - - %p.b= t :upgrade_os - - %pre - :preserve - sudo -s - add-apt-repository --remove "deb http://deb.bitmask.net/client #{prior[@locals[:distro]]} release" - add-apt-repository "deb http://deb.bitmask.net/client #{@locals[:distro]} release" - apt update - apt upgrade - diff --git a/pages/install/linux/debs/en.md b/pages/install/linux/debs/en.md deleted file mode 100644 index 8aa7886..0000000 --- a/pages/install/linux/debs/en.md +++ /dev/null @@ -1,45 +0,0 @@ -@title = 'Bitmask debian/ubuntu repositories' -@nav_title = 'Bitmask debian/ubuntu repositories' -@this.toc = false - -# Supported distributions - -We provide packages for **ubuntu** ``Bionic`` (18.04), **debian** ``Stretch`` (*stable*) and ``Buster`` (*testing*). -Try the [[ standalone bundles => /en/install/linux/#standalone-bundles ]] if your distribution is not there. - -Please refer to the [[ linux installation docs => /en/install/linux#Debian/Ubuntu ]] how to install the debian packages for your distribution. - -# Release, staging, or master? - -Above, the ``release`` component tracks only the **stable** releases. That is probably what you want to use. - -If you want **alpha** versions and **release candidates**, use ``staging`` in your ``/etc/apt/sources.list.d/bitmask.list`` file, like this: - -``` -sudo gedit /etc/apt/sources.list.d/bitmask.list -deb http://deb.leap.se/client staging stretch -``` - -If you want to have the bleeding edge, use ``master`` instead. Beware that this can be unstable at times: - -``` -deb http://deb.leap.se/client master stretch -``` - - -# Removing the packages - -If you want to remove bitmask from your system: - -``` -sudo -s -apt remove --purge bitmask leap-archive-keyring -rm /etc/apt/sources.list.d/bitmask.list -``` - -You probably also want to wipe all the files in your local user account, in: - - -``` -~/.config/leap/ -``` diff --git a/pages/install/linux/en.md b/pages/install/linux/en.md deleted file mode 100644 index 81ed467..0000000 --- a/pages/install/linux/en.md +++ /dev/null @@ -1,57 +0,0 @@ -@title = 'Bitmask for GNU/Linux. Version 0.10.7' -@nav_title = 'Linux' -@this.toc = false - -# Standalone Bundles - -<%= render({:partial => 'common/download_button'}, {:link => 'https://dl.bitmask.net/client/linux/stable/Bitmask-linux64-latest.tar.gz', :text => 'Download (64 bit)'}) %> - -The [[signature => https://dl.bitmask.net/client/linux/stable/Bitmask-linux64-latest.tar.gz.asc]] can be [[verified => signature-verification]] using LEAP's archive signing key. You can browse [[the downloads => https://dl.bitmask.net/client/linux]], including release candidates. - - -# Debian/Ubuntu - -## For Ubuntu Bionic Beaver (18.04) and Debian testing (buster): -``` -sudo apt install leap-archive-keyring lsb-release -sudo sh -c 'echo "deb http://deb.leap.se/client release $(lsb_release -sc)" > /etc/apt/sources.list.d/bitmask.list' -sudo apt update && sudo apt install bitmask -``` - -## For Debian stable (9.0, Stretch): - -You need to enable `stretch-backports` to install the latest `leap-archive-keyring` package (skip this step -if you already have `stretch-backports` enabled): - -``` -sudo sh -c 'echo "deb http://deb.debian.org/debian stretch-backports main" > /etc/apt/sources.list.d/stretch-backports.list' -sudo apt update && sudo apt install -t stretch-backports leap-archive-keyring -``` - -``` -sudo sh -c 'echo "deb http://deb.leap.se/client release stretch" > /etc/apt/sources.list.d/bitmask.list' -sudo apt update && sudo apt install bitmask -``` - -## For Ubuntu oldstable (17.10, Artful): - -``` -sudo apt install wget -sudo sh -c 'echo "deb http://deb.leap.se/client release artful" > /etc/apt/sources.list.d/bitmask.list' -wget https://downloads.leap.se/platform/leap-archive-signing-keys.asc -O /tmp/leap-archive-signing-keys.asc -sha256sum /tmp/leap-archive-signing-keys.asc -``` - -The latest command will output a checksum that you need to compare with this one: `940aed61f2bd9db8246c4855a2239a7ed5b847894de89e25bebb163055f85da9` -Please *only* proceed if the checksums are identical ! - -``` -sudo apt-key add /tmp/leap-archive-signing-keys.asc -sudo apt update && sudo apt install bitmask -``` - -Read more about [[ our different repositories => debs ]] for deb packages. - -# Other - -If none of the above methods works for you, you can try to install [[via pip => http://bitmask.readthedocs.io/en/latest/installation/index.html#with-pip]] or [[from source => http://bitmask.readthedocs.io/en/latest/hacking/devenv.html]], or get in contact with us if you want to package Bitmask for some other distribution. diff --git a/pages/install/linux/en.text b/pages/install/linux/en.text new file mode 100644 index 0000000..aa5ef9e --- /dev/null +++ b/pages/install/linux/en.text @@ -0,0 +1,18 @@ +- @title = "Bitmask for Linux" +- @nav_title = 'Linux' + +h1. Bitmask is now RiseupVPN + +We've deprecated Bitmask for all desktop clients. We've rewritten the clients and offer provider branded versions. You can try the new client by installing RiseupVPN. +RiseupVPN is distributed as a snap package. Currently we don't have the capacities to offer packaging for different Linux distributions and need community support for it! +You can get "in contact with us":https://0xacab.org/leap/bitmask-vpn/-/issues/new, if you want to help with packaging! + +h2. Download latest version + +<%= render({:partial => 'common/download_button'}, {:link => 'https://dl.bitmask.net/RiseupVPN/linux/riseup-vpn_latest.snap', :text => 'Download for Linux'}) %> + +h2. Download other versions + +You can [[browse all releases => https://dl.bitmask.net/RiseupVPN/linux/]] for old or experimental downloads. + +You should install the latest stable release. Downloads tagged with "RC" are "Release Candidates" and receive frequent experimental updates that may break the application. diff --git a/pages/install/linux/ru.text b/pages/install/linux/ru.text deleted file mode 100644 index 9b89027..0000000 --- a/pages/install/linux/ru.text +++ /dev/null @@ -1,78 +0,0 @@ -@title = 'Bitmask для Linux' -@nav_title = 'Linux' - -<%= render({:partial => 'common/notice'}, {:type => 'info', :text => '<b>ПРИМЕЧАНИЕ:</b> Поддержка зашифрованной электронной почты в Bitmask все еще является экспериментальной.'}, {:locals => {:locale => 'ru'}}) %> - -h2. Обновление - -*Для архивов*: Bitmask должен обновиться автоматически (для версий 0.7.0 и выше). Если вы используете версию до 0.7.0, вы можете скачать новый архив и скопировать папку "config" из папки старого архива. - -*Для пакетов*: Если вы запускаете приложение из пакета, то вы можете запустить обновление следующим образом: - -bc. apt-get update -apt-get dist-upgrade - -ПРИМЕЧАНИЕ: При обновлении Ubuntu с 14.10 (Utopic) до 15.04 (Vivid), вам, возможно, придется запустить эту команду снова: - -bc. sudo add-apt-repository "deb http://deb.bitmask.net/debian vivid main" - -Это из-за того, что процесс обновления Ubuntu вероятно закомментировал все ваши предыдущие строки с пользовательскими репозиториями в @/etc/apt/sources.list@. - -h2. Установить как пакет - -Это рекомендуемый способ установки Bitmask. При установке в качестве пакета Bitmask будет работать быстрее, будет лучше интегрирована с системой, а также будет постоянно обновляться. - -h3. Ubuntu 16.04 (Xenial Xerus) - -<%= render({:partial => 'via_packages'}, {:distro => 'xenial'}) %> - -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. Debian 8.0 (Jessie) - -<%= render({:partial => 'via_packages'}, {:distro => 'jessie', :os => 'debian'}) %> - -h2. Установить из архива - -Кроме того, вы можете запустить Bitmask из автономного архива. Это полезно, если вы хотите запустить Bitmask с флешки. Приложение из архива должно работать на большинстве современных дистрибутивов Linux, которые являются производными от Debian (напр., Ubuntu, Mint, Trisquel, и т.д.). - -Есть два недостатки автономного архива: - -* Приложение Bitmask будет хуже интегрировано с окружением рабочего стола. -* Запуск из архива медленнее, чем запуск с помощью пакета. - -При желании, вы можете [[проверить подлинность подписи => signature-verification]] для файлов Bitmask, прежде чем запускать их. - -Как узнать используете ли вы 32-битное или 64-битное ядро? Выполните следующую команду: - -bc. uname -m - -Если результат: - -* @x86_64@, у вас *64-битное* -* @i686@, у вас *32-битное* -* @i386@, у вас *32-битное* - -h3. 32-битное ядро - -<%= render({:partial => 'common/download_button'}, {:link => 'https://dl.bitmask.net/client/linux/stable/Bitmask-linux32-latest.tar.gz', :text => 'Скачать 32-битную версию'}) %> - -[[Файл подписи => https://dl.bitmask.net/client/linux/stable/Bitmask-linux32-latest.tar.gz.asc]] - -h3. 64-битное ядро - -<%= render({:partial => 'common/download_button'}, {:link => 'https://dl.bitmask.net/client/linux/stable/Bitmask-linux64-latest.tar.gz', :text => 'Скачать 64-битную версию'}) %> - -[[Файл подписи => https://dl.bitmask.net/client/linux/stable/Bitmask-linux64-latest.tar.gz.asc]] - -h3. Другие варианты - -Вы можете [[просмотреть все версии => https://dl.bitmask.net/client/linux/]] для старых или экспериментальных загрузок. - -Необходимо устанавливать последнюю стабильную версию. Загрузки с тегом "RC" являются "предвыпускными версиями" и часто содержат экспериментальные обновления, которые могут сломать приложение. diff --git a/pages/install/mac/en.text b/pages/install/mac/en.text index 5361aa5..9bf0650 100644 --- a/pages/install/mac/en.text +++ b/pages/install/mac/en.text @@ -1,18 +1,18 @@ - @title = "Bitmask for Mac OS" - @nav_title = 'Mac OS' -h2. Download latest version +h1. Bitmask is now RiseupVPN -Bitmask requires Mountain Lion or newer. +We've deprecated Bitmask for all desktop clients. We've rewritten the clients and offer provider branded versions. You can try the new client by installing RiseupVPN. -<%= render({:partial => 'common/download_button'}, {:link => 'https://dl.bitmask.net/client/osx/Bitmask-OSX-latest.dmg', :text => 'Download for Mac OS'}) %> +h2. Download latest version -Optionally, you can [[authenticate the signature => signature-verification]] for the Bitmask .dmg file using [[this signature file => https://dl.bitmask.net/client/osx/Bitmask-OSX-latest.dmg.asc]]. +RiseupVPN requires Catalina. -Once the file `Bitmask-OSX-latest.dmg` has been saved to your computer, mount the `.dmg` image and drag the `Bitmask` icon to your `Applications` folder. +<%= render({:partial => 'common/download_button'}, {:link => 'https://dl.bitmask.net/RiseupVPN/osx/RiseupVPN-OSX-latest.pkg', :text => 'Download for Mac OS'}) %> h2. Download other versions -You can [[browse all releases => https://dl.bitmask.net/client/osx/]] for old or experimental downloads. +You can [[browse all releases => https://dl.bitmask.net/RiseupVPN/osx/]] for old or experimental downloads. You should install the latest stable release. Downloads tagged with "RC" are "Release Candidates" and receive frequent experimental updates that may break the application. diff --git a/pages/install/ru.haml b/pages/install/ru.haml index f01fe8a..c40fd60 100644 --- a/pages/install/ru.haml +++ b/pages/install/ru.haml @@ -8,7 +8,7 @@ %br %b Android %br - %small Version 1.0.3 + %small Bitmask Version 1.0.5 %p %small %a{:href=>"android"} @@ -19,29 +19,19 @@ %br %b GNU/Linux %br - %small Version 0.10 - %p - %small - %a{:href=>"linux"} - bundles, .deb + %small Bitmask Version 0.20.4 .col-sm-3.col-xs-6.text-center %a.btn.btn-default{:href=>"https://dl.bitmask.net/client/osx/stable/Bitmask-OSX-latest.pkg"} %i.fa.fa-apple.fa-4x %br %b Mac OS %br - %small Version 0.10 + %small RiseupVPN Version 0.20.1 .col-sm-3.col-xs-6.text-center - %a.btn.btn-default.disabled{:href=>"windows"} + %a.btn.btn-default{:href=>"https://dl.bitmask.net/RiseupVPN/windows/RiseupVPN-win-latest.exe"} %i.fa.fa-windows.fa-4x %br %b Windows %br - %small Скоро... - -.row - .col-sm-8.col-sm-offset-2 - .p.text-center - = t :warning - = t :warning_disabled + %small RiseupVPN Version 0.20.4 diff --git a/pages/install/signature-verification/ru.text b/pages/install/signature-verification/ru.text index b9632c6..bd64c4b 100644 --- a/pages/install/signature-verification/ru.text +++ b/pages/install/signature-verification/ru.text @@ -78,4 +78,4 @@ Primary key fingerprint: 1E45 3B2C E87B EE2F 7DFE 9966 1E34 A182 8E20 7901 Если вы доверились одному из ключей, который подписал ключ LEAP, то вы не увидите предупреждение. -Если вы не видите текст [@Good signature from "LEAP archive signing key <sysdev@leap.se>"@], то что-то не так, и вы не должны запускать загруженное приложение.
\ No newline at end of file +Если вы не видите текст [@Good signature from "LEAP archive signing key <sysdev@leap.se>"@], то что-то не так, и вы не должны запускать загруженное приложение. diff --git a/pages/install/windows/en.text b/pages/install/windows/en.text index fa99d46..dd05398 100644 --- a/pages/install/windows/en.text +++ b/pages/install/windows/en.text @@ -1,17 +1,15 @@ @title = "Bitmask for Windows" -h1. Bitmask for Windows +h1. Bitmask for Windows is now RiseupVPN -<%= render({:partial => 'common/notice'}, {:type => 'warning', :text => '<b>WARNING:</b> Currently, the Windows build is very buggy and is not officially supported. If you know Windows programming, we could <a href="https://leap.se/get-involved">use your help</a>.'}) %> +We've deprecated Bitmask for all desktop clients. We've rewritten the clients and offer provider branded versions. You can try the new client by installing RiseupVPN. h2. Download latest version -<%= render({:partial => 'common/download_button'}, {:link => 'https://dl.bitmask.net/client/windows/Bitmask-win32-latest.zip', :text => 'Download for Windows'}) %> - -Optionally, you can [[authenticate the signature => signature-verification]] for the Bitmask .zip file using [[this signature file => https://dl.bitmask.net/client/osx/Bitmask-win32-latest.zip.asc]]. +<%= render({:partial => 'common/download_button'}, {:link => 'https://dl.bitmask.net/RiseupVPN/windows/RiseupVPN-win-latest.exe', :text => 'Download for Windows'}) %> h2. Download other versions -You can [[browse all releases => https://dl.bitmask.net/client/windows/]] for old or experimental downloads. +You can [[browse all releases => https://dl.bitmask.net/RiseupVPN/windows/]] for old or experimental downloads. You should install the latest stable release. Downloads tagged with "RC" are "Release Candidates" and receive frequent experimental updates that may break the application. |