Merge branch 'pr/1136'

.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

_includes/nav.html

@@ -49,14 +49,12 @@
             <a class="dropdown-item" href="/software/email/"><i class="fas fa-envelope fa-fw"></i> Email Clients</a>
             <a class="dropdown-item" href="/software/encryption-tools/"><i class="fas fa-lock fa-fw"></i> File Encryption</a>
             <a class="dropdown-item" href="/software/file-sharing/"><i class="fas fa-file-export fa-fw"></i> File Sharing</a>
-            <a class="dropdown-item" href="/software/im/"><i class="fab fa-telegram-plane fa-fw"></i> Instant Messenger</a>
-            <a class="dropdown-item" href="/software/teamchat/"><i class="fas fa-users fa-fw"></i> Team chat</a>
             <a class="dropdown-item" href="/software/passwords/"><i class="fas fa-user-lock fa-fw"></i> Password Manager</a>
             <a class="dropdown-item" href="/software/productivity/"><i class="fas fa-briefcase fa-fw"></i> Productivity Tools</a>
+            <a class="dropdown-item" href="/software/real-time-communication/"><i class="fab fa-telegram-plane fa-fw"></i> Real-Time Communication</a>
             <a class="dropdown-item" href="/software/file-sync/"><i class="fas fa-copy fa-fw"></i> Secure File Sync</a>
             <a class="dropdown-item" href="/software/networks/"><i class="fas fa-user-secret fa-fw"></i> Self-contained Networks</a>
             <a class="dropdown-item" href="/software/cloud/"><i class="fas fa-hdd fa-fw"></i> Self-Hosted Cloud Server</a>
-            <a class="dropdown-item" href="/software/voip/"><i class="fas fa-phone fa-fw"></i> Video & Voice Messenger</a>
           </div>
         </li>
         <li class="nav-item dropdown">

_includes/sections/teamchat.html

@@ -1,7 +1,7 @@
-<h1 id="teamchat" class="anchor"><a href="#teamchat"><i class="fas fa-link anchor-icon"></i></a> Team chat applications where everything is end-to-end encrypted or under the control of your team administrator</h1>
+<h1 id="teamchat" class="anchor"><a href="#teamchat"><i class="fas fa-link anchor-icon"></i></a> Team Chat Applications</h1>
 
 <div class="alert alert-warning" role="alert">
-        <strong>If your project currently uses a team chat like <a href="https://web.archive.org/web/20171029114027/https://feedback.discordapp.com/forums/326712-discord-dream-land/suggestions/17094256-implement-whispersystems-encryption-for-voice-and">Discord</a> or <a href="https://drewdevault.com/2015/11/01/Please-stop-using-slack.html">Slack</a> you should pick an alternative here.</strong>
+        <strong>If your project or organization currently uses a team chat like <a href="https://web.archive.org/web/20171029114027/https://feedback.discordapp.com/forums/326712-discord-dream-land/suggestions/17094256-implement-whispersystems-encryption-for-voice-and">Discord</a> or <a href="https://drewdevault.com/2015/11/01/Please-stop-using-slack.html">Slack</a> you should pick an alternative here.</strong>
 </div>
 
 {% include cardv2.html
@@ -37,5 +37,5 @@ web=""
 <h3>Worth Mentioning</h3>
 
 <ul>
-  <li><a href="https://wire.com/en/products/pro-secure-team-collaboration/">Wire Pro</a> - Paid team communication with E2EE. <span class="badge badge-warning" data-toggle="tooltip" title="The Privacytools.io team has no experience with Wire Pro, while we can recommend the free version.">Untested<i class="far fa-question-circle"></i></span></li>
+  <li><a href="https://wire.com/en/products/pro-secure-team-collaboration/">Wire Pro</a> - Paid team communication with E2EE. <span class="badge badge-warning" data-toggle="tooltip" title="While the free edition of Wire is a recommended platform, we have not tested the Pro edition.">Untested<i class="far fa-question-circle"></i></span></li>
 </ul>

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;

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";

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/;
+}

pages/software/im.html

@@ -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 %}

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 %}
+
+<hr/>
+
+{% include sections/voice-video-messenger.html %}
+
+<hr/>
+
+{% include sections/teamchat.html %}

pages/software/teamchat.html

@@ -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 %}

pages/software/video-voice.html

@@ -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 %}