diff --git a/_data/nav/2_providers.yml b/_data/nav/2_providers.yml index fbc1d854..f33fbed3 100644 --- a/_data/nav/2_providers.yml +++ b/_data/nav/2_providers.yml @@ -13,10 +13,6 @@ items: title: Email Providers icon: fad fa-envelope file: legacy_pages/providers/email.html - - type: link - title: Web Hosting - icon: fad fa-hdd - file: legacy_pages/providers/hosting.html - type: link title: Pastebins icon: fad fa-clipboard diff --git a/_includes/legacy/sections/cloud-storage.html b/_includes/legacy/sections/cloud-storage.html index cee77c02..a4c17ff1 100644 --- a/_includes/legacy/sections/cloud-storage.html +++ b/_includes/legacy/sections/cloud-storage.html @@ -7,7 +7,7 @@ {% include legacy/cardv2.html title="Nextcloud - Choose your hoster" image="/assets/img/legacy_svg/3rd-party/nextcloud.svg" - description="Nextcloud 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="Nextcloud 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." website="https://nextcloud.com/" privacy-policy="https://nextcloud.com/privacy/" windows="https://nextcloud.com/install/#install-clients" diff --git a/_includes/legacy/sections/hosting-provider.html b/_includes/legacy/sections/hosting-provider.html deleted file mode 100644 index 830f13ed..00000000 --- a/_includes/legacy/sections/hosting-provider.html +++ /dev/null @@ -1,20 +0,0 @@ -

Secure Hosting Provider

- -{% include legacy/cardv2.html - title="Data Center: Bahnhof" - image="/assets/img/legacy_svg/3rd-party/bahnhof.svg" - image-dark="/assets/img/legacy_svg/3rd-party/bahnhof-dark.svg" - description="Bahnhof is one of Sweden’s largest network operators, founded in 1994. They specialize in innovative data center construction: Extreme security coupled with low-cost green energy has made them world famous." - website="https://www.bahnhof.net/" - privacy-policy="https://bahnhof.se/filestorage/userfiles/file/PrivacyPolicy_Bahnhof.pdf" -%} - -{% include legacy/cardv2.html - title="VPS & Domain: Njalla" - image="/assets/img/legacy_svg/3rd-party/njalla.svg" - image-dark="/assets/img/legacy_svg/3rd-party/njalla-dark.svg" - description="Njalla is a privacy-aware domain registration service and VPS provider based in Nevis (with VPS data centers in Sweden). It is created by people from The Pirate Bay and the now merged IPredator VPN. Accepted payments: Bitcoin, Litecoin, Monero, Zcash, DASH, Ethereum, Bitcoin Cash and PayPal." - website="https://njal.la/" - labels="color==warning::link==https://github.com/privacytools/privacytools.io/issues/1920::text==Warning::tooltip==Njalla blocks port 25 traffic." - tor="http://njallalafimoej5i4eg7vlnqjvmb6zhdh27qxcatdn647jtwwwui3nad.onion/" -%} diff --git a/collections/_posts/2019-08-22-self-hosting-shadowsocks-vpn-outline.md b/collections/_posts/2019-08-22-self-hosting-shadowsocks-vpn-outline.md index 55ad9742..14b1b9fd 100644 --- a/collections/_posts/2019-08-22-self-hosting-shadowsocks-vpn-outline.md +++ b/collections/_posts/2019-08-22-self-hosting-shadowsocks-vpn-outline.md @@ -33,7 +33,7 @@ Note: getoutline.org is blocked in China and likely other countries, however you Outline has the ability to create servers on three different providers automatically: DigitalOcean, Google Cloud, and Amazon Web Services. In some situations, Google Cloud or AWS may be preferable, because they are less likely to be blocked by hostile ISPs/governments and will therefore allow you to more likely circumvent internet censorship. However, keep in mind that the server provider you choose—like any VPN provider—will have the technical ability to read your internet traffic. This is much less likely to happen when using a cloud provider versus a commercial VPN, which is why we recommend self-hosting, but it is still possible. Choose a provider you trust. -Additionally, keep in mind that many US-based cloud providers block all network traffic to and from [countries sanctioned by the United States](https://en.wikipedia.org/wiki/United_States_sanctions#Countries), including AWS and Google Cloud. Users in or visiting those countries may wish to find a European-based [hosting provider]({% link legacy_pages/providers/hosting.html %}) to run their Outline Server on. +Additionally, keep in mind that many US-based cloud providers block all network traffic to and from [countries sanctioned by the United States](https://en.wikipedia.org/wiki/United_States_sanctions#Countries), including AWS and Google Cloud. Users in or visiting those countries may wish to find a European-based hosting provider to run their Outline Server on. Another factor to consider is your provider’s network and latency. Choosing a server closer to you (geographically speaking) will give you better latency, and choosing a server with good bandwidth (>1 Gbps) will minimize the performance hit when using the VPN. Both factors are important to keeping a good browsing experience, but keep in mind using _any_ VPN will always be slower than just your plain old internet connection. diff --git a/legacy_pages/providers.html b/legacy_pages/providers.html index ce55396a..42ff5b83 100644 --- a/legacy_pages/providers.html +++ b/legacy_pages/providers.html @@ -10,7 +10,6 @@ description: "There's a ton of people providing services online. Discover which
  • Cloud Storage
  • DNS
  • Email
  • -
  • Hosting
  • Pastebins
  • Search Engines
  • Social Networks
  • diff --git a/legacy_pages/providers/hosting.html b/legacy_pages/providers/hosting.html deleted file mode 100644 index aa09ab94..00000000 --- a/legacy_pages/providers/hosting.html +++ /dev/null @@ -1,8 +0,0 @@ ---- -layout: page -permalink: /providers/hosting/ -title: "Web Hosting" -description: "Find a web hosting provider that won't track your visitors or give into government data requests." ---- - -{% include legacy/sections/hosting-provider.html %}