From f955b529908185562689a2a9bedcc8222e7af78a Mon Sep 17 00:00:00 2001
From: Jonah Aragon
Date: Sun, 16 Mar 2025 12:50:32 +0000
Subject: [PATCH 1/7] update!: Add Stalwart mail server (#2936)
Signed-off-by: redoomed1
Signed-off-by: fria
Signed-off-by: Daniel Gray
---
docs/email.md | 33 +++++++++++++++++++++++------
docs/tools.md | 5 +++--
theme/assets/img/email/stalwart.svg | 1 +
3 files changed, 30 insertions(+), 9 deletions(-)
create mode 100644 theme/assets/img/email/stalwart.svg
diff --git a/docs/email.md b/docs/email.md
index 35679561..c546f892 100644
--- a/docs/email.md
+++ b/docs/email.md
@@ -249,9 +249,31 @@ Tuta doesn't offer a digital legacy feature.
## Self-Hosting Email
-Advanced system administrators may consider setting up their own email server. Mail servers require attention and continuous maintenance in order to keep things secure and mail delivery reliable.
+Advanced system administrators may consider setting up their own email server. Mail servers require attention and continuous maintenance in order to keep things secure and mail delivery reliable. In addition to the "all-in-one" solutions below, we've picked out a few articles that cover a more manual approach:
-### Combined software solutions
+- [Setting up a mail server with OpenSMTPD, Dovecot and Rspamd](https://poolp.org/posts/2019-09-14/setting-up-a-mail-server-with-opensmtpd-dovecot-and-rspamd) (2019)
+- [How To Run Your Own Mail Server](https://www.c0ffee.net/blog/mail-server-guide) (August 2017)
+
+### Stalwart
+
+
+
+{ align=right }
+
+**Stalwart** is a newer mail server written in Rust which supports JMAP in addition to the standard IMAP, POP3, and SMTP. It has a wide variety of configuration options, but it also defaults to very reasonable settings (in terms of both security and features) making it easy to use immediately. It has web-based administration with TOTP 2FA support, and it allows you to enter your public PGP key to encrypt **all** incoming messages.
+
+[:octicons-home-16: Homepage](https://stalw.art){ .md-button .md-button--primary }
+[:octicons-info-16:](https://stalw.art/docs/get-started){ .card-link title="Documentation" }
+[:octicons-code-16:](https://github.com/stalwartlabs){ .card-link title="Source Code" }
+[:octicons-heart-16:](https://github.com/sponsors/stalwartlabs){ .card-link title="Contribute" }
+
+
+
+Stalwart's [PGP implementation](https://stalw.art/docs/encryption/overview) is unique among our self-hosted recommendations, and allows you to operate your own mail server with zero-knowledge message storage. If you additionally configure Web Key Directory on your domain, and if you use an email client which supports PGP and Web Key Directory for outgoing mail (like Thunderbird), then this is the easiest way to get self-hosted E2EE compatibility with all [Proton Mail](#proton-mail) users.
+
+Stalwart does **not** have an integrated webmail, so you will need to use it with a [dedicated email client](email-clients.md) (or find an open-source webmail to self-host, like Nextcloud's Mail app). We use Stalwart for our own internal email at *Privacy Guides*.
+
+### Mailcow
@@ -266,6 +288,8 @@ Advanced system administrators may consider setting up their own email server. M
+### Mail-in-a-Box
+
{ align=right }
@@ -278,11 +302,6 @@ Advanced system administrators may consider setting up their own email server. M
-For a more manual approach we've picked out these two articles:
-
-- [Setting up a mail server with OpenSMTPD, Dovecot and Rspamd](https://poolp.org/posts/2019-09-14/setting-up-a-mail-server-with-opensmtpd-dovecot-and-rspamd) (2019)
-- [How To Run Your Own Mail Server](https://c0ffee.net/blog/mail-server-guide) (August 2017)
-
## Criteria
**Please note we are not affiliated with any of the providers we recommend.** In addition to [our standard criteria](about/criteria.md), we have developed a clear set of requirements for any email provider wishing to be recommended, including implementing industry best practices, modern technology and more. We suggest you familiarize yourself with this list before choosing an email provider, and conduct your own research to ensure the email provider you choose is the right choice for you.
diff --git a/docs/tools.md b/docs/tools.md
index fab90592..abbff243 100644
--- a/docs/tools.md
+++ b/docs/tools.md
@@ -226,8 +226,9 @@ If you're looking for added **security**, you should always ensure you're connec
diff --git a/theme/assets/img/email/stalwart.svg b/theme/assets/img/email/stalwart.svg
new file mode 100644
index 00000000..a956e54a
--- /dev/null
+++ b/theme/assets/img/email/stalwart.svg
@@ -0,0 +1 @@
+
From ae7109a6e02334f7fb62d3f10088f0f4071ea458 Mon Sep 17 00:00:00 2001
From: Em <194856901+EmAtPrivacyGuides@users.noreply.github.com>
Date: Sun, 16 Mar 2025 12:54:13 +0000
Subject: [PATCH 2/7] style(blog): Fix typo in The Privacy of Others article
(#2955)
Signed-off-by: Freddy
Signed-off-by: Jonah Aragon
Signed-off-by: fria
---
blog/posts/the-privacy-of-others.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/blog/posts/the-privacy-of-others.md b/blog/posts/the-privacy-of-others.md
index d8757ca0..fac55ebd 100644
--- a/blog/posts/the-privacy-of-others.md
+++ b/blog/posts/the-privacy-of-others.md
@@ -48,7 +48,7 @@ To truly improve data privacy rights, we *must* integrate them into our *whole c
In the past few decades, our culture and customs have begun to shift *against* data privacy. Some of us are old enough to remember a time when everyone didn't have a camera in their pocket. At that time, it would have been considered unacceptable in most places to suddenly point a recording camera at a stranger in the street and start filming them without any explanation and without their consent.
-Now this kind of disrespectful behavior is a common occurrence, because everyone has the tool do to it. Our society evolved with technological tools, but **we neglected to course-correct our culture for it**.
+Now this kind of disrespectful behavior is a common occurrence, because everyone has the tool to do it. Our society evolved with technological tools, but **we neglected to course-correct our culture for it**.
We have reached a point where we need to develop a culture of individual responsibility towards each other's data.
From accdff374ccadb91e2766113d70e8be101df8ffb Mon Sep 17 00:00:00 2001
From: Jonah Aragon
Date: Sun, 16 Mar 2025 12:56:02 +0000
Subject: [PATCH 3/7] style(video): Video page metadata changes (#2956)
Signed-off-by: fria
Signed-off-by: Daniel Gray
---
mkdocs.videos.yml | 2 +-
theme/video-post.html | 6 +++++-
videos/index.md | 3 ++-
3 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/mkdocs.videos.yml b/mkdocs.videos.yml
index 4a168e6b..538ec87e 100644
--- a/mkdocs.videos.yml
+++ b/mkdocs.videos.yml
@@ -23,7 +23,7 @@ site_url: "https://www.privacyguides.org/videos/"
site_dir: "site/videos"
site_name: Privacy Guides
-site_description: "Privacy Guides is the most popular & trustworthy non-profit privacy resource to find privacy tools and learn about protecting your digital life."
+site_description: "This is our home for the latest video content from the Privacy Guides team. Privacy Guides is the most popular & trustworthy non-profit privacy resource to find privacy tools and learn about protecting your digital life."
edit_uri_template: blob/main/videos/{path}?plain=1
extra:
diff --git a/theme/video-post.html b/theme/video-post.html
index aea3ab13..bd4fdec6 100644
--- a/theme/video-post.html
+++ b/theme/video-post.html
@@ -25,6 +25,10 @@
{% import "partials/nav-item.html" as item with context %}
+{% block htmltitle %}
+ [Video] {{ page.title | striptags }} - {{ config.site_name }}
+{% endblock %}
+
{% block extrahead %}
-
+
{% endblock %}
diff --git a/videos/index.md b/videos/index.md
index a33fdf32..892caa85 100644
--- a/videos/index.md
+++ b/videos/index.md
@@ -1,5 +1,6 @@
---
-description: Privacy-related news stories, product reviews, opinion pieces, and other important articles from Privacy Guides contributors.
+description: >-
+ This is our home for the latest video content from the Privacy Guides team. Be sure you are subscribed to find out about our latest uploads, and share these videos with your family and friends if you find them helpful!
template: video.html
hide:
- footer
From 993878835861a25e6d9a7a20cd70514c2f28169f Mon Sep 17 00:00:00 2001
From: Jonah Aragon
Date: Sun, 16 Mar 2025 12:57:27 +0000
Subject: [PATCH 4/7] docs: List all Privacy Guides owned social media (#2958)
Signed-off-by: redoomed1
Signed-off-by: fria
Signed-off-by: Daniel Gray
---
.vscode/ltex.dictionary.en-US.txt | 6 +++++
README.md | 4 +---
docs/about.md | 37 ++++++++++++++++++++++++++-----
mkdocs.blog.yml | 3 ---
mkdocs.videos.yml | 3 ---
mkdocs.yml | 6 -----
6 files changed, 38 insertions(+), 21 deletions(-)
diff --git a/.vscode/ltex.dictionary.en-US.txt b/.vscode/ltex.dictionary.en-US.txt
index 15d8ff2c..2a392fe3 100644
--- a/.vscode/ltex.dictionary.en-US.txt
+++ b/.vscode/ltex.dictionary.en-US.txt
@@ -539,3 +539,9 @@ Euki
sympto-thermal
OsmAnd
Paaster
+material-check-decagram
+Bluesky
+Codeberg
+simple-codeberg
+simple-reddit
+fontawesome-brands-linkedin
diff --git a/README.md b/README.md
index c19715c9..36493a37 100644
--- a/README.md
+++ b/README.md
@@ -14,9 +14,7 @@
-
-
-
+
diff --git a/docs/about.md b/docs/about.md
index dd198cff..98fdc5fc 100644
--- a/docs/about.md
+++ b/docs/about.md
@@ -29,7 +29,7 @@ In addition to our core team, [many other people](about/contributors.md) have ma
[Job Openings :material-arrow-right-drop-circle:](about/jobs.md)
-## Contact Us
+## :material-email-edit: Contact Us
[:simple-discourse: Join the Privacy Guides forum](https://discuss.privacyguides.net){ .md-button .md-button--primary }
@@ -49,7 +49,7 @@ You can also use OpenPGP to contact us via email, if you feel comfortable with y
If you need an alternative secure channel, please request one via any contact method including social media, and we will work with you to establish one. Please do not share any sensitive information with us before we have established an appropriately secure discussion channel.
-## Executive Committee
+## :material-account-tie: Executive Committee
The project executive committee consists of five volunteers charged with management of the [MAGIC Privacy Guides Fund](https://magicgrants.org/funds/privacy_guides), making most critical project-related decisions.
@@ -118,7 +118,7 @@ The project executive committee consists of five volunteers charged with managem
-## Staff
+## :material-account-edit: Staff
Our staff are paid to contribute to supplemental content at Privacy Guides, like [video production](https://www.youtube.com/@privacyguides), [news articles and tutorials](https://www.privacyguides.org/articles), and our discussion communities and social media. Most are available and paid on a full-time basis to assist the organization.
@@ -162,7 +162,32 @@ Our staff are paid to contribute to supplemental content at Privacy Guides, like
-## In The Media
+## :material-check-decagram: Social Media
+
+We have a general policy of avoiding links to centralized social media profiles and other websites outside our control. This means that in places like our website footer and other areas, we only link to platforms we fully control, such as our Mastodon and PeerTube accounts or Matrix channels.
+
+However, Privacy Guides *does* have social media accounts on a wide variety of platforms, in the hope of reaching new users who aren't yet familiar with our content. We try to make this a "one-way street" where those accounts link to privacyguides.org, and not the other way around. However, this creates some confusion about which accounts are actually run by the Privacy Guides team. For reference, we will list all of our accounts here:
+
+
+
+To reiterate, this is not an endorsement of any platform, and we generally discourage following us on most social media platforms.
+
+## :material-newspaper: In The Media
> To find [privacy-focused alternative] apps, check out sites like Good Reports and **Privacy Guides**, which list privacy-focused apps in a variety of categories, notably including email providers (usually on paid plans) that aren’t run by the big tech companies.
@@ -174,7 +199,7 @@ Our staff are paid to contribute to supplemental content at Privacy Guides, like
Also featured on: [Ars Technica](https://arstechnica.com/gadgets/2022/02/is-firefox-ok), [Wirecutter](https://nytimes.com/wirecutter/guides/practical-guide-to-securing-windows-pc) [[2](https://nytimes.com/wirecutter/guides/practical-guide-to-securing-your-mac)], [NPO Radio 1](https://nporadio1.nl/nieuws/binnenland/8eaff3a2-8b29-4f63-9b74-36d2b28b1fe1/ooit-online-eens-wat-doms-geplaatst-ga-jezelf-eens-googlen-en-kijk-dan-wat-je-tegenkomt), [Wired](https://wired.com/story/firefox-mozilla-2022), [Fast Company](https://fastcompany.com/91167564/mozilla-wants-you-to-love-firefox-again) and [404 Media](https://404media.co/privacy-service-optery-faces-backlash-after-plan-to-send-openai-user-data).
-## History
+## :material-history: History
Privacy Guides was launched in September 2021 as a continuation of the [defunct](about/privacytools.md) "PrivacyTools" open-source educational project. We recognized the importance of independent, criteria-focused product recommendations and general knowledge in the privacy space, which is why we needed to preserve the work that had been created by so many contributors since 2015 and make sure that information had a stable home on the web indefinitely.
@@ -184,7 +209,7 @@ We additionally launched our new discussion forum at [discuss.privacyguides.net]
In 2023, we launched international translations of our website in [French](https://www.privacyguides.org/fr), [Hebrew](https://www.privacyguides.org/he), [Dutch](https://www.privacyguides.org/nl), and more languages, made possible by our excellent translation team on [Crowdin](https://crowdin.com/project/privacyguides). We plan to continue carrying forward our mission of outreach and education, and finding ways to more clearly highlight the dangers of a lack of privacy awareness in the modern digital age, and the prevalence and harms of security breaches across the technology industry.
-## Site License
+## :material-license: Site License