diff options
38 files changed, 579 insertions, 334 deletions
diff --git a/amber/layouts/default.html.haml b/amber/layouts/default.html.haml index 6521333..61f7f38 100644 --- a/amber/layouts/default.html.haml +++ b/amber/layouts/default.html.haml @@ -8,7 +8,7 @@ %link(rel="stylesheet" href="/assets/bootstrap.min.css") %link(rel="stylesheet" href="/assets/font-awesome/css/font-awesome.min.css") %link(rel="stylesheet" href="/assets/style.css") - %link(rel="icon" href="/assets/images/favicon.png" type="image/x-icon") + %link(rel="icon" href="/favicon.ico" type="image/x-icon") = html_head_base %body #wrap diff --git a/amber/layouts/home.html.haml b/amber/layouts/home.html.haml index 7da5f72..4517821 100644 --- a/amber/layouts/home.html.haml +++ b/amber/layouts/home.html.haml @@ -8,7 +8,7 @@ %link(rel="stylesheet" href="/assets/bootstrap.min.css") %link(rel="stylesheet" href="/assets/font-awesome/css/font-awesome.min.css") %link(rel="stylesheet" href="/assets/style.css") - %link(rel="icon" href="/assets/images/favicon.png" type="image/x-icon") + %link(rel="icon" href="/favicon.ico" type="image/x-icon") = html_head_base %body.home #wrap diff --git a/amber/menu.txt b/amber/menu.txt index 09f2ad9..293f251 100644 --- a/amber/menu.txt +++ b/amber/menu.txt @@ -1,12 +1,13 @@ +features install android linux help + support + getting-started vpn android linux - mac - windows - benefits - limitations email + linux + faq diff --git a/pages/assets/content.scss b/pages/assets/content.scss new file mode 100644 index 0000000..59dd01c --- /dev/null +++ b/pages/assets/content.scss @@ -0,0 +1,55 @@ +// +// These styles are helpers for better formatting content +// + +// +// VPN Status Icons +// + +li.status-icon { + padding-left: 32px; + background-repeat: no-repeat; + background-position: 0 -2px; + list-style-type: none; + margin: 1em; + & li { + list-style-type: none; + } + & ul { + margin-top: 1em + } +} + +li.android-on { + @extend li.status-icon; + background-image: url(/assets/icons/22/vpn_connected.png); +} +li.android-wait { + @extend li.status-icon; + background-image: url(/assets/icons/22/vpn_progress.png); +} +li.android-off { + @extend li.status-icon; + background-image: url(/assets/icons/22/vpn_disconnected.png); +} + +li.desktop-on { + @extend li.status-icon; + background-image: url(/assets/icons/22/on.png); +} +li.desktop-wait { + @extend li.status-icon; + background-image: url(/assets/icons/22/wait.png); +} +li.desktop-off { + @extend li.status-icon; + background-image: url(/assets/icons/22/off.png); +} + +// +// GENERAL UTILITY +// + +ul.spaced li { + margin-bottom: 15px; +}
\ No newline at end of file diff --git a/pages/assets/icons/22/off.png b/pages/assets/icons/22/off.png Binary files differnew file mode 100644 index 0000000..65afeef --- /dev/null +++ b/pages/assets/icons/22/off.png diff --git a/pages/assets/icons/22/on.png b/pages/assets/icons/22/on.png Binary files differnew file mode 100644 index 0000000..229140a --- /dev/null +++ b/pages/assets/icons/22/on.png diff --git a/pages/assets/icons/22/question.png b/pages/assets/icons/22/question.png Binary files differnew file mode 100644 index 0000000..bb259fa --- /dev/null +++ b/pages/assets/icons/22/question.png diff --git a/pages/assets/icons/22/vpn_connected.png b/pages/assets/icons/22/vpn_connected.png Binary files differnew file mode 100644 index 0000000..3428947 --- /dev/null +++ b/pages/assets/icons/22/vpn_connected.png diff --git a/pages/assets/icons/22/vpn_disconnected.png b/pages/assets/icons/22/vpn_disconnected.png Binary files differnew file mode 100644 index 0000000..c524307 --- /dev/null +++ b/pages/assets/icons/22/vpn_disconnected.png diff --git a/pages/assets/icons/22/vpn_progress.png b/pages/assets/icons/22/vpn_progress.png Binary files differnew file mode 100644 index 0000000..2a7ad45 --- /dev/null +++ b/pages/assets/icons/22/vpn_progress.png diff --git a/pages/assets/icons/22/wait.png b/pages/assets/icons/22/wait.png Binary files differnew file mode 100644 index 0000000..c267363 --- /dev/null +++ b/pages/assets/icons/22/wait.png diff --git a/pages/assets/providers/calyx.net.png b/pages/assets/providers/calyx.net.png Binary files differnew file mode 100644 index 0000000..7d682c4 --- /dev/null +++ b/pages/assets/providers/calyx.net.png diff --git a/pages/assets/providers/demo.bitmask.net.png b/pages/assets/providers/demo.bitmask.net.png Binary files differnew file mode 100644 index 0000000..580bbac --- /dev/null +++ b/pages/assets/providers/demo.bitmask.net.png diff --git a/pages/assets/providers/oblivia.svg b/pages/assets/providers/oblivia.svg new file mode 100644 index 0000000..4190b78 --- /dev/null +++ b/pages/assets/providers/oblivia.svg @@ -0,0 +1,73 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> + +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + id="svg2" + version="1.1" + inkscape:version="0.48.4 r9939" + width="256" + height="256" + sodipodi:docname="0.png" + inkscape:export-filename="/home/elijah/dev/leap/bitmask_help/pages/assets/providers/oblivia.vc.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90"> + <metadata + id="metadata8"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title></dc:title> + </cc:Work> + </rdf:RDF> + </metadata> + <defs + id="defs6" /> + <sodipodi:namedview + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1" + objecttolerance="10" + gridtolerance="10" + guidetolerance="10" + inkscape:pageopacity="0" + inkscape:pageshadow="2" + inkscape:window-width="1374" + inkscape:window-height="840" + id="namedview4" + showgrid="false" + inkscape:zoom="1.2040816" + inkscape:cx="88.774975" + inkscape:cy="199.49038" + inkscape:window-x="53" + inkscape:window-y="24" + inkscape:window-maximized="0" + inkscape:current-layer="svg2" /> + <rect + style="fill:#fcfbeb;fill-opacity:1;stroke:none;stroke-width:1.50000000000000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" + id="rect3764" + width="256" + height="256" + x="0" + y="1.0338984" /> + <path + style="fill:#2983de;fill-opacity:1" + d="m 125.3735,26.556148 c -13.39021,0.009 -26.821483,1.183338 -30.519163,3.525316 -1.334415,0.845175 -3.988643,1.849077 -5.909102,2.249488 -1.920458,0.40041 -3.491742,1.176268 -3.491742,1.712296 0,0.53603 -1.571283,1.613997 -3.491742,2.41736 -7.796469,3.261405 -25.349757,23.675489 -27.262447,31.694277 -0.376378,1.577924 -1.193284,3.486467 -1.779445,4.23038 -0.586151,0.743902 -1.986478,4.611678 -3.122423,8.595057 -1.135933,3.983369 -2.923726,9.119958 -3.290295,11.549608 -4.029513,26.70821 -4.875654,48.10023 0,71.9836 0.491476,2.4075 2.154362,7.56624 3.290295,11.54961 1.152288,4.43987 3.664363,8.38997 5.317122,12.37661 7.455036,15.341 31.314969,38.7415 49.476362,41.0739 16.30012,2.09336 45.97226,0.6112 50.96602,-2.55166 1.33441,-0.84518 3.96233,-1.85805 5.84195,-2.24949 1.87963,-0.39144 3.99633,-1.4011 4.70042,-2.24948 0.7041,-0.84839 1.73566,-1.54443 2.31664,-1.54443 2.91964,0 16.62555,-13.33135 22.09198,-21.48764 4.33586,-6.46939 8.4412,-15.39018 10.03876,-21.89054 0.56341,-2.29245 1.47657,-5.04273 2.04804,-6.11055 5.83485,-10.90243 5.86228,-74.891657 0.0335,-85.78269 -0.58469,-1.092507 -1.51821,-3.851671 -2.08161,-6.144123 -4.75272,-19.33842 -25.19892,-43.755599 -39.61785,-47.306393 -1.62161,-0.399339 -3.9722,-1.351941 -5.20403,-2.148764 -3.6129,-2.337046 -16.9611,-3.500777 -30.35131,-3.491742 z m -1.74587,19.909644 c 4.38002,-0.06957 8.9449,0.420751 13.73195,1.443701 34.51484,7.375521 52.19619,54.037857 42.13593,111.232127 -1.60986,9.15234 -4.8811,19.21739 -6.88276,21.21905 -0.66769,0.66769 -1.20868,1.7674 -1.20868,2.41735 0,0.64995 -2.13982,4.1444 -4.76757,7.7557 -6.76816,9.30145 -18.03938,16.49663 -29.07547,18.60024 -9.70086,1.84909 -7.88846,2.29879 -18.73454,1.14153 -7.06675,-1.70605 -14.17754,-3.41612 -19.070284,-6.54701 -3.654135,0 -16.429495,-15.44005 -21.319771,-25.78517 C 64.370505,148.18757 66.530422,87.970016 82.33107,68.960672 94.743644,54.027431 107.98469,46.714231 123.62763,46.465792 z" + id="path2993" + inkscape:connector-curvature="0" + sodipodi:nodetypes="csssssssssccssssssssssssccsssssssccsss" /> + <path + style="fill:#000000" + d="m 113.77558,172.94719 c -2.2321,-1.954 -2.25024,-2.25189 -0.93908,-15.42226 3.31135,-33.26172 3.3518,-32.49989 -2.04876,-38.58062 -13.354563,-15.03653 -4.11591,-36.054456 15.78588,-35.912831 19.30559,0.137381 27.46353,22.551931 13.45978,36.981821 -4.94633,5.09686 -4.8679,2.79208 -1.21405,35.67722 1.35944,12.23501 1.47331,16.18545 0.49477,17.164 -2.35855,2.35854 -22.86517,2.43297 -25.53854,0.0927 z" + id="path2987" + inkscape:connector-curvature="0" /> +</svg> diff --git a/pages/assets/providers/oblivia.vc.png b/pages/assets/providers/oblivia.vc.png Binary files differnew file mode 100644 index 0000000..e9bd97a --- /dev/null +++ b/pages/assets/providers/oblivia.vc.png diff --git a/pages/assets/providers/riseup.net.png b/pages/assets/providers/riseup.net.png Binary files differnew file mode 100644 index 0000000..2772a3f --- /dev/null +++ b/pages/assets/providers/riseup.net.png diff --git a/pages/assets/style.scss b/pages/assets/style.scss index b1618ae..c4a7091 100644 --- a/pages/assets/style.scss +++ b/pages/assets/style.scss @@ -1,52 +1,5 @@ -// note: css paths are always relative to the css file - - -$masthead-large-img: '/assets/images/rainbow-masthead-large.png'; -$masthead-large-height: 200px; -$masthead-medium-img: '/assets/images/rainbow-masthead-medium.png'; -$masthead-medium-height: 130px; -$masthead-small-img: '/assets/images/rainbow-masthead-small.png'; -$masthead-small-height: 80px; -$masthead-background-color: #5e9ee3; - -$gutter: 15px; -$background-color: #333; -$menu-text-color: #fff; -$menu-padding: 8px 18px; -//$menu-shadow-size: 1px; -//$menu-shadow-blur: 2px; -//$menu-shadow-color: #000; -$content-border-color: #000; -$content-background-color: #fff; -$content-shadow-color: #000; -$content-shadow-size: 1px; -$content-shadow-blur: 8px; -$title-background-color: #efefef; -$title-divider-color: #ccc; -$footer-height: 50px; -$footer-gutter: 20px; -$footer-background-color: #666; -$footer-color: #ddd; -$footer-border-width: 1px; -$footer-border-color: darken($background-color, 5%); -$footer-shadow: true; -$footer-shadow-color: #333; -$footer-shadow-size: 1px; -$footer-shadow-blur: 6px; -$navigation-item-active-background-color: #999; -$navigation-item-active-color: #000; -$navigation-item-background-color: #ccc; -$navigation-item-color: #666; -$navigation-border: 1px solid #333; -$navigation-shadow: 1px 1px 4px #111; -$link-color: darken($masthead-background-color, 15%); -$link-visited-color: darken($masthead-background-color, 25%); - -$home-light-color: #333; -$home-light-background-color: #eee; - -$home-dark-color: #fff; -$home-dark-background-color: $background-color; +@import "variables.scss"; +@import "content.scss"; // // TYPOGRAPHY @@ -87,6 +40,10 @@ h2.hidey { margin: 0; } +h4 { + margin-top: 20px; +} + //.h3 { // @extend h3; // margin: 0; @@ -171,14 +128,14 @@ body.home #masthead .text { body.home #masthead .text { height: $masthead-large-height/2; &.bottom { - font-size: 20px; - line-height: 30px !important; + font-size: 18px; + line-height: 28px !important; } } // medium masthead -@media (max-width: 992px) { +@media (max-width: 767px) { #masthead { background: $masthead-background-color url(#{$masthead-medium-img}) 50% 50%; .masthead-inner { @@ -193,8 +150,8 @@ body.home #masthead .text { body.home #masthead .text { height: $masthead-medium-height/2; &.bottom { - font-size: 14px; - line-height: 24px !important; + font-size: 10px; + line-height: 19px !important; } } } @@ -202,29 +159,29 @@ body.home #masthead .text { // small masthead -@media (max-width: 767px) { - #masthead { - background: $masthead-background-color url(#{$masthead-small-img}) 50% 50%; - .masthead-inner { - height: $masthead-small-height; - .text { - padding-left: 1px; - font-size: 30px; - line-height: $masthead-small-height; - } - } - } - body.home #masthead .text { - height: $masthead-small-height/2; - &.bottom { - font-size: 9px; - line-height: 14px !important; - span { - padding: 2px; - } - } - } -} +// @media (max-width: 767px) { +// #masthead { +// background: $masthead-background-color url(#{$masthead-small-img}) 50% 50%; +// .masthead-inner { +// height: $masthead-small-height; +// .text { +// padding-left: 1px; +// font-size: 30px; +// line-height: $masthead-small-height; +// } +// } +// } +// body.home #masthead .text { +// height: $masthead-small-height/2; +// &.bottom { +// font-size: 9px; +// line-height: 14px !important; +// span { +// padding: 2px; +// } +// } +// } +// } #top-menu { position: absolute; @@ -239,7 +196,7 @@ body.home #masthead .text { color: $menu-text-color; font-size: 14px; line-height: 20px; - background-color: rgba(0,0,0,0.25); + background-color: $menu-background-color; } a.active { background-color: $background-color; @@ -250,7 +207,7 @@ body.home #masthead .text { @media only screen and (max-width: 767px) { #top-menu a { - padding: 5px 6px; + padding: 2px 6px; font-size: 12px; } } @@ -396,6 +353,28 @@ html, body { // body.home { + .content-box { + padding: 20px; + } + .heading { + i { + padding-right: 10px; + } + span { + color: #003; + } + margin: 20px 0 15px 0; + font-size: 26px; + } + .thumbnail { + word-break: break-all; + .b { + font-size: 16px; + } + } + p.big { + font-size: 16px; + } .download a { color: white !important; font-size: 16px; @@ -405,15 +384,9 @@ body.home { display: inline-block; } } - .pad { - margin: 15px 0; - } .light, .dark, .lighter, .darker { padding-top: 15px; padding-bottom: 15px; - //ul { - // padding-left: 15px; - //} } .dark, .darker { color: $home-dark-color; @@ -426,20 +399,13 @@ body.home { } } .dark { - //color: darken($home-dark-color, 20%); - background-color: lighten($home-dark-background-color, 10%); + background-color: lighten($home-dark-background-color, 5%); } .light, .lighter { color: $home-light-color; background-color: $home-light-background-color; - .h2 span { - //background: red; - //color: white; - //padding: 4px; - } } .light { - //color: darken($home-light-color, 20%); background-color: lighten($home-light-background-color, 20%); } .b { @@ -451,7 +417,5 @@ body.home { ul.fa-ul { margin-left: 22px; } - ul.spaced li { - margin-bottom: 15px; - } } + diff --git a/pages/en.haml b/pages/en.haml index 5d375cf..08697f3 100644 --- a/pages/en.haml +++ b/pages/en.haml @@ -1,4 +1,4 @@ -- @toc = false +- @this.toc = false - @title = 'Home' - @this.layout = 'home' @@ -15,4 +15,7 @@ %span = t :download_bitmask -= render 'home/text' +.container + .shadow-box + .content-box + = render 'home/text' diff --git a/pages/help/vpn/benefits/en.text b/pages/features/benefits/en.text index 1d9391b..1d9391b 100644 --- a/pages/help/vpn/benefits/en.text +++ b/pages/features/benefits/en.text diff --git a/pages/features/en.haml b/pages/features/en.haml new file mode 100644 index 0000000..df23539 --- /dev/null +++ b/pages/features/en.haml @@ -0,0 +1,69 @@ +- @title = 'Bitmask Features' +- @nav_title = 'Features' + +%h1#vpn VPN features + +%p With Bitmask VPN, all your traffic is securely routed through your provider before it is decrypted and sent on to the open internet. + +%ul.fa-ul.spaced + %li + %i.fa-li.fa.fa-check-square + <b>Thwart Network Surveillance</b><br> + Bitmask VPN is very effective at bypassing most censorship and network surveillance by your ISP or country. + %li + %i.fa-li.fa.fa-check-square + <b>Anonymize your address</b><br> + Your IP address will also be hidden, keeping your physical location safe from nefarious websites or network eavesdroppers. + %li + %i.fa-li.fa.fa-check-square + <b>Extra Security</b><br> + We take extra security measures to prevent problems common to other personal VPNs, such as DNS leakage and IPv6 leakage. + +%h1#email Email features + +%p Bitmask Encrypted Email is easy to use while still being backward compatible with the existing OpenPGP protocol for secure email. + +%ul.fa-ul.spaced + %li + %i.fa-li.fa.fa-check-square + <b>Full end-to-end encryption</b><br> + Whenever possible, all messages are encrypted end-to-end on the client device. + %li + %i.fa-li.fa.fa-check-square + <b>Secure Storage</b><br> + All incoming email is automatically encrypted so only you can read it (including meta-data). + %li + %i.fa-li.fa.fa-check-square + <b>Automatic Key Management</b><br> + The user never needs to know or worry about generating keys, discovering keys, or validating keys. + + +%h1 Security features + +.row + .col-sm-6 + %ul.fa-ul.spaced + %li + %i.fa-li.fa.fa-save + <b>Client-encrypted Storage</b><br> + All data storage is encrypted, including local data and cloud backups. This encryption always [[takes place on your device => https://leap.se/en/soledad]], so the service provider cannot read your stored data. + %li + %i.fa-li.fa.fa-exchange + <b>Always Available</b><br> + Your data is always available, even when you are offline, it is [[synchronized to the devices => https://leap.se/en/soledad]] you choose, and secured backed up to the cloud. + %li + %i.fa-li.fa.fa-exclamation-circle + <b>Passwords, Improved</b><br> + Although you specify a username and password to login, your [[password is never communicated to the provider => https://en.wikipedia.org/wiki/Secure_Remote_Password_protocol]]. + .col-sm-6 + %ul.fa-ul.spaced + %li + %i.fa-li.fa.fa-clock-o + <b>Up to date</b><br> + The Bitmask application is always kept up to date with the latest security patches (coming soon). + %li + %i.fa-li.fa.fa-institution + <b>Don't trust the provider</b><br> + If you download the Bitmask application from [[dl.bitmask.net => https://dl.bitmask.net]], your service provider cannot add a backdoor to compromise your security. + +%p As with any security system, Bitmask has [[known limitations => https://leap.se/en/limitations]]. For technical details, see our [[design documentation => https://leap.se/en/design]]. diff --git a/pages/help/vpn/limitations/en.text b/pages/features/limitations/en.text index 146a343..146a343 100644 --- a/pages/help/vpn/limitations/en.text +++ b/pages/features/limitations/en.text diff --git a/pages/help/vpn/limitations/vpn-01_large.png b/pages/features/limitations/vpn-01_large.png Binary files differindex 64bad2a..64bad2a 100644 --- a/pages/help/vpn/limitations/vpn-01_large.png +++ b/pages/features/limitations/vpn-01_large.png diff --git a/pages/help/vpn/limitations/vpn-02_large.png b/pages/features/limitations/vpn-02_large.png Binary files differindex a2d5355..a2d5355 100644 --- a/pages/help/vpn/limitations/vpn-02_large.png +++ b/pages/features/limitations/vpn-02_large.png diff --git a/pages/help/vpn/limitations/vpn-03_large.png b/pages/features/limitations/vpn-03_large.png Binary files differindex 6bfb62a..6bfb62a 100644 --- a/pages/help/vpn/limitations/vpn-03_large.png +++ b/pages/features/limitations/vpn-03_large.png diff --git a/pages/help/email/en.text b/pages/help/email/en.text index 4bc4bfc..71d285b 100644 --- a/pages/help/email/en.text +++ b/pages/help/email/en.text @@ -24,4 +24,5 @@ h3. Manual email client configuration ** *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. +*Disable caching*: 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 any cache maintained by your mail client is probably less secure. Because all your Bitmask email is synchronized locally there is no benefit to local caching. + diff --git a/pages/help/en.haml b/pages/help/en.haml index 2a76e19..af1c103 100644 --- a/pages/help/en.haml +++ b/pages/help/en.haml @@ -1,15 +1,43 @@ -- @title = 'Help' +- @title = 'Bitmask Help' +- @nav_title = 'Help' +- @this.toc = false -.h2 - %i.fa.fa-shield - %span - [[VPN => help/vpn]] +%br -%p.pad With Bitmask VPN, all your traffic is securely routed through your provider before it is decrypted and sent on to the open internet. +.row + .col-xs-1.text-right + %h2 + %i.fa.fa-support + .col-xs-11.text-left + %h2 [[Support => help/support]] + %p Get support, create a help ticket, fill out bug reports, ask for new features. -.h2 - %i.fa.fa-envelope - %span - [[Encrypted Email => help/email]] +%hr -%p.pad Bitmask Encrypted Email is easy to use while still being backward compatible with the existing OpenPGP protocol for secure email. +.row + .col-xs-1.text-right + %h2 + %i.fa.fa-flag-checkered + .col-xs-11.text-left + %h2 [[Getting Started => help/getting-started]] + %p Running Bitmask for the first time. + +%hr + +.row + .col-xs-1.text-right + %h2 + %i.fa.fa-shield + .col-xs-11.text-left + %h2 [[VPN => help/vpn]] + %p How to protect your traffic from censorship and surveillance by using Bitmask VPN. + +%hr + +.row + .col-xs-1.text-right + %h2 + %i.fa.fa-envelope + .col-xs-11.text-left + %h2 [[Encrypted Email => help/email]] + %p How to easily send and receive secure messages with Bitmask Encrypted Email. diff --git a/pages/help/faq/en.text b/pages/help/faq/en.text new file mode 100644 index 0000000..99f210e --- /dev/null +++ b/pages/help/faq/en.text @@ -0,0 +1,12 @@ +@title = 'FAQ' + +h1. General topics + +h2. How to I remove a provider? + +We are working on an easy way to remove a provider once it has been added. For now, you can remove the provider manually. Suppose the provider was example.org: + +* On Linux, run @rm -r ~/.config/leap/providers/example.org@ +* On Mac, ??? +* On Windows, ??? + diff --git a/pages/help/getting-started/en.text b/pages/help/getting-started/en.text new file mode 100644 index 0000000..d8663b4 --- /dev/null +++ b/pages/help/getting-started/en.text @@ -0,0 +1,73 @@ +@title = 'Getting Started' + +h1. Sign up for a new account + +In order to use Bitmask, you must have a user account with a compatible provider. You can create a new account using the Bitmask application or by visiting the website of the provider. For security reasons, we recommend that users always create accounts through the Bitmask application. + +h2. Android + +h4. Step 1 -- Choose a provider + +p((. When you run Bitmask for the first time it will display a list of available providers. + +p((. To add a new provider that is not part of the list, press the <button>⊕</button> button. + +h4. Step 2 -- Provider setup + +p((. In order to securely communicate with a provider, Bitmask needs to download and validate its credentials. These credentials allow Bitmask to know it is always talking with the right provider. + +h4. Step 3 -- Register a new user account + +p((. Select your desired username and password. The username must be all lowercase letters or numbers. The password must be at least eight characters and is case sensitive. + +p((. Because your password is never communicated to the provider, it is impossible to recover a lost password with Bitmask. Please, write your password down or store it in a password manager. + +h4. Step 4 -- Activate VPN + +p((. Activate the Bitmask VPN by tapping the On/Off switch. + +p((. Android will ask if you want to let Bitmask create a VPN Connection. Mark "I trust this application" and then accept. + +p((. Once the switch is on, you are using Bitmask VPN. + +h2. Desktop + +When you run Bitmask for the first time it will open the *Bitmask Provider Setup* wizard. If you have already run Bitmask, you can access this by selecting the menu item *Bitmask > Create a new account*. + +h4. Step 1 -- Welcome + +p((. Choose *Sign up for a new account* or *I have an account* and press <button>Next</button>. + +h4. Step 2 -- Choose a provider + +p((. If the provider you want is known to Bitmask, you can select it from the dropdown menu. + +p((. Otherwise, select *Configure new provider* and type in the domain name. + +p((. Press <button>Check</button> to validate the provider. Bitmask will then attempt to contact the provider and confirm that it is compatible. + +p((. If all the checks pass, then press <button>Next</button>. If the checks don't pass, contact the provider to let them know something is wrong. + +p((. The next page will give you more details about the provider you have selected. If you still want to proceed, hit <button>Next</button> button again. + +h4. Step 3 -- Provider setup + +p((. In order to securely communicate with a provider, Bitmask needs to download and validate its credentials. These credentials allow Bitmask to know it is always talking with the right provider. + +p((. If all the checks pass, then press <button>Next</button>. + +h4. Step 4 -- Register a new user account + +p((. Select your desired username and password. The username must be all lowercase letters or numbers. The password must be at least eight characters and is case sensitive. + +p((. Because your password is never communicated to the provider, it is impossible to recover a lost password with Bitmask. Please, write your password down or store it in a password manager. + +p((. If successful, hit <button>Next</button>. + +h4. Step 5 - Service selection + +p((. Select the services you want enabled for this new account. You can change this selection later. + +p((. Finally, hit <button>Connect</button>. + + diff --git a/pages/help/support/en.text b/pages/help/support/en.text new file mode 100644 index 0000000..64fe8fb --- /dev/null +++ b/pages/help/support/en.text @@ -0,0 +1,23 @@ +@title = 'Getting Support' +@nav_title = 'Support' +@toc = true + +h2. Found a bug in the software? + +You can "file a bug report":https://leap.se/code/projects/report-issues/issues/new?issue[tracker_id]=2 on the LEAP Bug Tracker. First, [[search the existing issues => https://leap.se/code/search]] to see if someone has already reported that bug. + +h2. Want to request a new feature? + +You can "request a new feature":https://leap.se/code/projects/report-issues/issues/new?issue[tracker_id]=1 on the LEAP Bug Tracker. First, [[search the existing issues => https://leap.se/code/search]] to see if someone has already requested that feature. + +h2. Search the forums + +Coming soon... + +h2. Get support from your provider + +For questions related to your service, and not the Bitmask software, you will need to contact your service provider directly. Here are links to some of the popular service providers that support Bitmask: + +* [[demo.bitmask.net -> https://demo.bitmask.net]] +* [[riseup.net -> https://black.riseup.net]] +* [[calyx.net -> https://calyx.net]] diff --git a/pages/help/vpn/android/en.text b/pages/help/vpn/android/en.text index f154626..fe0fb12 100644 --- a/pages/help/vpn/android/en.text +++ b/pages/help/vpn/android/en.text @@ -1,4 +1,23 @@ -@title = "Encrypted Internet on Android" -@nav_title = "Android Usage" +@title = 'VPN on Android' +@nav_title = 'Android' +@summary = 'Using Bitmask VPN on Android devices' -How to use bitmask on android
\ No newline at end of file +h2. VPN States + +The current state of the VPN connection is displayed as a notification icon: + +*(android-on) VPN is *connected*, traffic is securely routed to the provider. +*(android-wait) VPN is *waiting* to connect or to reconnect after the loss of network access. Traffic might escape unencrypted during this period. +*(android-off) VPN is *off*. No traffic is encrypted. + +h2. Logging In + +When you first run the Bitmask VPN, you will need to log in to authenticate with your provider. Subsequently, you will be able to run the VPN without logging in. + +Once in a while, Bitmask may require that you login again in order to refresh the credentials used when the VPN is connecting. The default time between required log ins is one month, although your provider may be configured differently. + +h2. Anonymous VPN + +Some providers support an anonymous VPN mode. When enabled, you do not need to ever log in to use the VPN service. However, these providers often offer faster service when you do log in. + +When you are running Bitmask in anonymous VPN mode you might be blocked from reaching some sites. This is because some sites will block all traffic that is originating from known anonymous proxies. diff --git a/pages/help/vpn/en.text b/pages/help/vpn/en.text index 45f5fdd..00653a9 100644 --- a/pages/help/vpn/en.text +++ b/pages/help/vpn/en.text @@ -1,6 +1,8 @@ -@title = 'VPN' +@nav_title = 'VPN' +@title = 'Bitmask VPN' +@this.toc = false -h2. What is Bitmask VPN? +h1. What is Bitmask VPN? By using the Bitmask VPN, you are able to securely route all your internet traffic through the server of your choice. @@ -11,10 +13,5 @@ For more information, see: * [[Benefits of using Encrypted Internet => benefits]] * [[Limitations of Encrypted Internet => limitations]] -h2. How do I use it? - -* [[Android => vpn/android]] -* [[Linux => vpn/linux]] -* [[Mac => vpn/mac]] -* [[Windows => vpn/windows]] +<%= child_summaries :include_toc => true, :heading => 1 %> diff --git a/pages/help/vpn/faq/en.text b/pages/help/vpn/faq/en.text deleted file mode 100644 index 708965f..0000000 --- a/pages/help/vpn/faq/en.text +++ /dev/null @@ -1,36 +0,0 @@ -@nav_title = "FAQ" -@title = "Riseup's Encrypted Internet Proxy FAQ" -@summary = "Frequently Asked Questions and their Answers" - -h2. What happened with the old RiseupVPN? - -The main issue with the RiseupVPN system was that it was not user friendly, resulting in several people with massive headaches when they tried to set it up, or when trying to fix it when it didn't work. Encryption needs to be easy, not something that is easy to screw up! We are switching to a new service powered by LEAP that comes with a brand new client that provides hassle-free configuration and a enchanced level of security on Linux and Android (with Windows and OSX in the works). We are calling this new service Riseup's EIP. - -h2. What does EIP mean? - -EIP stands for Encrypted Internet Proxy, some people might know it as a VPN. It is a tool that provides censorship circumvention, location anonymization and traffic encryption to activists around the globe. Using the Bitmask client, you will encrypt all your internet traffic and send it through riseup.net servers where it then goes to the public internet. Just like the old VPN does, but with an easy and accessible client. - -This is an integral part of the Riseup's next generation of anti-surveillance services powered by the LEAP Encryption Access Project. - -h2. What's LEAP? - -LEAP is a project focused to make encryption easy to use and widely avaiable but not compromissing it's security. Adapting existing technologies, LEAP creates tools that let you excercise the right to digitally whisper, as a fundamental precondition for a free society. - -h2. What's the status of the Riseup's EIP? - -We are currently in a beta period, this means we are looking for possible issues so we can fix them! Can you give us a hand with that? Because it is a beta, there are a couple things you need to know: - - * You will not be able to use your riseup account username during this period. Please create a new one. Later you will be able to migrate your current account to a LEAP powered one. - * You need to suscribe to a low volume mailing list to receive important news about the service, as we will notify you of changes important changes you need to take care. Please do at https://lists.riseup.net/riseup-leap-beta - -h2. What systems are supported? - -The Bitmask client runs on linux (as a package on Debian and Ubuntu and as a bundle for other distributions), Mac OSX and Android. Please check the Setup intructions for those systems - -h2. Where do I send the bugs I found? - -Please file an issue under your account at https://black.riseup.net - -h2. Can I invite all my friends to use Riseup's EIP Beta? - -We are running a semi-closed beta period to check things out, find issues and to solve them. You are part of a special secret group, please keep it that way :) diff --git a/pages/help/vpn/linux/en.text b/pages/help/vpn/linux/en.text index 31a4675..ccfa69e 100644 --- a/pages/help/vpn/linux/en.text +++ b/pages/help/vpn/linux/en.text @@ -1,4 +1,50 @@ -@title = 'Encrypted Internet on Linux' -@nav_title = "Linux Usage" +@title = 'VPN on Linux' +@nav_title = 'Linux' +@summary = 'Using Bitmask VPN on Linux devices' + +h2. VPN States + +The current state of the VPN connection is displayed in the system tray: + +*(desktop-off) VPN is *off*. No traffic is encrypted. +** If the VPN was previously on, then all traffic is blocked until the VPN is turned back on. +** Hit <button>Turn OFF</button> if you want to restore normal unencrypted network access. +*(desktop-wait) VPN is *waiting* to connect or to reconnect after the loss of network access. +** All traffic is blocked until the VPN connects. +** Hit <button>Cancel</button> if you want to restore normal network access. +*(desktop-on) VPN is *connected*, all traffic is securely routed to the provider. + +h2. Logging In + +When you first run the Bitmask VPN, you will need to log in to authenticate with your provider. Subsequently, you will be able to run the VPN without logging in. + +Once in a while, Bitmask may require that you login again in order to refresh the credentials used when the VPN is connecting. The default time between required log ins is one month, although your provider may be configured differently. + +h2. Troubleshooting + +h3. DNS + +Domain Name Service (DNS) is the system that allows your computer to resolve domain names like "bitmask.net" to find the real internet address of the appropriate computer. Unfortunately, DNS has many problems: + +# Most DNS is very insecure, and an attacker can easily forge DNS responses in order to send you to an incorrect server. +# DNS doesn't use secure connections, so an eavesdropper can easily record a history of what internet sites you visit. +# Most DNS servers also keep a historical log of all the sites you visit. + +For these reasons, Bitmask will ensure that all DNS requests that your computer makes are rerouted to the DNS server of the provider. + +This means that you will not be able to make a DNS request to any other DNS server, even if you want to. For example, the command @host bitmask.net 8.8.8.8@ will not use the nameserver 8.8.8.8 to resolve the name bitmask.net, because the request will get rewritten to use the DNS server of your provider. + +You will also not be able to run a local nameserver that attempts to connect directly to the root DNS zone. The packages @bind9@ or @unbound@ are configured this way by default. These requests will get rewritten to the provider's DNS server and will fail. Bitmask is compatible with @dnsmasq@ however. + +If you wish to disable this behavior for debugging purposes, you can run the command @sudo bitmask-root firewall stop@ although doing so may allow some traffic to bypass the VPN and escape your computer unencrypted. + +h3. Break glass in case of emergency + +In rare cases, your computer might get stuck in a mode that blocks all network traffic. Try this: + +* You can run @sudo bitmask-root firewall stop@ to remove all the Bitmask firewall rules that prevent traffic from leaking insecurely. +* If all else fails, you can try logging out or restarting your computer. + +If you encounter a bug, please [[report it => support]]. + -linux usage
\ No newline at end of file diff --git a/pages/help/vpn/mac/en.text b/pages/help/vpn/mac/en.text deleted file mode 100644 index 3429d49..0000000 --- a/pages/help/vpn/mac/en.text +++ /dev/null @@ -1,4 +0,0 @@ -@title = 'Encrypted Internet on Mac' -@nav_title = "Mac Usage" - -mac usage
\ No newline at end of file diff --git a/pages/help/vpn/windows/en.text b/pages/help/vpn/windows/en.text deleted file mode 100644 index d3b1206..0000000 --- a/pages/help/vpn/windows/en.text +++ /dev/null @@ -1,4 +0,0 @@ -@title = 'Encrypted Internet on Windows' -@nav_title = "Windows Usage" - -windows usage
\ No newline at end of file diff --git a/pages/home/_text.haml b/pages/home/_text.haml index cc8b311..b14fda6 100644 --- a/pages/home/_text.haml +++ b/pages/home/_text.haml @@ -1,141 +1,81 @@ -.lighter - .container - .row - .col-sm-12 - %h1#features Features - - %p The <b>Bitmask</b> application is designed to have a <b>friendly</b> interface with <b>automatic</b> configuration. You simply start the application, register with the compatible service provider of your choice, and away you go. - -.lighter - .container - .row - .col-sm-2.text-right - .h2 - %i.fa.fa-shield.fa-3x - .col-sm-10.text-left - .h2 - %span - [[VPN => help/vpn]] - %p.pad With Bitmask VPN, all your traffic is securely routed through your provider before it is decrypted and sent on to the open internet. - %ul.fa-ul.spaced - %li - %i.fa-li.fa.fa-check-square - <b>Thwart Network Surveillance</b><br> - Bitmask VPN is very effective at bypassing most censorship and network surveillance by your ISP or country. - %li - %i.fa-li.fa.fa-check-square - <b>Anonymize your address</b><br> - Your IP address will also be hidden, keeping your physical location safe from nefarious websites or network eavesdroppers. - %li - %i.fa-li.fa.fa-check-square - <b>Extra Security</b><br> - We take extra security measures to prevent problems common to other personal VPNs, such as DNS leakage and IPv6 leakage. - -.lighter - .container - .row - .col-sm-2.text-right - .h2 - %i.fa.fa-envelope.fa-2x - .col-sm-10.text-left - .h2 - %span - [[Encrypted Email => help/email]] - %p.pad Bitmask Encrypted Email is easy to use while still being backward compatible with the existing OpenPGP protocol for secure email. - %ul.fa-ul.spaced - %li - %i.fa-li.fa.fa-check-square - <b>Full end-to-end encryption</b><br> - Whenever possible, all messages are encrypted end-to-end on the client device. - %li - %i.fa-li.fa.fa-check-square - <b>Secure Storage</b><br> - All incoming email is automatically encrypted so only you can read it (including meta-data). - %li - %i.fa-li.fa.fa-check-square - <b>Automatic Key Management</b><br> - The user never needs to know or worry about generating keys, discovering keys, or validating keys. - -.dark - .container - .row - .col-sm-12 - %h1#security Security - .row - .col-sm-6 - %ul.fa-ul.spaced - %li - %i.fa-li.fa.fa-save - <b>Client-encrypted Storage</b><br> - All data storage is encrypted, including local data and cloud backups. This encryption always [[takes place on your device => https://leap.se/en/soledad]], so the service provider cannot read your stored data. - %li - %i.fa-li.fa.fa-exchange - <b>Always Available</b><br> - Your data is always available, even when you are offline, it is [[synchronized to the devices => https://leap.se/en/soledad]] you choose, and secured backed up to the cloud. - %li - %i.fa-li.fa.fa-exclamation-circle - <b>Passwords, Improved</b><br> - Although you specify a username and password to login, your [[password is never communicated to the provider => https://en.wikipedia.org/wiki/Secure_Remote_Password_protocol]]. - .col-sm-6 - %ul.fa-ul.spaced - %li - %i.fa-li.fa.fa-clock-o - <b>Up to date</b><br> - The Bitmask application is always kept up to date with the latest security patches (coming soon). - %li - %i.fa-li.fa.fa-institution - <b>Don't trust the provider</b><br> - If you download the Bitmask application from [[dl.bitmask.net => https://dl.bitmask.net]], your service provider cannot add a backdoor to compromise your security. - .row - .col-sm-12 - %p As with any security system, Bitmask has [[known limitations => https://leap.se/en/limitations]]. For technical details, see our [[design documentation => https://leap.se/en/design]]. - -.light - .container - .row - .col-sm-12 - %h1#providers Supported providers +.row + .col-sm-12 + %p.big The <b>Bitmask</b> application is designed to have a <b>friendly</b> interface with <b>automatic</b> configuration. You simply start the application, register with the compatible service provider of your choice, and away you go. + +.row + .col-sm-6 + .heading + %span + %i.fa.fa-shield + Bitmask VPN + %p.big With [[Bitmask VPN => features#vpn]], all your traffic is securely routed through your provider before it is decrypted and sent on to the open internet. + .col-sm-6 + .heading + %span + %i.fa.fa-envelope + Encrypted Email + %p.big [[Bitmask Encrypted Email => features#email]] is easy to use while still being backward compatible with the existing OpenPGP protocol for secure email. + +.row + .col-sm-12 + .heading + %span + %i.fa.fa-institution + Supported providers + + %p.big The following service providers are compatible with the Bitmask application: - %p The following service providers are compatible with the Bitmask application: - - %ul - %li= link 'demo.bitmask.net' => 'https://demo.bitmask.net' - %li - = link 'calyx.net' => 'https://calyx.net' - %li - = link 'oblivia.vc' => 'https://oblivia.vc' - (coming soon) - %li - = link 'riseup.net' => 'https://riseup.net' - - - %p Start your own compatible service provider with the free software #{link 'LEAP platform' => 'https://leap.se/en/platform'}. - -.darker - .container .row - .col-sm-6 - %h1#code Fork our code - - %p <b>Hey, you! We could use a hand here</b>. You want communication free of surveillance, based on open protocols, and that gives users control over their own data? Well, grab a keyboard and #{link 'pitch in' => 'https://leap.se/en/get-involved'}—the code is not going to write itself. - - %p In particular, if you have finely honed skill in Python, Android Java, Ruby, C, CouchDB, Windows, Mac, Puppet, Qt, or you really love crypto, we could sure use your help. - - %ol - %li #{link 'Fork our code' => 'https://leap.se/en/source'}. - %li Create a new branch from develop called feature/x or bugfix/x. - %li Hack away. - %li Issue a pull request on github from your feature or bugfix branch to the upstream develop branch. - %li Discuss and wait for request to be merged. - %li Repeat. - - %p Currently, we release a new version of the Bitmask application every two weeks, and other components as necessary. - - .col-sm-6 - %h1#about-us About us - - %img{src:'/assets/images/leap-small.png', align:'right'} - - %p The <b>Bitmask</b> application is lovingly hand-crafted by a team of paid and volunteer programmers from seven different countries. Development is principally sponsored by the #{link 'LEAP Encryption Access Project' => 'https://leap.se'}, an non-profit organization dedicated to defending democracy by <b>protecting the right to whisper</b>. - - %p The service provider <b>demo.bitmask.net</b> is operated by LEAP in order to demonstrate usage of the <b>Bitmask</b> application. However, we actively encourage other organizations to start their own compatible service providers by using our free software #{link 'platform for server automation' => 'https://leap.se/en/platform'}. + .col-lg-2.col-md-3.col-sm-3.col-xs-4 + .thumbnail + %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/calyx.net.png') + .b + [[calyx.net => https://calyx.net]] + .col-lg-2.col-md-3.col-sm-3.col-xs-4 + .thumbnail + %img(src='/assets/providers/oblivia.vc.png') + .b + [[oblivia.vc => https://oblivia.vc]] + .col-lg-2.col-md-3.col-sm-3.col-xs-4 + .thumbnail + %img(src='/assets/providers/riseup.net.png') + .b + [[riseup.net => https://black.riseup.net]] + +.row + .col-sm-6 + .heading + %span + %i.fa.fa-code-fork + Fork our code + + %p <b>Hey, you! We could use a hand here</b>. You want communication free of surveillance, based on open protocols, and that gives users control over their own data? Well, grab a keyboard and #{link 'pitch in' => 'https://leap.se/en/get-involved'}—the code is not going to write itself. + + %p In particular, if you have finely honed skill in Python, Android Java, Ruby, C, CouchDB, Windows, Mac, Puppet, Qt, or you really love crypto, we could sure use your help. + + %ol + %li #{link 'Fork our code' => 'https://leap.se/en/source'}. + %li Create a new branch from develop called feature/x or bugfix/x. + %li Hack away. + %li Issue a pull request on github from your feature or bugfix branch to the upstream develop branch. + %li Discuss and wait for request to be merged. + %li Repeat. + + %p Currently, we release a new version of the Bitmask application every two weeks, and other components as necessary. + + .col-sm-6 + .heading + %span + %i.fa.fa-group + About us + + %img{src:'/assets/images/leap-small.png', align:'right'} + + %p The <b>Bitmask</b> application is lovingly hand-crafted by a team of paid and volunteer programmers from seven different countries. Development is principally sponsored by the #{link 'LEAP Encryption Access Project' => 'https://leap.se'}, an non-profit organization dedicated to defending democracy by <b>protecting the right to whisper</b>. + + %p The service provider <b>demo.bitmask.net</b> is operated by LEAP in order to demonstrate usage of the <b>Bitmask</b> application. However, we actively encourage other organizations to start their own compatible service providers by using our free software #{link 'platform for server automation' => 'https://leap.se/en/platform'}. diff --git a/pages/install/linux/_via_packages.html.haml b/pages/install/linux/_via_packages.html.haml index 23243a4..340a19e 100644 --- a/pages/install/linux/_via_packages.html.haml +++ b/pages/install/linux/_via_packages.html.haml @@ -4,21 +4,12 @@ To install %pre - - if @locals[:distro] == 'wheezy' - :preserve - sudo -s - echo "deb http://deb.bitmask.net/debian #{@locals[:distro]} main" > /etc/apt/sources.list.d/bitmask.list - echo "deb http://http.debian.net/debian wheezy-backports 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 - - else - :preserve - sudo -s - 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-get update - apt-get install bitmask leap-keyring + :preserve + sudo -s + 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-get update + apt-get install bitmask leap-keyring %p.b To remove diff --git a/pages/install/linux/en.md b/pages/install/linux/en.md index 7efe5f7..e123d65 100644 --- a/pages/install/linux/en.md +++ b/pages/install/linux/en.md @@ -11,14 +11,8 @@ This is the recommended method of installing Bitmask. If installed as a package, <%= render({:partial => 'via_packages'}, {:distro => 'trusty'}) %> -### Ubuntu 13.10 (Saucy Salamander) - -<%= render({:partial => 'via_packages'}, {:distro => 'saucy'}) %> - ### Debian 7.0 (Wheezy) -Note: for wheezy, these instructions will enable `wheezy-backports`, causing your computer to install more up-to-date versions of many packages. For more information, see the [Debian backports page](https://wiki.debian.org/Backports). - <%= render({:partial => 'via_packages'}, {:distro => 'wheezy', :os => 'debian'}) %> ### Debian 8.0 (Jessie) |
