From 76b6bc7e884e2297b594409021473eb03575f9cf Mon Sep 17 00:00:00 2001 From: Dawid Potocki Date: Fri, 20 Dec 2019 13:51:00 +0000 Subject: [PATCH 1/2] Redo PC Live Operating Systems section (#1600) Remove the following operating systems, because of described issues KNOPPIX: - Site has optional HTTPS, so all links, will make you go back to HTTP - Source code distributed on ISOs, no online repositories/tarballs Puppy Linux: - Site is only over HTTP - Looks like garbage Tiny Core Linux: - Site is only over HTTP - Not really usable or useful - Looks like garbage Add Debian and Fedora to Worth Mentioning PC Live Operating Systems, since they are recommended as normal operating systems and support LiveUSB. --- _includes/nav.html | 2 +- .../sections/live-operating-systems.html | 35 ++++++------------- assets/img/svg/3rd-party/knoppix-dark.svg | 2 -- assets/img/svg/3rd-party/knoppix.svg | 2 -- assets/img/svg/3rd-party/puppy_linux.svg | 2 -- 5 files changed, 12 insertions(+), 31 deletions(-) delete mode 100644 assets/img/svg/3rd-party/knoppix-dark.svg delete mode 100644 assets/img/svg/3rd-party/knoppix.svg delete mode 100644 assets/img/svg/3rd-party/puppy_linux.svg diff --git a/_includes/nav.html b/_includes/nav.html index 21ccfe9a..6526b325 100644 --- a/_includes/nav.html +++ b/_includes/nav.html @@ -87,7 +87,7 @@ PC OS - Live CD OS + PC Live OS Mobile OS Android Privacy Add-ons Router Firmware diff --git a/_includes/sections/live-operating-systems.html b/_includes/sections/live-operating-systems.html index 23f5bc4a..f17db2f5 100644 --- a/_includes/sections/live-operating-systems.html +++ b/_includes/sections/live-operating-systems.html @@ -1,4 +1,4 @@ -

Live CD Operating Systems

+

PC Live Operating Systems

{% include cardv2.html title="Tails" @@ -10,30 +10,17 @@ website="https://tails.boum.org/" git="https://git-tails.immerda.ch/tails/" %} -{% include cardv2.html -title="KNOPPIX" -image="/assets/img/svg/3rd-party/knoppix.svg" -image="/assets/img/svg/3rd-party/knoppix-dark.svg" -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#license" -%} - -{% include cardv2.html -title="Puppy Linux" -image="/assets/img/svg/3rd-party/puppy_linux.svg" -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/assets/img/svg/3rd-party/knoppix-dark.svg b/assets/img/svg/3rd-party/knoppix-dark.svg deleted file mode 100644 index 81c95fc9..00000000 --- a/assets/img/svg/3rd-party/knoppix-dark.svg +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/assets/img/svg/3rd-party/knoppix.svg b/assets/img/svg/3rd-party/knoppix.svg deleted file mode 100644 index ae115bc6..00000000 --- a/assets/img/svg/3rd-party/knoppix.svg +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/assets/img/svg/3rd-party/puppy_linux.svg b/assets/img/svg/3rd-party/puppy_linux.svg deleted file mode 100644 index cb8230a5..00000000 --- a/assets/img/svg/3rd-party/puppy_linux.svg +++ /dev/null @@ -1,2 +0,0 @@ - - -- 2.47.2 From 66d9566641434ba5d9c5c53e11a991c1d21c172c Mon Sep 17 00:00:00 2001 From: Dawid Potocki Date: Sat, 21 Dec 2019 04:13:16 +1300 Subject: [PATCH 2/2] Redirect email to my website for my profile in /about/ to reduce spam mailto: is a shitty solution anyway --- _includes/team.html | 2 +- pages/about.html | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/_includes/team.html b/_includes/team.html index 5f58191d..8126a333 100644 --- a/_includes/team.html +++ b/_includes/team.html @@ -16,7 +16,7 @@

{{ include.bio | default: "Hmm, this user hasn't written a bio quite yet :(" }}

{% if include.email %} - + {% endif %} diff --git a/pages/about.html b/pages/about.html index 83db939c..e631bfe6 100644 --- a/pages/about.html +++ b/pages/about.html @@ -29,7 +29,7 @@ avatar="burung.png" name="Burung Hantu" role="Founder" bio="I founded PrivacyTools in 2015 to share resources and tools, allowing users to avoid international mass-surveillance programs." -email="dude@privacytools.io" +email="mailto:dude@privacytools.io" keys="https://keybase.io/privacytools" mastodon="https://social.privacytools.io/@BurungHantu" twitter="privacytoolsIO" @@ -41,7 +41,7 @@ name="Jonah Aragon" nick="Jonah" role="Administrator" bio="I run the website and services for PrivacyTools. My goal is to spread the word about data privacy as widely as possible." -email="jonah@privacytools.io" +email="mailto:jonah@privacytools.io" website="https://www.jonaharagon.com" keys="https://keybase.io/jonaharagon" mastodon="https://social.privacytools.io/@jonah" @@ -54,7 +54,7 @@ avatar="blacklight447.png" name="blacklight447" bio="I research new privacy recommendations and moderate our communities. My expertise is endpoint security and networking." role="Community Manager" -email="blacklight447@privacytools.io" +email="mailto:blacklight447@privacytools.io" mastodon="https://social.privacytools.io/@blacklight447" %} @@ -64,7 +64,7 @@ name="Dan Arel" role="Blogging & Education" bio="I'm an author, columnist, and privacy advocate whose work has appeared in Time, Huff Post, OpenSource, and more." website="https://danarel.com" -email="dan@privacytools.io" +email="mailto:dan@privacytools.io" keys="https://keybase.io/dan_arel" twitter="danarel" mastodon="https://mastodon.technology/@danarel" @@ -77,7 +77,7 @@ name="Dawid Potocki" role="Developer" bio="I'm a student interested in software development. I help improve PrivacyTools and promote using free libre software." website="https://dawidpotocki.com" -email="dawidpotocki@privacytools.io" +email="https://dawidpotocki.com/accounts/#email" keys="https://dawidpotocki.com/accounts/#pgp" mastodon="https://social.privacytools.io/@dawidpotocki" %} @@ -87,7 +87,7 @@ avatar="dngray.png" name="dngray" nick="Daniel Gray" bio="I liaise with and research privacy-focused services to refine our recommendations. My background is infosec and network security." -email="dngray@privacytools.io" +email="mailto:dngray@privacytools.io" keys="https://keybase.io/dngray" mastodon="https://social.privacytools.io/@dngray" %} @@ -118,7 +118,7 @@ avatar="trai_dep.png" name="trai_dep" role="Subreddit Mod" bio="I'm the moderator at r/Privacy and r/privacytoolsIO. Day to day, I am also – irony alert – an (ethical) digital marketer." -email="trai_dep@privacytools.io" +email="mailto:trai_dep@privacytools.io" website="https://www.reddit.com/user/trai_dep" %} -- 2.47.2