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/_includes/nav.html b/_includes/nav.html index d167c0db..255a1bcd 100644 --- a/_includes/nav.html +++ b/_includes/nav.html @@ -49,14 +49,12 @@ {% t software.email_clients %} {% t software.file_encryption %} {% t software.file_sharing %} - {% t software.im %} - {% t software.team_chat %} {% t software.password_managers %} {% t software.productivity %} + {% t software.rtc %} {% t software.file_sync %} {% t software.networks %} {% t software.cloud %} - {% t software.voip %}
  • 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

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