Moving the cloud section (#284)

_data/nav/2_providers.yml

@@ -1,6 +1,10 @@
 type: dropdown
 title: Providers
 items:
+  - type: link
+    title: Cloud Storage
+    icon: fad fa-laptop-house
+    file: legacy_pages/providers/cloud.html
   - type: link
     title: DNS Servers
     icon: fad fa-map-signs
@@ -9,10 +13,6 @@ items:
     title: Email Providers
     icon: fad fa-envelope
     file: legacy_pages/providers/email.html
-  - type: link
-    title: Pastebins
-    icon: fad fa-clipboard
-    file: legacy_pages/providers/paste.html
   - type: link
     title: Search Engines
     icon: fad fa-search-location

_data/nav/3_software.yml

@@ -52,7 +52,3 @@ items:
     title: Self-Contained Networks
     icon: fad fa-chart-network
     file: legacy_pages/software/networks.html
-  - type: link
-    title: Self-Hosted Cloud Servers
-    icon: fad fa-laptop-house
-    file: legacy_pages/software/cloud.html

_includes/legacy/sections/cloud.html

@@ -1,13 +1,7 @@
-<h2 id="mycloud" class="anchor"><a href="#mycloud"><i class="fas fa-link anchor-icon"></i></a> Self-Hosted Cloud Server Software</h2>
-
-<div class="alert alert-warning" role="alert">
-  <strong>If you are currently using a Cloud Storage Services like Dropbox, Google Drive, Microsoft OneDrive or Apple iCloud, you should think about hosting it on your own.</strong>
-</div>
-
 {% include legacy/cardv2.html
   title="Nextcloud"
   image="/assets/img/legacy_svg/3rd-party/nextcloud.svg"
-  description="<strong>Nextcloud</strong> is a suite of free and open-source client-server software for creating your own file hosting services on a private server you control. The only limits on storage and bandwidth are the limits on the server provider you choose."
+  description="<strong>Nextcloud</strong> is a suite of free and open-source client-server software for creating your own file hosting services on a private server you control. It also comes with experimental <strong>zero trust</strong> end-to-end encryption. The only limits on storage and bandwidth are the limits on the server provider you choose."
   website="https://nextcloud.com/"
   privacy-policy="https://nextcloud.com/privacy/"
   windows="https://nextcloud.com/install/#install-clients"
@@ -27,7 +21,7 @@
   image="/assets/img/legacy_svg/3rd-party/tahoe-lafs.svg"
   image-dark="/assets/img/legacy_svg/3rd-party/tahoe-lafs-dark.svg"
   website="https://www.tahoe-lafs.org/"
-  description="Tahoe-LAFS is a free and open decentralized cloud storage system. It distributes your data across multiple servers. Even if some of the servers fail or are taken over by an attacker, the entire file store continues to function correctly, preserving your privacy and security."
+  description="Tahoe-LAFS is a free and open decentralized cloud storage system. It distributes your data across multiple servers. Even if some of the servers fail or are taken over by an attacker, the entire file store continues to function correctly, preserving your privacy and security. The servers used as storage pools do not have access to your data."
   windows="https://github.com/tahoe-lafs/tahoe-lafs#via-pip"
   mac="https://github.com/tahoe-lafs/tahoe-lafs#via-pip"
   linux="https://github.com/tahoe-lafs/tahoe-lafs#using-os-packages"
@@ -35,7 +29,12 @@
   git="https://www.tahoe-lafs.org/trac/tahoe-lafs/browser"
 %}
 
-<h3>Worth Mentioning</h3>
+{% include legacy/cardv2.html
-<ul>
+  title="Proton Drive"
-  <li><a href="https://github.com/xwiki-labs/cryptpad/">CryptPad</a> - An open-source and end-to-end encrypted real-time collaborative editor that lets you share folders, media, and documents.</li>
+  image="/assets/img/legacy_svg/3rd-party/protondrive.svg"
-</ul>
+  description="<strong>Proton Drive</strong> is an end-to-end encrypted general file storage service by ProtonMail. It is currently in beta and only is only available through a web client. As such, it is reliant on JavaScript to handle encryption, and you must trust ProtonMail to not inject any malicious JavaScript to get your private key. Consider using a different service if this does not fit your threat model."
+  website="https://protonmail.com/blog/proton-drive-early-access/"
+  privacy-policy="https://protonmail.com/privacy-policy"
+  github="https://github.com/ProtonMail/proton-drive"
+  web="https://protonmail.com/"
+%}

_includes/legacy/sections/paste-services.html

@@ -1,19 +0,0 @@
-<h2 id="paste" class="anchor"><a href="#paste"><i class="fas fa-link anchor-icon"></i></a> Pastebin Services</h2>
-
-{% include legacy/cardv2.html
-title="PrivateBin"
-image="/assets/img/legacy_svg/3rd-party/privatebin.svg"
-description="PrivateBin is a minimalist, open-source online pastebin where the server has zero knowledge of pasted data. Data is encrypted/decrypted in the browser using 256-bit AES. It is the improved version of ZeroBin."
-website="https://privatebin.info/"
-github="https://github.com/PrivateBin/PrivateBin"
-%}
-
-
-{% include legacy/cardv2.html
-title="CryptPad"
-image="/assets/img/legacy_svg/3rd-party/cryptpad.svg"
-description="CryptPad is an open-source, zero knowledge, and real-time collaborative editor. Data is encrypted/decrypted in the browser, using Salsa20 with Poly1305 to encrypt pads."
-website="https://cryptpad.fr/pad/"
-privacy-policy="https://cryptpad.fr/pad/#/2/pad/view/GcNjAWmK6YDB3EO2IipRZ0fUe89j43Ryqeb4fjkjehE/"
-github="https://github.com/xwiki-labs/cryptpad"
-%}

_includes/legacy/sections/productivity-tools.html

@@ -1,10 +1,18 @@
 <h2 id="productivity" class="anchor"><a href="#productivity"><i class="fas fa-link anchor-icon"></i></a> Productivity Tools</h2>
 
+{% include legacy/cardv2.html
+  title="PrivateBin"
+  image="/assets/img/legacy_svg/3rd-party/privatebin.svg"
+  description="<strong>PrivateBin</strong> is a minimalist, open-source online pastebin where the server has zero knowledge of pasted data. Data is encrypted/decrypted in the browser using 256-bit AES. It is the improved version of ZeroBin. Do note that it uses JavaScript to handle encryption, so you must trust the provider to the extent that they do not inject any malicious JavaScript to get your private key. Consider self-hosting to mitigate this threat."
+  website="https://privatebin.info/"
+  github="https://github.com/PrivateBin/PrivateBin"
+%}
+
 {%
   include legacy/cardv2.html
   title="CryptPad"
   image="/assets/img/legacy_svg/3rd-party/cryptpad.svg"
-  description="<strong>CryptPad</strong> is a private-by-design alternative to popular office tools and cloud services. All content is end-to-end encrypted. It is free and open-source, enabling anyone to verify its security by auditing the code. The development team is supported by donations and grants. No registration is required, and it can be used anonymously via Tor Browser."
+  description="<strong>CryptPad</strong> is a private-by-design alternative to popular office tools. All content is end-to-end encrypted. Do note that it uses JavaScript to handle encryption, so you must trust the provider to the extent that they do not inject any malicious JavaScript to get your private key. Consider self-hosting to mitigate this threat."
   website="https://cryptpad.fr/"
   privacy-policy="https://cryptpad.fr/pad/#/2/pad/view/GcNjAWmK6YDB3EO2IipRZ0fUe89j43Ryqeb4fjkjehE/"
   github="https://github.com/xwiki-labs/cryptpad"
@@ -15,7 +23,7 @@
   include legacy/cardv2.html
   title="Etherpad"
   image="/assets/img/legacy_svg/3rd-party/etherpad.svg"
-  description="<strong>Etherpad</strong> is a highly customizable open-source online editor providing collaborative editing in real time. <a href=https://github.com/ether/etherpad-lite/wiki/Sites-that-run-Etherpad>Here are a list of sites that run Etherpad</a>."
+  description="<strong>Etherpad</strong> is a highly customizable open-source online editor providing collaborative editing in real time. Do note that there is no end to end encryption whatsoever. You should self-host Etherpad and set up proper authentication for any expectation of privacy."
   website="https://etherpad.org/"
   github="https://github.com/ether/etherpad-lite"
   web="https://github.com/ether/etherpad-lite/wiki/Sites-that-run-Etherpad"
@@ -50,8 +58,6 @@
 
 <ul>
   <li><a href="https://crypt.ee/">Cryptee</a> - Free privacy-friendly service for storing Documents, files and Photos</li>
-  <li><a href="https://ethercalc.net/">EtherCalc</a> - EtherCalc is a web spreadsheet. Data is saved on the web, and people can edit the same document at the same time. Changes are instantly reflected on all screens. Work together on inventories, survey forms, list management, brainstorming sessions.</li>
-  <li><a href="https://disroot.org/">Disroot</a> - Free privacy-friendly service that offers Etherpad, EtherCalc and PrivateBin.</li>
   <li><a href="https://dudle.inf.tu-dresden.de/anonymous/">dudle</a> - An online scheduling application, free and open-source. Schedule meetings or make small online polls. No email collection or the need of registration.</li>
   <li><a href="https://framadate.org/">Framadate</a> - A free and open-source online service for planning an appointment or making a decision quickly and easily. No registration is required.</li>
   <li><a href="https://www.libreoffice.org/">LibreOffice</a> - Free and open-source office suite.</li>

assets/img/legacy_svg/3rd-party/protondrive.svg

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="128" height="128" version="1.1" viewBox="0 0 33.867 33.867" xmlns="http://www.w3.org/2000/svg"><g transform="matrix(.99999 0 0 .99999 -10.524 -177.41)"><rect x="10.524" y="177.41" width="33.867" height="33.867" fill="#7393f3" stroke-width=".72366"/><g transform="matrix(.67733 0 0 .67733 10.524 177.41)" fill="#fff"><path transform="scale(1,-1)" x="11.755644" y="-31.042255" width="26.488712" height="12.08451" d="m17.756-31.042h14.489a6 6 45 0 1 6 6v0.08451a6 6 135 0 1-6 6h-14.489a6 6 45 0 1-6-6v-0.08451a6 6 135 0 1 6-6z" stroke-width=".29286"/><ellipse cx="25" cy="19.481" rx="7.3432" ry="5.1293" stroke-width=".20012"/></g><g transform="matrix(.67733 0 0 .67733 10.524 177.41)"><rect x="25.268" y="26.26" width="2.0174" height="3.6711" fill="#fff" stroke-width=".26458"/><rect x="21.5" y="27.245" width="7" height="3.8666" fill="#7393f3" stroke-width=".26344"/><path transform="matrix(.36886 0 0 .21296 -3.9552 7.8648)" d="m92.055 93.076h-27.11l13.555-23.479 6.7777 11.739z" fill="#7393f3"/></g><g transform="matrix(.67733 0 0 .68255 6.7598 173.7)"><g transform="matrix(1,0,0,-1,6.3485,69.902)" fill="#fff"><rect x="20.709" y="29.099" width="7" height="4.5682" stroke-width=".28635"/><path transform="matrix(.36886 0 0 .21296 -4.7458 9.7194)" d="m92.055 93.076h-27.11l13.555-23.479 6.7777 11.739z"/></g></g></g></svg>

legacy_pages/providers.html

@@ -9,7 +9,6 @@ description: "There's a ton of people providing services online. Discover which
   <ul class="list-group list-group-flush">
     <li class="list-group-item"><a href="/providers/dns/"><span class="fa fa-tasks fa-fw"></span> DNS</a></li>
     <li class="list-group-item"><a href="/providers/email/"><span class="fas fa-mail-bulk fa-fw"></span> Email</a></li>
-    <li class="list-group-item"><a href="/providers/paste/"><span class="fas fa-paste fa-fw"></span> Pastebins</a></li>
     <li class="list-group-item"><a href="/providers/search-engines/"><i class="fas fa-search fa-fw"></i> Search Engines</a></li>
     <li class="list-group-item"><a href="/providers/social-networks/"><span class="fas fa-expand-arrows-alt fa-fw"></span> Social Networks</a></li>
     <li class="list-group-item"><a href="/providers/social-news-aggregator/"><span class="far fa-newspaper fa-fw"></span> Social News Aggregators</a></li>

legacy_pages/providers/cloud.html

@@ -0,0 +1,8 @@
+---
+layout: page
+permalink: /software/cloud/
+title: "Cloud Storage"
+description: "If you are currently using a Cloud Storage Services like Dropbox, Google Drive, Microsoft OneDrive or Apple iCloud, you are putting complete trust in your service provider to not look at your files. Consider using an alternative below to remove the need for that trust."
+---
+
+{% include legacy/sections/cloud.html %}

legacy_pages/providers/paste.html

@@ -1,8 +0,0 @@
----
-layout: page
-permalink: /providers/paste/
-title: "Pastebin hosting services"
-description: "Find a pastebin provider that won't read your content to share sensitive code or other information."
----
-
-{% include legacy/sections/paste-services.html %}

legacy_pages/software/cloud.html

@@ -1,8 +0,0 @@
----
-layout: page
-permalink: /software/cloud/
-title: "Self Hosted \"Cloud\""
-description: "Discover how to securely and privately self-host your cloud with open-source software."
----
-
-{% include legacy/sections/selfhosted-cloud.html %}