diff --git a/_config.yml b/_config.yml index 6f02bcb3..dc4a237b 100644 --- a/_config.yml +++ b/_config.yml @@ -32,27 +32,22 @@ collections: output: true permalink: /:name/ authors: - permalink: /blog/authors/:name/ + permalink: /blog/authors/:path/ devices: output: true - permalink: /devices/:name/ - sort_by: order + permalink: /devices/:path/ browsers: output: true - permalink: /browsers/:name/ - sort_by: order + permalink: /browsers/:path/ software: output: true - permalink: /software/:name/ - sort_by: order + permalink: /software/:path/ os: output: true - permalink: /os/:name/ - sort_by: order + permalink: /os/:path/ providers: output: true - permalink: /providers/:name/ - sort_by: order + permalink: /providers/:path/ defaults: - scope: diff --git a/_includes/anti-recommendation.html b/_includes/anti-recommendation.html index 9cb03c26..ea8813c1 100644 --- a/_includes/anti-recommendation.html +++ b/_includes/anti-recommendation.html @@ -1,2 +1,2 @@ -

{{ post.name }}

-{{ post.excerpt }} +

{{ post.title }}

+{{ post.description | markdownify }} diff --git a/_includes/breadcrumbs.html b/_includes/breadcrumbs.html index e4ed6b6f..91e5dfc6 100644 --- a/_includes/breadcrumbs.html +++ b/_includes/breadcrumbs.html @@ -1,25 +1,30 @@ -
- +
+
+ +
+
+ Edit +
diff --git a/_includes/downloads.html b/_includes/downloads.html index 8149c55a..01de3186 100644 --- a/_includes/downloads.html +++ b/_includes/downloads.html @@ -1,15 +1,19 @@ +{% if page.platform_win or page.platform_mac or page.platform_linux or page.platform_bsd or page.platform_android or page.platform_fdroid or page.platform_ios %}

Downloads

{% endif %} +{% endif %} diff --git a/_includes/recommendation-card.html b/_includes/recommendation-card.html index acab8555..2619d5d7 100644 --- a/_includes/recommendation-card.html +++ b/_includes/recommendation-card.html @@ -5,10 +5,10 @@ {{ post.name }} logo
-

{{ post.name }}

+

{{ post.title }}

{% if post.info %}

{{ post.info }}

{% endif %} {% if post.warning %}

{{ post.warning }}

{% endif %} - {{ post.short | markdownify }} + {{ post.description | markdownify }}

{% if post.platform_win %}{% endif %} {% if post.platform_mac %}{% endif %} diff --git a/_includes/worth-mentioning.html b/_includes/worth-mentioning.html index 7a374bf3..a6bf76c9 100644 --- a/_includes/worth-mentioning.html +++ b/_includes/worth-mentioning.html @@ -1,2 +1,2 @@ -

{{ post.name }}

-{{ post.excerpt }} +

{{ post.title }}

+{{ post.description | markdownify }} diff --git a/_layouts/recommendation.html b/_layouts/recommendation.html index fed18a34..cb1ac6e5 100644 --- a/_layouts/recommendation.html +++ b/_layouts/recommendation.html @@ -2,12 +2,23 @@ layout: default ---
-{% if page.type == "Anti-Recommendation" %}

{% include badge.html -color="danger" -text="Anti-Recommendation" -icon="fas fa-times-octagon" -%}

{% endif %} -

{{ page.title }}

+ {% include breadcrumbs.html %} +
+ {% if page.logo %}
+ {{ page.title }} logo +
{% endif %} +
+ {% if page.type == "Anti-Recommendation" %}

{% include badge.html + color="danger" + text="Anti-Recommendation" + icon="fas fa-times-octagon" + %}

{% endif %} +

{{ page.title }}

+ {% if page.description %}{{ page.description | markdownify }}{% endif %} + {% if page.website %}Visit {{ page.website | remove:'https://' | split:'/' | first }}{% endif %} +
+
{{ content }} + {% include downloads.html %} {% include footer.html %}
diff --git a/collections/_browsers/brave.md b/collections/_browsers/brave.md index f0a07144..8e18bb00 100644 --- a/collections/_browsers/brave.md +++ b/collections/_browsers/brave.md @@ -1,5 +1,6 @@ --- -name: Brave Browser +title: Brave Browser type: "Anti-Recommendation" +description: | + Despite being widely touted as a privacy-friendly Chromium browser, we have a number of concerns with Brave's business practices and future business model that prevents us from recommending them. The Brave team [has publicly stated](https://www.reddit.com/r/privacytoolsIO/comments/cs8foq/update_delisting_brave/) they do not want to be associated with privacy-focused groups like PrivacyTools ([PrivacyTools PR #657](https://github.com/privacytools/privacytools.io/pull/657)), which causes us to believe the Brave team does not wish to be under too much scrutiny from the privacy community as they continue to develop their product ([Reddit discussion](http://archive.today/2020.05.13-035943/https://www.removeddit.com/r/brave_browser/comments/csapsy/brave_browser_is_being_delisted_from/exf6i0f/)). --- -**Brave** is widely touted as a privacy-friendly Chromium browser, but we have a number of concerns with their business practices and future business model that would prevent us from recommending them. The Brave team [has publicly stated](https://www.reddit.com/r/privacytoolsIO/comments/cs8foq/update_delisting_brave/) they do not want to be associated with privacy-focused groups like PrivacyTools ([PrivacyTools PR #657](https://github.com/privacytools/privacytools.io/pull/657)), which causes us to believe the Brave team does not wish to be under too much scrutiny from the privacy community as they continue to develop their product ([Reddit discussion](http://archive.today/2020.05.13-035943/https://www.removeddit.com/r/brave_browser/comments/csapsy/brave_browser_is_being_delisted_from/exf6i0f/)). diff --git a/collections/_browsers/bromite.md b/collections/_browsers/bromite.md index 3e74b2bc..571b1573 100644 --- a/collections/_browsers/bromite.md +++ b/collections/_browsers/bromite.md @@ -1,5 +1,7 @@ --- -name: Bromite +title: Bromite type: "Worth Mentioning" +description: | + A Chromium-based browser with security and privacy enhancements built in, such as an adblocker and DNS-over-HTTPS support. It includes patches from Ungoogled Chromium and other security/privacy focused Chromium projects. However, Bromite is only available on Android at this time, making it a poor choice for users of multiple devices, especially if you need to sync between a desktop and mobile device. +website: 'https://www.bromite.org/' --- -[**Bromite**](https://www.bromite.org/) is a Chromium-based browser with security and privacy enhancements built in, such as an adblocker and DNS-over-HTTPS support. It includes patches from Ungoogled Chromium and other security/privacy focused Chromium projects. However, Bromite is only available on Android at this time, making it a poor choice for users of multiple devices, especially if you need to sync between a desktop and mobile device. diff --git a/collections/_browsers/chromium.md b/collections/_browsers/chromium.md index d267cf34..c555cd18 100644 --- a/collections/_browsers/chromium.md +++ b/collections/_browsers/chromium.md @@ -1,5 +1,6 @@ --- -name: Chromium +title: Chromium type: "Anti-Recommendation" +description: | + Without signing into a Google Account, the open-source builds of Chromium do relatively well in terms of security and privacy. However, Chromium still does have a number of integrations with Google hardcoded into the source, and because it is designed to be as user-friendly as possible, it operates in a way that compromises transparency and user-control. And, Chromium is still directly developed by Google, who have attempted to introduce anti-consumer measures in the past as mentioned in the Google Chrome section. --- -Without signing into a Google Account, the open-source builds of **Chromium** do relatively well in terms of security and privacy. However, Chromium still does have a number of integrations with Google hardcoded into the source, and because it is designed to be as user-friendly as possible, it operates in a way that compromises transparency and user-control. And, Chromium is still directly developed by Google, who have attempted to introduce anti-consumer measures in the past as mentioned in the Google Chrome section. diff --git a/collections/_browsers/firefox.html b/collections/_browsers/firefox.html index 6be93d6a..7931f6d7 100644 --- a/collections/_browsers/firefox.html +++ b/collections/_browsers/firefox.html @@ -1,8 +1,11 @@ --- -name: Firefox +title: Firefox type: Recommendation logo: /assets/img/browsers/firefox-logo.svg -short: "**Firefox** is a fast, reliable, open-source, privacy-respecting browser developed by Mozilla. Unlike Google Chrome, Firefox won’t track your data and send it to various companies. Firefox also allows you to simply install a number of add-ons that will improve your privacy online." +description: | + Firefox is a fast, reliable, open-source, privacy-respecting browser developed by Mozilla. + + Unlike Google Chrome, Firefox won’t track your data and send it to various companies. Firefox also allows you to simply install a number of add-ons that will improve your privacy online. website: 'https://firefox.com/' privacy_policy: 'https://www.mozilla.org/en-US/privacy/firefox/' platform_win: 'https://www.mozilla.org/firefox/windows/' @@ -16,19 +19,6 @@ source: 'https://hg.mozilla.org/mozilla-central/' order: 1 --- -
-
- {{ page.name }} logo -
-
-

Firefox is a fast, reliable, open-source, privacy-respecting browser developed by Mozilla.

-

Unlike Google Chrome, Firefox won’t track your data and send it to various companies. Firefox also allows you to simply install a number of add-ons that will improve your privacy online.

- Visit {{ page.website | remove:'https://' | split:'/' | first }} -
-
- -{% include downloads.html %} -

Source Code

Mozilla publishes the source code for the Firefox browser at {{ page.source }}.

diff --git a/collections/_browsers/google-chrome.md b/collections/_browsers/google-chrome.md index 53225942..6aac6752 100644 --- a/collections/_browsers/google-chrome.md +++ b/collections/_browsers/google-chrome.md @@ -1,5 +1,7 @@ --- -name: Google Chrome +title: Google Chrome type: "Anti-Recommendation" +description: | + Chrome is completely controlled by Google, and taps into your browsing history to track you across the web and serve you targeted advertisements. Because of Google's interest in increased ad revenues, Google Chrome offers [no privacy protections](https://www.washingtonpost.com/technology/2019/06/21/google-chrome-has-become-surveillance-software-its-time-switch/) out of the box compared to Firefox, and has taken anti-consumer steps to [block common extensions like adblockers](https://www.wired.com/story/google-chrome-ad-blockers-extensions-api/). It's best to avoid this browser at all costs. + --- -**Google Chrome** is completely controlled by Google, and taps into your browsing history to track you across the web and serve you targeted advertisements. Because of Google's interest in increased ad revenues, Google Chrome offers [no privacy protections](https://www.washingtonpost.com/technology/2019/06/21/google-chrome-has-become-surveillance-software-its-time-switch/) out of the box compared to Firefox, and has taken anti-consumer steps to [block common extensions like adblockers](https://www.wired.com/story/google-chrome-ad-blockers-extensions-api/). It's best to avoid this browser at all costs. diff --git a/collections/_browsers/safari.md b/collections/_browsers/safari.md index 0bd18a64..c9104074 100644 --- a/collections/_browsers/safari.md +++ b/collections/_browsers/safari.md @@ -1,5 +1,6 @@ --- -name: Safari +title: Safari type: Worth Mentioning +description: | + A browser option on macOS and iOS with a strong focus on security and [privacy](https://www.apple.com/safari/docs/Safari_White_Paper_Nov_2019.pdf). We believe Safari is an acceptable choice for Apple users, despite Safari being a proprietary browser, because Apple users are already trusting a proprietary operating system to run their programs on. We do not recommend using iCloud Sync, which saves your bookmarks and history in a way which allows Apple to view them. Additionally, [WebKit](https://webkit.org), the browser engine powering Safari *is* open source. --- -[**Safari**](https://www.apple.com/safari/) is a browser option on macOS and iOS, with a strong focus on security and [privacy](https://www.apple.com/safari/docs/Safari_White_Paper_Nov_2019.pdf). We believe Safari is an acceptable choice for Apple users, despite Safari being a proprietary browser, because Apple users are already trusting a proprietary operating system to run their programs on. We do not recommend using iCloud Sync, which saves your bookmarks and history in a way which allows Apple to view them. Additionally, [WebKit](https://webkit.org), the browser engine powering Safari *is* open source. diff --git a/collections/_browsers/tor-browser.md b/collections/_browsers/tor-browser.md index 3eebbb2c..a8f718c7 100644 --- a/collections/_browsers/tor-browser.md +++ b/collections/_browsers/tor-browser.md @@ -1,9 +1,10 @@ --- -name: Tor Browser +title: Tor Browser type: Recommendation info: Provides Anonymity logo: /assets/img/browsers/tor-logo.svg -short: "**Tor Browser** is your choice if you need an extra layer of anonymity. It’s a modified version of Firefox ESR, which comes with pre-installed privacy add-ons, encryption, and an advanced proxy. [How does Tor work?](https://write.privacytools.io/my-thoughts-on-security/slicing-onions-part-1-myth-busting-tor)" +description: | + The choice if you need an extra layer of anonymity. Tor Browser is a modified version of Firefox ESR, which comes with pre-installed privacy add-ons, encryption, and an advanced proxy. website: 'https://www.torproject.org/' website_tor: 'http://expyuzz4wqqyqhjn.onion/' privacy_policy: 'https://support.torproject.org/tbb/tbb-3/' @@ -15,6 +16,3 @@ platform_fdroid: 'https://guardianproject.info/fdroid/' source: 'https://trac.torproject.org/projects/tor' order: 2 --- -Tor Browser is your choice if you need an extra layer of anonymity. It's a modified version of Firefox ESR, which comes with pre-installed privacy add-ons, encryption, and an advanced proxy. [How does Tor work?](https://write.privacytools.io/my-thoughts-on-security/slicing-onions-part-1-myth-busting-tor) - -{% include downloads.html %} diff --git a/collections/_browsers/ungoogled-chromium.md b/collections/_browsers/ungoogled-chromium.md index 040f0951..576d1584 100644 --- a/collections/_browsers/ungoogled-chromium.md +++ b/collections/_browsers/ungoogled-chromium.md @@ -1,5 +1,6 @@ --- -name: Ungoogled Chromium +title: Ungoogled Chromium type: Worth Mentioning +description: | + A desktop browser based on Chromium which removes all Google integrations, while adding features which seek to enhance your security, privacy, and control of your browser. However, we do not strongly recommend the use of Ungoogled Chromium for most users at this time, because of a lack of official builds and updates from the developer. We strongly believe that auto-updating apps are key for maintaining security, lest you browse the web with outdated builds of your browser which may be susceptible to any number of live exploits. --- -[**Ungoogled Chromium**](https://github.com/Eloston/ungoogled-chromium) is a desktop browser based on Chromium, which removes all Google integrations while adding features which seek to enhance your security, privacy, and control of your browser. However, we do not strongly recommend the use of Ungoogled Chromium for most users at this time, because of a lack of official builds and updates from the developer. We strongly believe that auto-updating apps are key for maintaining security, lest you browse the web with outdated builds of your browser which may be susceptible to any number of live exploits. diff --git a/collections/_evergreen/browsers.html b/collections/_evergreen/browsers.html index 72eb5f3e..2ebeaaaa 100644 --- a/collections/_evergreen/browsers.html +++ b/collections/_evergreen/browsers.html @@ -4,46 +4,46 @@ title: Browser Recommendations description: "These are our current web browser recommendations, settings, and add-ons you can use to preserve your privacy." --- -{% assign browser = site.browsers | where:"name","Firefox" %} +{% assign browser = site.browsers | where:"title","Firefox" %} {% for post in browser %} {% include recommendation-card.html %} {% endfor %} -{% assign browser = site.browsers | where:"name","Tor Browser" %} +{% assign browser = site.browsers | where:"title","Tor Browser" %} {% for post in browser %} {% include recommendation-card.html %} {% endfor %}

Worth Mentioning

-{% assign browser = site.browsers | where:"name","Ungoogled Chromium" %} +{% assign browser = site.browsers | where:"title","Ungoogled Chromium" %} {% for post in browser %} {% include worth-mentioning.html %} {% endfor %} -{% assign browser = site.browsers | where:"name","Safari" %} +{% assign browser = site.browsers | where:"title","Safari" %} {% for post in browser %} {% include worth-mentioning.html %} {% endfor %} -{% assign browser = site.browsers | where:"name","Bromite" %} +{% assign browser = site.browsers | where:"title","Bromite" %} {% for post in browser %} {% include worth-mentioning.html %} {% endfor %}

Anti-Recommendations

-{% assign browser = site.browsers | where:"name","Google Chrome" %} +{% assign browser = site.browsers | where:"title","Google Chrome" %} {% for post in browser %} {% include anti-recommendation.html %} {% endfor %} -{% assign browser = site.browsers | where:"name","Brave Browser" %} +{% assign browser = site.browsers | where:"title","Brave Browser" %} {% for post in browser %} {% include anti-recommendation.html %} {% endfor %} -{% assign browser = site.browsers | where:"name","Chromium" %} +{% assign browser = site.browsers | where:"title","Chromium" %} {% for post in browser %} {% include anti-recommendation.html %} {% endfor %} diff --git a/index.html b/index.html index cea2bbb2..b2028f8a 100644 --- a/index.html +++ b/index.html @@ -53,45 +53,47 @@ layout: default

The devices, software, and services that will protect your privacy highly depend on your use case, workflow, and threat model. But, if you don't know where to get started, we've chosen some recommended tools to get you going :)

-
- -
-
- -

Browsers

+
- diff --git a/package.json b/package.json index 60b93995..f50ea20e 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,7 @@ "assets:copy:icons": "mkdir -p assets/fonts/vendor/fontawesome && cp -a \"node_modules/@fortawesome/fontawesome-pro/.\" assets/fonts/vendor/fontawesome/", "assets:install": "npm run assets:copy:js && npm run assets:copy:icons", "build": "npm run assets:install && bundle exec jekyll build", - "serve": "npm run assets:install && bundle exec jekyll serve --incremental --livereload" + "serve": "npm run assets:install && bundle exec jekyll serve --livereload" }, "repository": { "type": "git",