diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 5b16ecc8..cecbaf14 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1,11 +1,3 @@ -# Administration Related Files -/.well-known/ @JonahAragon -/404.html @JonahAragon -/.github/ @JonahAragon @BurungHantu1605 -/LICENSE.txt @JonahAragon @BurungHantu1605 -/.travis.yml @Shifterovich -/CNAME @JonahAragon - # Editorial Team *.md @privacytoolsIO/editorial /assets/ @privacytoolsIO/editorial @@ -13,5 +5,13 @@ /_includes/sections/ @privacytoolsIO/editorial /index.html @privacytoolsIO/editorial +# Administration Related Files /donate.html @JonahAragon @BurungHantu1605 /assets/js/redirects.js @JonahAragon +/.well-known/ @JonahAragon +/404.html @JonahAragon +/.github/ @JonahAragon @BurungHantu1605 +/LICENSE.txt @JonahAragon @BurungHantu1605 +/.travis.yml @JonahAragon @Shifterovich @nitrohorse +/CNAME @JonahAragon +/nginx/ @JonahAragon diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index ee30fb33..26e4161f 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -24,9 +24,17 @@ We're trying to keep it simple and promote the best tools, not all of them. There can be exceptions if no software is available that meet the criteria. Note: This criteria applies to all of privacytools.io -### Proividers +### Providers - Prioritize Products by privacy respecting nationality. +### DNS + +- supports DoH or DoT (We love DNSCrypt, but there is already https://github.com/DNSCrypt/dnscrypt-resolvers which is directly supported by dnscrypt-proxy, so we don't consider useful to list providers only supporting it). +- supports DNSSEC (https://dnssec.vs.uni-due.de/ can test your current DNS provider). +- doesn't log IP addresses during normal operation (If your suggestion logs, please compare its privacy policy with other servers on our table that keep logs). +- preferably supports QNAME minimization (if you have access to the dig command, `dig +short txt qnamemintest.internet.nl`) + + ### VPN - Prioritize Products by privacy respecting nationality. - Cannot be based in USA or UK. diff --git a/_includes/cardv2.html b/_includes/cardv2.html index 86f6e3f0..3e8e590a 100644 --- a/_includes/cardv2.html +++ b/_includes/cardv2.html @@ -1,11 +1,47 @@
-

{{include.title}}

+

+ {% if include.badges %} + {{include.title}} + {% assign badges = include.badges | replace:", ", "," | split:"," %} + {% for badge in badges %} + {% assign badge_data = badge | split:":" %} + {% assign color = badge_data[0] %} + {% assign text = badge_data[1] %} + {% assign tooltip = badge_data[2] | default: false %} + {% assign help_icon = '' %} + {{text}} {{ help_icon + }} + {% else %} + >{{text}} + {% endif %} + + {% endfor %} + {% else %} + {{include.title}} + {% endif %} +

{{include.title}} {{include.description}} + {% if include.labels %} + {% assign labels = include.labels | replace:", ", "," | split:"," %} + {% for label in labels %} + {% assign label_data = label | split:":" %} + {% assign color = label_data[0] %} + {% assign text = label_data[1] %} + {% assign tooltip = label_data[2] | default: false %} + {% assign help_icon = '' %} + {{text}} {{ help_icon + }} + {% else %} + >{{text}} + {% endif %} + + {% endfor %} + {% endif %}

@@ -19,22 +55,22 @@
- {% if include.windows %}{% endif %} - {% if include.mac %}{% endif %} - {% if include.linux %}{% endif %} - {% if include.bsd %}{% endif %} + {% if include.windows %}{% if include.windows != "" %}{% else %}{% endif %}{% endif %} + {% if include.mac %}{% if include.mac != "" %}{% else %}{% endif %}{% endif %} + {% if include.linux %}{% if include.linux != "" %}{% else %}{% endif %}{% endif %} + {% if include.bsd %}{% if include.bsd != "" %}{% else %}{% endif %}{% endif %} - {% if include.firefox %}{% endif %} - {% if include.chrome %}{% endif %} - {% if include.safari %}{% endif %} - {% if include.opera %}{% endif %} - {% if include.edge %}{% endif %} + {% if include.firefox %}{% if include.firefox != "" %}{% else %}{% endif %}{% endif %} + {% if include.chrome %}{% if include.chrome != "" %}{% else %}{% endif %}{% endif %} + {% if include.safari %}{% if include.safari != "" %}{% else %}{% endif %}{% endif %} + {% if include.opera %}{% if include.opera != "" %}{% else %}{% endif %}{% endif %} + {% if include.edge %}{% if include.edge != "" %}{% else %}{% endif %}{% endif %} - {% if include.android %}{% endif %} - {% if include.ios %}{% endif %} - {% if include.fire %}{% endif %} + {% if include.android %}{% if include.android != "" %}{% else %}{% endif %}{% endif %} + {% if include.ios %}{% if include.ios != "" %}{% else %}{% endif %}{% endif %} + {% if include.fire %}{% if include.fire != "" %}{% else %}{% endif %}{% endif %} - {% if include.web %}{% endif %} + {% if include.web %}{% if include.web != "" %}{% else %}{% endif %}{% endif %} {{include.icon1}} {{include.icon2}} diff --git a/_includes/nav.html b/_includes/nav.html index 0d8b8803..17115cc1 100644 --- a/_includes/nav.html +++ b/_includes/nav.html @@ -31,11 +31,11 @@ Browser
- Fingerprint - Firefox Privacy Add-ons - Privacy Related Tweaks - Recommendation - WebRTC IP Leak + Recommendations + Fingerprinting Info + WebRTC IP Leak Test + Browser Add-ons + Firefox Tweaks
  • @@ -49,13 +49,12 @@ Email Clients File Encryption File Sharing - Instant Messenger Password Manager Productivity Tools + Real-Time Communication Secure File Sync Self-contained Networks Self-Hosted Cloud Server - Video & Voice Messenger
  • @@ -63,12 +62,12 @@ OS
    + PC OS Recommendations + Live CD Operating Systems + Mobile Operating Systems Android Privacy Add-ons - Don't use Windows 10 - Live CD OS - Mobile OS - PC OS Router Firmware + Don't use Windows 10
  • diff --git a/_includes/sections/android-addons.html b/_includes/sections/android-addons.html index d203ffa6..1779258a 100644 --- a/_includes/sections/android-addons.html +++ b/_includes/sections/android-addons.html @@ -36,21 +36,4 @@
    • -
    - - - -
    -
    -
    - XPrivacyLua -
    -
    -

    Manage your apps' permissions with XPrivacyLua

    -

    Revoking Android permissions from apps often let apps crash or malfunction. XPrivacyLua solves this by feeding apps fake data instead of real data.

    -

    Requirements: Magisk (xda-developers), Xposed Framework (xda-developers)

    -
    -
    \ No newline at end of file diff --git a/_includes/sections/browser-addons.html b/_includes/sections/browser-addons.html index 5e3f3d9f..7fb4028e 100644 --- a/_includes/sections/browser-addons.html +++ b/_includes/sections/browser-addons.html @@ -1,7 +1,7 @@ -

    Excellent Firefox Privacy Add-ons

    +

    Recommended Browser Add-ons

    diff --git a/_includes/sections/browser-recommendation.html b/_includes/sections/browser-recommendation.html index cf4195e3..32560d2e 100644 --- a/_includes/sections/browser-recommendation.html +++ b/_includes/sections/browser-recommendation.html @@ -1,4 +1,4 @@ -

    Browser Recommendation

    +

    Browser Recommendations

    {% include cardv2.html title="Mozilla Firefox" @@ -17,7 +17,7 @@ bsd="" %} {% include cardv2.html -title="Tor Browser - for anonymity" +title="Tor Browser - Provides Anonymity" image="/assets/img/tools/Tor-Browser.png" description='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?' website="https://www.torproject.org/" @@ -32,7 +32,7 @@ bsd="" %} {% include cardv2.html -title="Brave Browser - Complete but Experimental" +title="Brave Browser - Chromium Based" image="/assets/img/tools/Brave.png" description="The new open source browser Brave automatically blocks ads and trackers, making it faster and safer than your current browser. Brave is based on Chromium. experimental " website="https://brave.com/" diff --git a/_includes/sections/calendar-contacts-sync.html b/_includes/sections/calendar-contacts-sync.html index 6a4ff713..86523946 100644 --- a/_includes/sections/calendar-contacts-sync.html +++ b/_includes/sections/calendar-contacts-sync.html @@ -40,10 +40,6 @@ fruux - a unified contacts/calendaring system that works across platforms and devices. -
  • - Flock - a discontinued calendar and contacts sync service by Open Whisper Systems. Despite being shut down the source code is still available on GitHub. -
    • -
  • cloud backups - consider regularly exporting your calendar and or contacts and backing them up on a separate storage drive or uploading them to cloud storage (ideally after encrypting them).
    • diff --git a/_includes/sections/live-operating-systems.html b/_includes/sections/live-operating-systems.html index 80450669..5248e5c5 100644 --- a/_includes/sections/live-operating-systems.html +++ b/_includes/sections/live-operating-systems.html @@ -1,37 +1,38 @@

    Live CD Operating Systems

    -
    +{% include cardv2.html +title="Tails" +image="/assets/img/tools/Tails.png" +description='Tails is a live operating system, that starts on almost any computer from a DVD, USB stick, or SD card. It aims at preserving privacy and anonymity, and helps to: Use the Internet anonymously and circumvent censorship; Internet connections go through the Tor network; leave no trace on the computer; use state-of-the-art cryptographic tools to encrypt files, emails and instant messaging.' +badges="info:GNU/Linux" +labels="warning:contrib:This software may depend on or recommend non-free software." +website="https://tails.boum.org/" +git="https://git-tails.immerda.ch/tails/" +%} - {% include card.html color="success" - title="Tails" - labels="warning:contrib:This software may depend on or recommend non-free software." - image="/assets/img/tools/Tails.png" - url="https://tails.boum.org/" - description="Tails is a live operating system, that starts on almost any computer from a DVD, USB stick, or SD card. It aims at preserving privacy and anonymity, and helps to: Use the Internet anonymously and circumvent censorship; Internet connections go through the Tor network; leave no trace on the computer; use state-of-the-art cryptographic tools to encrypt files, emails and instant messaging." - %} +{% include cardv2.html +title="KNOPPIX" +image="/assets/img/tools/KNOPPIX.png" +description='Knoppix is an operating system based on Debian designed to be run directly from a CD / DVD (Live CD) or a USB flash drive (Live USB), one of the first of its kind for any operating system. When starting a program, it is loaded from the removable medium and decompressed into a RAM drive. The decompression is transparent and on-the-fly.' +badges="info:GNU/Linux" +labels="warning:contrib:This software may depend on or recommend non-free software." +website="https://www.knopper.net/knoppix/index-en.html" +source="https://www.knopper.net/knoppix-info/index-en.html" +%} - {% include card.html color="primary" - title="KNOPPIX" - labels="warning:contrib:This software may depend on or recommend non-free software." - image="/assets/img/tools/KNOPPIX.png" - url="https://www.knopper.net/knoppix/" - website="knopper.net" - description="Knoppix is an operating system based on Debian designed to be run directly from a CD / DVD (Live CD) or a USB flash drive (Live USB), one of the first of its kind for any operating system. When starting a program, it is loaded from the removable medium and decompressed into a RAM drive. The decompression is transparent and on-the-fly." - %} - - {% include card.html color="warning" - title="Puppy Linux" - labels="warning:contrib:This software may depend on or recommend non-free software." - image="/assets/img/tools/Puppy-Linux.png" - url="http://puppylinux.org/" - description="Puppy Linux operating system is a lightweight Linux distribution that focuses on ease of use and minimal memory footprint. The entire system can be run from RAM with current versions generally taking up about 210 MB, allowing the boot medium to be removed after the operating system has started." - %} - -
    +{% include cardv2.html +title="Puppy Linux" +image="/assets/img/tools/Puppy-Linux.png" +description='Puppy Linux operating system is a lightweight Linux distribution that focuses on ease of use and minimal memory footprint. The entire system can be run from RAM with current versions generally taking up about 210 MB, allowing the boot medium to be removed after the operating system has started.' +badges="info:GNU/Linux" +labels="warning:contrib:This software may depend on or recommend non-free software." +website="http://puppylinux.org/" +source="http://distro.ibiblio.org/puppylinux/" +%}

    Worth Mentioning

    diff --git a/_includes/sections/mobile-operating-systems.html b/_includes/sections/mobile-operating-systems.html index 3884ba7f..7c935c6f 100644 --- a/_includes/sections/mobile-operating-systems.html +++ b/_includes/sections/mobile-operating-systems.html @@ -4,38 +4,40 @@ Even though the source code of the following OS is provided, installing Google Apps may compromise your setup. -
    +{% include cardv2.html +title="GrapheneOS" +image="/assets/img/tools/GrapheneOS.png" +description='GrapheneOS (formerly known as CopperheadOS) is a free and open-source security and privacy focused mobile operating system built on top of the Android Open Source Project. It currently specifically targets devices offering strong hardware security.' +badges="info:AOSP" +labels="warning:contrib:This software may depend on or recommend non-free software." +website="https://grapheneos.org/" +github="https://github.com/GrapheneOS/" +%} - {% include card.html color="success" - title="LineageOS" - labels="warning:contrib:This software may depend on or recommend non-free software." - image="/assets/img/tools/LineageOS.png" - url="https://www.lineageos.org/" - description="LineageOS is a free and open-source operating system for smartphones and tablets, based on the official releases of the Android Open Source Project. It is the continuation of the CyanogenMod project." - %} +{% include cardv2.html +title="LineageOS" +image="/assets/img/tools/LineageOS.png" +description='LineageOS is a free and open-source operating system for smartphones and tablets, based on the official releases of the Android Open Source Project. It is the continuation of the CyanogenMod project.' +badges="info:AOSP" +labels="warning:contrib:This software may depend on or recommend non-free software." +website="https://www.lineageos.org/" +github="https://github.com/LineageOS" +%} - {% include card.html color="primary" - title="Ubuntu Touch" - labels="warning:contrib:This software may depend on or recommend non-free software." - image="/assets/img/tools/Ubuntu-Touch.png" - url="https://ubuntu-touch.io/" - description="Ubuntu Touch is a free and open-source operating system for smartphones and tablets. It's an alternative to the current popular mobile operating systems on the market. Only a few devices are supported." - %} - - {% include card.html color="warning" - title="GrapheneOS" - labels="warning:contrib:This software may depend on or recommend non-free software." - image="/assets/img/tools/GrapheneOS.png" - url="https://grapheneos.org/" - description="GrapheneOS is a free and open-source security and privacy focused mobile operating system built on top of the Android Open Source Project. It currently specifically targets devices offering strong hardware security." - %} - -
    +{% include cardv2.html +title="Ubuntu Touch" +image="/assets/img/tools/Ubuntu-Touch.png" +description="Ubuntu Touch is a free and open-source operating system for smartphones and tablets. It's an alternative to the current popular mobile operating systems on the market. Only a few devices are supported." +badges="info:GNU/Linux" +labels="warning:contrib:This software may depend on or recommend non-free software." +website="https://ubuntu-touch.io/" +github="https://github.com/ubports" +%}

    Worth Mentioning

    diff --git a/_includes/sections/notebooks.html b/_includes/sections/notebooks.html index bc6c04c8..1e0021a1 100644 --- a/_includes/sections/notebooks.html +++ b/_includes/sections/notebooks.html @@ -4,33 +4,46 @@ If you are currently using an application like Evernote, Google Keep or Microsoft OneNote you should pick an alternative here. -
    +{% include cardv2.html +title="Joplin" +image="/assets/img/tools/Joplin.png" +description="Joplin is a free, open source, fully featured note taking and to-do application, which can handle a large number of markdown notes organized into notebooks and tags. It offers E2EE encryption and can sync through Nextcloud, Dropbox and more. It also offers easy import from Evernote and plain text notes." +website="https://joplinapp.org/" +github="https://github.com/laurent22/joplin" +windows="" +mac="" +linux="" +ios="" +android="" +firefox="" +chrome="" +%} - {% include card.html color="success" - title="Joplin" - image="/assets/img/tools/Joplin.png" - url="https://joplinapp.org/" - footer="OS: Windows, macOS, Linux, iOS, Android, Firefox/Chrome (Web Clipper)." - description="Joplin is a free, open source, fully featured note taking and to-do application, which can handle a large number of markdown notes organized into notebooks and tags. It offers E2E encryption and can sync through Nextcloud, Dropbox and more. It also offers easy import from Evernote and plain text notes." - %} +{% include cardv2.html +title="Standard Notes" +image="/assets/img/tools/StandardNotes.png" +description="Standard Notes is a simple and private notes app that makes your notes easy and available everywhere you are. Features end-to-end encryption on every platform, and a powerful desktop experience with themes and custom editors." +website="https://standardnotes.org/" +github="https://github.com/standardnotes" +windows="" +mac="" +linux="" +ios="" +android="" +web="" +%} - {% include card.html color="primary" - title="Standard Notes" - image="/assets/img/tools/StandardNotes.png" - url="https://standardnotes.org/" - footer="OS: Windows, macOS, Linux, iOS, Android, Web." - description="Standard Notes is a simple and private notes app that makes your notes easy and available everywhere you are. Features end-to-end encryption on every platform, and a powerful desktop experience with themes and custom editors." - %} - - {% include card.html color="warning" - title="Turtl" - image="/assets/img/tools/Turtl.png" - url="https://turtlapp.com/" - footer="OS: Windows, macOS, Linux, Android." - description="Turtl lets you take notes, bookmark websites, and store documents for sensitive projects. From sharing passwords with your coworkers to tracking research on an article you're writing, Turtl keeps it all safe from everyone but you and those you share with." - %} - -
    +{% include cardv2.html +title="Turtl" +image="/assets/img/tools/Turtl.png" +description="Turtl lets you take notes, bookmark websites, and store documents for sensitive projects. From sharing passwords with your coworkers to tracking research on an article you're writing, Turtl keeps it all safe from everyone but you and those you share with." +website="https://turtlapp.com/" +github="https://github.com/turtl" +windows="" +mac="" +linux="" +android="" +%}

    Warning

    diff --git a/_includes/sections/operating-systems.html b/_includes/sections/operating-systems.html index 189af833..1f1b66fc 100644 --- a/_includes/sections/operating-systems.html +++ b/_includes/sections/operating-systems.html @@ -1,36 +1,38 @@

    PC Operating Systems

    -
    +{% include cardv2.html +title="Qubes OS" +image="/assets/img/tools/Qubes-OS.png" +description='Qubes is an open-source operating system designed to provide strong security for desktop computing. Qubes is based on Xen, the X Window System, and Linux, and can run most Linux applications and utilize most of the Linux drivers.' +badges="info:Xen" +labels="warning:contrib:This software may depend on or recommend non-free software." +website="https://www.qubes-os.org/" +github="https://github.com/QubesOS" +tor="http://qubesosfasa4zl44o4tws22di6kepyzfeqv3tg4e3ztknltfxqrymdad.onion/" +%} - {% include card.html color="success" - title="Qubes OS" - labels="warning:contrib:This software may depend on or recommend non-free software." - image="/assets/img/tools/Qubes-OS.png" - url="https://www.qubes-os.org/" - tor="http://qubesos4rrrrz6n4.onion" - description="Qubes is an open-source operating system designed to provide strong security for desktop computing. Qubes is based on Xen, the X Window System, and Linux, and can run most Linux applications and utilize most of the Linux drivers." - %} +{% include cardv2.html +title="Debian" +image="/assets/img/tools/Debian.png" +description='Debian is a Unix-like computer operating system and a Linux distribution that is composed entirely of free and open-source software, most of which is under the GNU General Public License, and packaged by a group of individuals known as the Debian project.' +badges="info:GNU/Linux" +website="https://www.debian.org/" +git="https://salsa.debian.org/qa/debsources" +tor="http://sejnfjrq6szgca7v.onion" +%} - {% include card.html color="primary" - title="Debian" - image="/assets/img/tools/Debian.png" - url="https://www.debian.org/" - tor="http://sejnfjrq6szgca7v.onion" - description="Debian is a Unix-like computer operating system and a Linux distribution that is composed entirely of free and open-source software, most of which is under the GNU General Public License, and packaged by a group of individuals known as the Debian project." - %} - - {% include card.html color="warning" - title="Trisquel" - image="/assets/img/tools/Trisquel.png" - url="https://trisquel.info/" - description="Trisquel is a Linux-based operating system derived from Ubuntu. The project aims for a fully free software system without proprietary software or firmware and uses Linux-libre, a version of the Linux kernel with the non-free code (binary blobs) removed." - %} - -
    +{% include cardv2.html +title="Trisquel" +image="/assets/img/tools/Trisquel.png" +description='Trisquel is a Linux-based operating system derived from Ubuntu. The project aims for a fully free software system without proprietary software or firmware and uses Linux-libre, a version of the Linux kernel with the non-free code (binary blobs) removed.' +badges="info:GNU/Linux" +website="https://trisquel.info/" +git="https://devel.trisquel.info/groups/trisquel" +%}

    Warning

    @@ -41,9 +43,9 @@

    Worth Mentioning

    diff --git a/_includes/sections/router-firmware.html b/_includes/sections/router-firmware.html index 40395a7d..db043aea 100644 --- a/_includes/sections/router-firmware.html +++ b/_includes/sections/router-firmware.html @@ -1,35 +1,38 @@

    Open Source Router Firmware

    -
    +{% include cardv2.html +title="OpenWrt" +image="/assets/img/tools/OpenWrt.png" +description="OpenWrt is an operating system (in particular, an embedded operating system) based on the Linux kernel, primarily used on embedded devices to route network traffic. The main components are the Linux kernel, util-linux, uClibc and BusyBox. All components have been optimized for size, to be small enough for fitting into the limited storage and memory available in home routers." +badges="info:Linux" +labels="warning:contrib:This software may depend on or recommend non-free software." +website="https://openwrt.org/" +git="https://git.openwrt.org/" +github="https://github.com/openwrt" +%} - {% include card.html color="success" - title="OpenWrt" - labels="warning:contrib:This software may depend on or recommend non-free software." - image="/assets/img/tools/OpenWrt.png" - url="https://openwrt.org/" - description="OpenWrt is an operating system (in particular, an embedded operating system) based on the Linux kernel, primarily used on embedded devices to route network traffic. The main components are the Linux kernel, util-linux, uClibc and BusyBox. All components have been optimized for size, to be small enough for fitting into the limited storage and memory available in home routers." - %} +{% include cardv2.html +title="pfSense" +image="/assets/img/tools/pfSense.png" +description="pfSense is an open source firewall/router computer software distribution based on FreeBSD. It is installed on a computer to make a dedicated firewall/router for a network and is noted for its reliability and offering features often only found in expensive commercial firewalls. pfSense is commonly deployed as a perimeter firewall, router, wireless access point, DHCP server, DNS server, and as a VPN endpoint." +badges="info:BSD" +labels="warning:contrib:This software may depend on or recommend non-free software." +website="https://www.pfsense.org/" +github="https://github.com/pfsense/" +%} - {% include card.html color="primary" - title="pfSense" - labels="warning:contrib:This software may depend on or recommend non-free software." - image="/assets/img/tools/pfSense.png" - url="https://www.pfsense.org/" - description="pfSense is an open source firewall/router computer software distribution based on FreeBSD. It is installed on a computer to make a dedicated firewall/router for a network and is noted for its reliability and offering features often only found in expensive commercial firewalls. pfSense is commonly deployed as a perimeter firewall, router, wireless access point, DHCP server, DNS server, and as a VPN endpoint." - %} - - {% include card.html color="warning" - title="LibreCMC" - image="/assets/img/tools/LibreCMC.png" - url="https://librecmc.org" - description="LibreCMC is a GNU/Linux-libre distribution for computers with minimal resources, such as the Ben Nanonote, ath9k-based Wi-Fi routers, and other hardware with emphasis on free software. The project's current goal is to aim for compliance with the GNU Free System Distribution Guidelines (GNU FSDG) and ensure that the project continues to meet these requirements set forth by the Free Software Foundation (FSF).." - %} - -
    +{% include cardv2.html +title="LibreCMC" +image="/assets/img/tools/LibreCMC.png" +description="LibreCMC is a GNU/Linux-libre distribution for computers with minimal resources, such as the Ben Nanonote, ath9k-based Wi-Fi routers, and other hardware with emphasis on free software. The project's current goal is to aim for compliance with the GNU Free System Distribution Guidelines (GNU FSDG) and ensure that the project continues to meet these requirements set forth by the Free Software Foundation (FSF)." +badges="info:GNU/Linux" +website="https://librecmc.org" +git="https://gogs.librecmc.org/libreCMC/libreCMC" +%}

    Worth Mentioning

    diff --git a/_includes/sections/teamchat.html b/_includes/sections/teamchat.html new file mode 100644 index 00000000..7b6442cf --- /dev/null +++ b/_includes/sections/teamchat.html @@ -0,0 +1,41 @@ +

    Team Chat Applications

    + + + +{% include cardv2.html +title="Rocket.chat" +image="/assets/img/tools/rocket.chat.png" +description="Rocket.chat is an self-hostable open source platform for team communication. It has optional federation and experimental E2EE. Experimental " +website="https://rocket.chat/" +forum="https://forum.privacytools.io/t/discussion-rocket-chat/1223" +github="https://github.com/rocketchat/" +android="" +ios="" +mac="" +windows="" +linux="" +%} + +{% include cardv2.html +title="Keybase" +image="/assets/img/tools/keybase.png" +description='Keybase provides a hosted team chat with end-to-end encryption. It has also been indepedently audited (PDF). experimental (GitHub issue)' +website="https://keybase.io/" +forum="https://forum.privacytools.io/t/discussion-keybase/1224" +github="https://github.com/Keybase" +android="" +ios="" +mac="" +windows="" +linux="" +web="" +%} + + +

    Worth Mentioning

    + + diff --git a/_includes/sections/vpn.html b/_includes/sections/vpn.html index 4e9438f2..0a60c024 100644 --- a/_includes/sections/vpn.html +++ b/_includes/sections/vpn.html @@ -20,96 +20,6 @@ - - - AirVPN - - WWW - - 2010 - 54 € - Yes - 162 - No - Italy - - - - - AzireVPN - - - WWW - - 2012 - 45 € - Yes - 22 - Yes - Sweden - - - - - blackVPN - - - WWW - - 2009 - 49 € - Yes - 31 - No - Hong Kong - - - - - ExpressVPN - - - WWW - Tor - - 2009 - $ 99.95 - Yes - 148 - No - British Virgin Islands - - - - - FrootVPN - - - WWW - - 2014 - $ 35.88 - No - 27 - No - Sweden - - - - - hide.me - - - WWW - - 2012 - Free - Yes - 160+ - No - Malaysia - - IVPN @@ -156,36 +66,6 @@ Panama - - - OVPN - - - WWW - - 2014 - 84 € - Yes - 67 - No - Sweden - - - - - Perfect Privacy - - - WWW - - 2008 - 119.99 € - No - 54 - No - Switzerland - - ProtonVPN @@ -200,79 +80,6 @@ No Switzerland - - - - Proxy.sh - - - WWW - - 2012 - $ 40 - No - 300+ - No - Seychelles - - - - - Trust.Zone - - - WWW - - 2014 - $ 39.95 - Yes - 164 - No - Seychelles - - - - VPN.ht - - - WWW - - 2014 - $ 39.99 - No - 128 - No - Hong Kong - - - - VPNArea - - - WWW - - 2014 - $ 59 - Yes - 204 - No - Bulgaria - - - - VPNTunnel - - - WWW - - 2014 - 35.88 € - No - 800+ - No - Seychelles - - diff --git a/assets/img/provider/AirVPN.png b/assets/img/provider/AirVPN.png deleted file mode 100644 index d2d3b6a6..00000000 Binary files a/assets/img/provider/AirVPN.png and /dev/null differ diff --git a/assets/img/provider/AzireVPN.png b/assets/img/provider/AzireVPN.png deleted file mode 100644 index c63aefd7..00000000 Binary files a/assets/img/provider/AzireVPN.png and /dev/null differ diff --git a/assets/img/provider/EarthVPN.png b/assets/img/provider/EarthVPN.png deleted file mode 100644 index e74c040b..00000000 Binary files a/assets/img/provider/EarthVPN.png and /dev/null differ diff --git a/assets/img/provider/ExpressVPN.png b/assets/img/provider/ExpressVPN.png deleted file mode 100644 index 11254fc2..00000000 Binary files a/assets/img/provider/ExpressVPN.png and /dev/null differ diff --git a/assets/img/provider/FrootVPN.png b/assets/img/provider/FrootVPN.png deleted file mode 100644 index f9e34812..00000000 Binary files a/assets/img/provider/FrootVPN.png and /dev/null differ diff --git a/assets/img/provider/Perfect-Privacy.png b/assets/img/provider/Perfect-Privacy.png deleted file mode 100644 index 784bcf40..00000000 Binary files a/assets/img/provider/Perfect-Privacy.png and /dev/null differ diff --git a/assets/img/provider/Proxy.sh.png b/assets/img/provider/Proxy.sh.png deleted file mode 100644 index 37ee777c..00000000 Binary files a/assets/img/provider/Proxy.sh.png and /dev/null differ diff --git a/assets/img/provider/Trust.Zone.png b/assets/img/provider/Trust.Zone.png deleted file mode 100644 index 10ab9bf6..00000000 Binary files a/assets/img/provider/Trust.Zone.png and /dev/null differ diff --git a/assets/img/provider/VPN.ht.png b/assets/img/provider/VPN.ht.png deleted file mode 100644 index 12885d5c..00000000 Binary files a/assets/img/provider/VPN.ht.png and /dev/null differ diff --git a/assets/img/provider/VPNTunnel.png b/assets/img/provider/VPNTunnel.png deleted file mode 100644 index 69985710..00000000 Binary files a/assets/img/provider/VPNTunnel.png and /dev/null differ diff --git a/assets/img/provider/blackVPN.png b/assets/img/provider/blackVPN.png deleted file mode 100644 index e902b78c..00000000 Binary files a/assets/img/provider/blackVPN.png and /dev/null differ diff --git a/assets/img/provider/hide.me.png b/assets/img/provider/hide.me.png deleted file mode 100644 index 1c95f481..00000000 Binary files a/assets/img/provider/hide.me.png and /dev/null differ diff --git a/assets/img/provider/ovpn.png b/assets/img/provider/ovpn.png deleted file mode 100644 index 9145982d..00000000 Binary files a/assets/img/provider/ovpn.png and /dev/null differ diff --git a/assets/img/provider/vpnarea.png b/assets/img/provider/vpnarea.png deleted file mode 100644 index ccbffa48..00000000 Binary files a/assets/img/provider/vpnarea.png and /dev/null differ diff --git a/assets/img/tools/keybase.png b/assets/img/tools/keybase.png new file mode 100644 index 00000000..d8081eec Binary files /dev/null and b/assets/img/tools/keybase.png differ diff --git a/assets/img/tools/rocket.chat.png b/assets/img/tools/rocket.chat.png new file mode 100644 index 00000000..904efe19 Binary files /dev/null and b/assets/img/tools/rocket.chat.png differ diff --git a/nginx/000-includes.conf b/nginx/000-includes.conf new file mode 100644 index 00000000..d70bce8e --- /dev/null +++ b/nginx/000-includes.conf @@ -0,0 +1,2 @@ +include /var/www/privacytools.io/nginx/010-headers.conf; +include /var/www/privacytools.io/nginx/020-redirects.conf; diff --git a/nginx/010-headers.conf b/nginx/010-headers.conf new file mode 100644 index 00000000..46c4ef44 --- /dev/null +++ b/nginx/010-headers.conf @@ -0,0 +1,9 @@ +add_header X-Frame-Options DENY always; +add_header X-XSS-Protection "1; mode=block" always; +add_header X-Content-Type-Options nosniff always; +add_header Content-Security-Policy "default-src 'none'; script-src 'self' 'unsafe-inline' https://stats.privacytools.io; style-src 'self' 'unsafe-inline'; img-src 'self' data: https://*.privacytools.io; object-src 'none'; frame-src https://stats.privacytools.io; font-src 'self'; manifest-src 'self';" always; +add_header Strict-Transport-Security "max-age=31557600; includeSubDomains; preload"; +add_header 'Access-Control-Allow-Origin' '*'; +add_header Alt-Svc 'h2="privacy2zbidut4m4jyj3ksdqidzkw3uoip2vhvhbvwxbqux5xy5obyd.onion:443"; ma=86400; persist=1'; +add_header Expect-CT 'max-age=0; report-uri="https://34f7a2cb34f91bc092b2e15f4e4bda78.report-uri.com/r/d/ct/reportOnly"'; +add_header Referrer-Policy "strict-origin"; diff --git a/nginx/020-redirects.conf b/nginx/020-redirects.conf new file mode 100644 index 00000000..65a7c8db --- /dev/null +++ b/nginx/020-redirects.conf @@ -0,0 +1,12 @@ +location = /old/ { + return 301 /classic/; +} +location = /software/im/ { + return 301 /software/real-time-communication/; +} +location = /software/voip/ { + return 301 /software/real-time-communication/; +} +location = /software/teamchat/ { + return 301 /software/real-time-communication/; +} diff --git a/pages/software/im.html b/pages/software/im.html deleted file mode 100644 index a7d77066..00000000 --- a/pages/software/im.html +++ /dev/null @@ -1,8 +0,0 @@ ---- -layout: page -permalink: /software/im/ -title: "Instant Messaging" -description: "Discover secure and private ways to message others online without letting any third parties read your messages." ---- - -{% include sections/instant-messenger.html %} diff --git a/pages/software/real-time-communication.html b/pages/software/real-time-communication.html new file mode 100644 index 00000000..9a28ab8b --- /dev/null +++ b/pages/software/real-time-communication.html @@ -0,0 +1,16 @@ +--- +layout: page +permalink: /software/real-time-communication/ +title: "Real-Time Communication" +description: "Discover secure and private ways to communicate with others online without letting any third parties read your messages." +--- + +{% include sections/instant-messenger.html %} + +
    + +{% include sections/voice-video-messenger.html %} + +
    + +{% include sections/teamchat.html %} diff --git a/pages/software/video-voice.html b/pages/software/video-voice.html deleted file mode 100644 index f2b9e575..00000000 --- a/pages/software/video-voice.html +++ /dev/null @@ -1,8 +0,0 @@ ---- -layout: page -permalink: /software/voip/ -title: "VoIP" -description: "Find a voice and video messenger that supports completely End-to-End encrypted calls." ---- - -{% include sections/voice-video-messenger.html %} diff --git a/source_code.md b/source_code.md index 0b7a2d08..7de4daf3 100644 --- a/source_code.md +++ b/source_code.md @@ -134,6 +134,12 @@ Backend: closed-source Status.im: https://github.com/status-im +## Team chat + + Rocket.chat: https://github.com/rocketchat/ + + Keybase: https://github.com/Keybase + ## Encrypted Video & Voice Messenger Signal: https://github.com/signalapp @@ -420,9 +426,8 @@ Backend: Closed Source MicroG: https://github.com/microg ## Android Privacy Add-ons - NetGuard: https://github.com/M66B/NetGuard/ - XPrivacyLua: https://github.com/M66B/XPrivacyLua/ +NetGuard: https://github.com/M66B/NetGuard/ ## Open Source Router Firmware OpenWRT: https://git.openwrt.org/?p=openwrt/openwrt.git;a=shortlog;h=refs/tags/v18.06.1