From dc77667b4efdeb7ed0ca08329077716cd9eccfa3 Mon Sep 17 00:00:00 2001 From: Mikaela Suomalainen Date: Sun, 11 Aug 2019 19:04:59 +0300 Subject: [PATCH 01/10] Merge im, teamchat and video-voice into real-time-communication Resolves: #1078 Closes: #746 --- _config.yml | 1 + _includes/nav.html | 4 +--- pages/software/im.html | 8 -------- pages/software/real-time-communication.html | 16 ++++++++++++++++ pages/software/teamchat.html | 8 -------- pages/software/video-voice.html | 8 -------- 6 files changed, 18 insertions(+), 27 deletions(-) delete mode 100644 pages/software/im.html create mode 100644 pages/software/real-time-communication.html delete mode 100644 pages/software/teamchat.html delete mode 100644 pages/software/video-voice.html diff --git a/_config.yml b/_config.yml index 355e9fe6..248192f3 100644 --- a/_config.yml +++ b/_config.yml @@ -5,6 +5,7 @@ sass: style: compressed plugins: - jekyll-sitemap + - jekyll-redirect-from sitemap: file: "/sitemap.xml" include: [".well-known"] diff --git a/_includes/nav.html b/_includes/nav.html index a78c44da..9f1c9785 100644 --- a/_includes/nav.html +++ b/_includes/nav.html @@ -49,14 +49,12 @@ Email Clients File Encryption File Sharing - Instant Messenger - Team chat Password Manager Productivity Tools + Real time communication Secure File Sync Self-contained Networks Self-Hosted Cloud Server - Video & Voice Messenger
  • 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..75ec5ef4 --- /dev/null +++ b/pages/software/real-time-communication.html @@ -0,0 +1,16 @@ +--- +layout: page +permalink: /software/real-time-communication/ +redirect_from: + - /software/im/ + - /software/voip/ + - /software/teamchat/ +title: "Real time communication" +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/teamchat.html b/pages/software/teamchat.html deleted file mode 100644 index 83700206..00000000 --- a/pages/software/teamchat.html +++ /dev/null @@ -1,8 +0,0 @@ ---- -layout: page -permalink: /software/teamchat/ -title: "Team chat" -description: "Discover secure and private ways to communicate with your team online without letting any third parties read your messages." ---- - -{% 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 %} From 40bfb1edd3a1bb05916cb3d377cb07e1d80cc207 Mon Sep 17 00:00:00 2001 From: Mikaela Suomalainen Date: Sun, 11 Aug 2019 19:10:11 +0300 Subject: [PATCH 02/10] real-time-communication: fix description --- pages/software/real-time-communication.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/software/real-time-communication.html b/pages/software/real-time-communication.html index 75ec5ef4..7ae2837b 100644 --- a/pages/software/real-time-communication.html +++ b/pages/software/real-time-communication.html @@ -6,7 +6,7 @@ redirect_from: - /software/voip/ - /software/teamchat/ title: "Real time communication" -Discover secure and private ways to communicate with others online without letting any third parties read your messages. +description: "Discover secure and private ways to communicate with others online without letting any third parties read your messages." --- {% include sections/instant-messenger.html %} From 69e3dd0401f6d2629a0d0acf265d20c739454db2 Mon Sep 17 00:00:00 2001 From: Mikaela Suomalainen Date: Sun, 11 Aug 2019 19:13:16 +0300 Subject: [PATCH 03/10] real-time-communication: separate sections by lines --- pages/software/real-time-communication.html | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pages/software/real-time-communication.html b/pages/software/real-time-communication.html index 7ae2837b..899b4902 100644 --- a/pages/software/real-time-communication.html +++ b/pages/software/real-time-communication.html @@ -11,6 +11,10 @@ description: "Discover secure and private ways to communicate with others online {% include sections/instant-messenger.html %} +* * * * * + {% include sections/voice-video-messenger.html %} +* * * * * + {% include sections/teamchat.html %} From d3ad1e4b693df6d467b974f2f6028a7ccfc0f53b Mon Sep 17 00:00:00 2001 From: Mikaela Suomalainen Date: Sun, 11 Aug 2019 19:13:44 +0300 Subject: [PATCH 04/10] nav.html: fix real time communication icon --- _includes/nav.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_includes/nav.html b/_includes/nav.html index 9f1c9785..3c1078ba 100644 --- a/_includes/nav.html +++ b/_includes/nav.html @@ -51,7 +51,7 @@ File Sharing Password Manager Productivity Tools - Real time communication + Real time communication Secure File Sync Self-contained Networks Self-Hosted Cloud Server From 94c71ca71beab53a556cc394b9172e18397e789a Mon Sep 17 00:00:00 2001 From: Mikaela Suomalainen Date: Sun, 11 Aug 2019 19:16:30 +0300 Subject: [PATCH 05/10] oops, this isn't markdown --- pages/software/real-time-communication.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pages/software/real-time-communication.html b/pages/software/real-time-communication.html index 899b4902..690f568d 100644 --- a/pages/software/real-time-communication.html +++ b/pages/software/real-time-communication.html @@ -11,10 +11,10 @@ description: "Discover secure and private ways to communicate with others online {% include sections/instant-messenger.html %} -* * * * * +
    {% include sections/voice-video-messenger.html %} -* * * * * +
    {% include sections/teamchat.html %} From be8ed5960f262f56235a48b0a8b5ae887f5cf7b6 Mon Sep 17 00:00:00 2001 From: Mikaela Suomalainen Date: Sun, 11 Aug 2019 19:17:19 +0300 Subject: [PATCH 06/10] fix nav.html again --- _includes/nav.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_includes/nav.html b/_includes/nav.html index 3c1078ba..df9747df 100644 --- a/_includes/nav.html +++ b/_includes/nav.html @@ -51,7 +51,7 @@ File Sharing Password Manager Productivity Tools - Real time communication + Real time communication Secure File Sync Self-contained Networks Self-Hosted Cloud Server From 221698a1f48b4c2e2901af331103a975573510ff Mon Sep 17 00:00:00 2001 From: Mikaela Suomalainen Date: Sun, 11 Aug 2019 19:25:11 +0300 Subject: [PATCH 07/10] change to real-time communication --- _includes/nav.html | 2 +- pages/software/real-time-communication.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/_includes/nav.html b/_includes/nav.html index df9747df..2c2ee9b2 100644 --- a/_includes/nav.html +++ b/_includes/nav.html @@ -51,7 +51,7 @@ File Sharing Password Manager Productivity Tools - Real time communication + Real-time communication Secure File Sync Self-contained Networks Self-Hosted Cloud Server diff --git a/pages/software/real-time-communication.html b/pages/software/real-time-communication.html index 690f568d..3804ca1c 100644 --- a/pages/software/real-time-communication.html +++ b/pages/software/real-time-communication.html @@ -5,7 +5,7 @@ redirect_from: - /software/im/ - /software/voip/ - /software/teamchat/ -title: "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." --- From 98bca69952354bf4a8413c287f0eaaf501900068 Mon Sep 17 00:00:00 2001 From: Mikaela Suomalainen Date: Sun, 11 Aug 2019 19:26:01 +0300 Subject: [PATCH 08/10] capitalization --- _includes/nav.html | 2 +- pages/software/real-time-communication.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/_includes/nav.html b/_includes/nav.html index 2c2ee9b2..bda4dbaa 100644 --- a/_includes/nav.html +++ b/_includes/nav.html @@ -51,7 +51,7 @@ File Sharing Password Manager Productivity Tools - Real-time communication + Real-Time Communication Secure File Sync Self-contained Networks Self-Hosted Cloud Server diff --git a/pages/software/real-time-communication.html b/pages/software/real-time-communication.html index 3804ca1c..1d47e387 100644 --- a/pages/software/real-time-communication.html +++ b/pages/software/real-time-communication.html @@ -5,7 +5,7 @@ redirect_from: - /software/im/ - /software/voip/ - /software/teamchat/ -title: "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." --- From 7daa208815bdeb139bbadf79aac702063adf8076 Mon Sep 17 00:00:00 2001 From: Jonah Date: Sun, 11 Aug 2019 22:12:19 -0500 Subject: [PATCH 09/10] Add Nginx config files to repo Allows us to edit redirects and headers locally. --- .github/CODEOWNERS | 3 ++- _config.yml | 1 - nginx/000-includes.conf | 2 ++ nginx/010-headers.conf | 9 +++++++++ nginx/020-redirects.conf | 12 ++++++++++++ pages/software/real-time-communication.html | 4 ---- 6 files changed, 25 insertions(+), 6 deletions(-) create mode 100644 nginx/000-includes.conf create mode 100644 nginx/010-headers.conf create mode 100644 nginx/020-redirects.conf diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 5b16ecc8..2aae0a90 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1,9 +1,10 @@ # Administration Related Files /.well-known/ @JonahAragon +/nginx/ @JonahAragon /404.html @JonahAragon /.github/ @JonahAragon @BurungHantu1605 /LICENSE.txt @JonahAragon @BurungHantu1605 -/.travis.yml @Shifterovich +/.travis.yml @JonahAragon @Shifterovich /CNAME @JonahAragon # Editorial Team diff --git a/_config.yml b/_config.yml index 248192f3..355e9fe6 100644 --- a/_config.yml +++ b/_config.yml @@ -5,7 +5,6 @@ sass: style: compressed plugins: - jekyll-sitemap - - jekyll-redirect-from sitemap: file: "/sitemap.xml" include: [".well-known"] 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/real-time-communication.html b/pages/software/real-time-communication.html index 1d47e387..9a28ab8b 100644 --- a/pages/software/real-time-communication.html +++ b/pages/software/real-time-communication.html @@ -1,10 +1,6 @@ --- layout: page permalink: /software/real-time-communication/ -redirect_from: - - /software/im/ - - /software/voip/ - - /software/teamchat/ title: "Real-Time Communication" description: "Discover secure and private ways to communicate with others online without letting any third parties read your messages." --- From 33b2b9a53a3e1a6cc6a184021cb584a207c4a481 Mon Sep 17 00:00:00 2001 From: Jonah Date: Sun, 11 Aug 2019 22:14:39 -0500 Subject: [PATCH 10/10] Update descriptions --- _includes/sections/teamchat.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/_includes/sections/teamchat.html b/_includes/sections/teamchat.html index 3550bf3c..7b6442cf 100644 --- a/_includes/sections/teamchat.html +++ b/_includes/sections/teamchat.html @@ -1,7 +1,7 @@ -

    Team chat applications where everything is end-to-end encrypted or under the control of your team administrator

    +

    Team Chat Applications

    {% include cardv2.html @@ -37,5 +37,5 @@ web=""

    Worth Mentioning

      -
    • Wire Pro - Paid team communication with E2EE. Untested
      • +
    • Wire Pro - Paid team communication with E2EE. Untested