Skip to content

Commit

Permalink
Fix VPN redirects (Fixes #13460)
Browse files Browse the repository at this point in the history
  • Loading branch information
nathan-barrett committed Oct 25, 2023
1 parent a987aab commit e0e1edc
Show file tree
Hide file tree
Showing 26 changed files with 982 additions and 13 deletions.
6 changes: 1 addition & 5 deletions bedrock/products/redirects.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,7 @@
redirectpatterns = (
# Issue 10335
redirect(r"^vpn/?$", "products.vpn.landing"),
# Issue 12937 -
redirect(r"^products/vpn/more/what-is-an-ip-address/$", "/products/vpn/resource-center/what-is-an-ip-address/"),
redirect(r"^products/vpn/more/what-is-a-vpn/$", "/products/vpn/resource-center/what-is-a-vpn/"),
redirect(r"^products/vpn/more/vpn-or-proxy/$", "/products/vpn/resource-center/the-difference-between-a-vpn-and-a-web-proxy/"),
redirect(r"^products/vpn/more/when-to-use-a-vpn/$", "/products/vpn/resource-center/5-reasons-you-should-use-a-vpn/"),
# Issue 12937
redirect(r"^products/vpn/more/why-mozilla-vpn/$", "products.vpn.landing"),
redirect(r"^products/vpn/more/do-i-need-a-vpn/$", "/products/vpn/resource-center/do-you-need-a-vpn-at-home-here-are-5-reasons-you-might/"),
redirect(r"^products/vpn/more/what-is-a-vpn-v2/$", "/products/vpn/resource-center/what-is-a-vpn/"),
Expand Down
66 changes: 66 additions & 0 deletions bedrock/products/templates/products/vpn/more/base-article.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
{#
This Source Code Form is subject to the terms of the Mozilla Public
License, v. 2.0. If a copy of the MPL was not distributed with this
file, You can obtain one at https://mozilla.org/MPL/2.0/.
#}

{% from "products/vpn/includes/macros.html" import vpn_hero, vpn_nav_cta_link, vpn_content_block, with context %}

{% extends "products/vpn/base.html" %}

{% block page_css %}
{{ css_bundle('protocol-article') }}
{{ css_bundle('mozilla-vpn-article') }}
{% endblock %}

{# {% block site_header %}
{% with
custom_nav_cta=vpn_nav_cta_link()
%}
{% include 'includes/protocol/navigation/navigation.html' %}
{% endwith %}
{% endblock %}

{% block sub_navigation %}
{% include 'products/vpn/includes/subnav-more.html' %}
{% endblock %} #}

{% block content %}
{% block hero %}
{% call vpn_hero(
heading=ftl('vpn-shared-product-name'),
subheading=self.page_title(),
desc=self.page_desc()
) %}
<div class="vpn-hero-cta">
<p><a class="mzp-c-button mzp-t-xl" href="{{ url('products.vpn.landing') }}#pricing">{{ ftl('vpn-shared-subscribe-link') }}</a></p>
<p class="guarantee-copy">
<a href="{{ url('products.vpn.landing') }}#faq-refunds">{{ ftl('vpn-shared-money-back-guarantee') }}</a>
</p>
</div>
{% endcall %}
{% endblock %}

<div class="mzp-l-content mzp-t-content-md">
<article class="mzp-c-article">
{% block article %}{% endblock %}
</article>
</div>

<div class="mzp-l-content mzp-t-content-lg">
{% call vpn_content_block(
class_name='t-highlight t-center'
) %}
<h2 class="mzp-c-wordmark mzp-t-wordmark-md mzp-t-product-vpn">{{ ftl('vpn-shared-product-name') }}</h2>
<h3 class="vpn-content-well-title">{{ ftl('vpn-shared-subscribe-link') }}</h3>
<div class="vpn-content-well-desc">
<p><a class="mzp-c-button mzp-t-xl" href="{{ url('products.vpn.landing') }}#pricing">{{ ftl('vpn-shared-platform-cta-button') }}</a></p>
<p class="guarantee-copy"><a href="{{ url('products.vpn.landing') }}#faq-refunds">{{ ftl('vpn-shared-money-back-guarantee') }}</a></p>
</div>
{% endcall %}
</div>
{% endblock %}

{% block js %}
{{ js_bundle('mozilla-vpn-article') }}
{% endblock %}
79 changes: 79 additions & 0 deletions bedrock/products/templates/products/vpn/more/do-i-need.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
{#
This Source Code Form is subject to the terms of the Mozilla Public
License, v. 2.0. If a copy of the MPL was not distributed with this
file, You can obtain one at https://mozilla.org/MPL/2.0/.
#}

{% extends "products/vpn/more/base-article.html" %}

{% block page_css %}
{{ css_bundle('mozilla-vpn-info') }}
{% endblock %}

{% block canonical_urls %}
<meta name="robots" content="noindex,follow">{% endblock %}

{% block page_title %}Do I need a VPN?{% endblock page_title%}
{% block page_desc %}
A VPN will come in handy in ways that you might not have considered. Close the gap in your online security with Mozilla
VPN.
{% endblock page_desc %}

{% set source = "?source=vpn-info-do-i-need" %}

{% block article %}

<h3>If you use the Internet, Mozilla VPN can make you more secure</h3>
<p>Do you use the Internet? Since you’re reading this, let’s assume you do. If you use the Internet to do anything
sensitive or personal—like checking your bank account, using social media, or shopping online — <strong>Mozilla VPN
will help you protect yourself from bad actors like hackers and online trackers.</strong> Mozilla VPN is easy to
use, secure, and
is backed by our over 20-year <a href="{{ url('mozorg.about.history')}}">track record</a> of building products that
put people and
privacy first, unlike other VPN providers that may sell your data.</p>
<p>Anyone who uses the Internet to do anything important or personal should use Mozilla VPN. Since public WiFi
networks are generally higher risk, it may not be not safe to use them to do things like check your Instagram or
Facebook accounts, reply to emails, or access sensitive accounts like your bank. Mozilla VPN allows anyone using
almost
any device to protect their location and online traffic from being tracked or monitored.
</p>
<aside class="vpn-cta">
<a href="{{ url('products.vpn.landing') }}{{ source }}#pricing" class="mzp-c-button mzp-t-product mzp-t-xl">
{{ ftl('vpn-shared-subscribe-link') }}
</a>
</aside>

<h3 class="c-section-heading">When would I use a VPN?</h3>
<p>Since Mozilla VPN protects the traffic of your entire device, you can flip the toggle and go about your business
online,
no matter where you are. It’s that easy. Connecting to a public WiFi network can be convenient, like when you’re
without internet service or can’t get any bars
on your phone. <strong>But it’s impossible to be sure that someone else isn’t connecting to the same network to snoop
on what
you’re doing.</strong></p>
<p>It can also be hard to tell which public WiFi networks are legitimate, and which are “spoofs” that only appear to be
officially provided by the location or space. Mozilla VPN helps stop that kind of snooping by encrypting your online
activity, making you and the site you’re visiting the only ones able to see what you’re up to. With encryption, it is
significantly more difficult to spy on your activity.</p>
<p>When you’re at home, the risk of bad actors showing up on your home network is lower. But <strong>your internet
service provider
(ISP) can track and share your online activities</strong> because all the data that you access on the web is routed
through your
ISP’s network, some of which may not be encrypted. That’s why you still need a VPN even when you’re home.</p>
<p>Mozilla VPN can prevent ISPs from spying on you by encrypting your traffic — and hiding your location — no matter
where you
are.</p>

<h3 class="c-section-heading">What about free VPNs?</h3>
<p>In short, free VPNs are a lot like Facebook: if you’re not paying for the product, it’s because you ARE the product.
Free VPNs may help you keep your data safe from people on local networks, but in return for the free service, they may
sell your data to companies looking to advertise to you — it’s a tradeoff that really isn’t worth it for the truly
Internet-savvy. If you value your personal data and online security, Mozilla VPN is the way to go — plus, you’re
contributing to our mission to make the Internet a safe and secure place for everyone.</p>
<aside class="vpn-cta">
<a href="{{ url('products.vpn.landing') }}{{ source }}#pricing" class="mzp-c-button mzp-t-product mzp-t-xl">
{{ ftl('vpn-shared-subscribe-link') }}
</a>
</aside>

{% endblock article %}
71 changes: 71 additions & 0 deletions bedrock/products/templates/products/vpn/more/ip-address.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
{#
This Source Code Form is subject to the terms of the Mozilla Public
License, v. 2.0. If a copy of the MPL was not distributed with this
file, You can obtain one at https://mozilla.org/MPL/2.0/.
#}

{% extends "products/vpn/more/base-article.html" %}

{% block page_title %}{{ ftl('vpn-ip-address-what-is-an-ip-address') }}{% endblock %}
{% block page_desc %}{{ ftl('vpn-ip-address-mozilla-answers-all-of') }}{% endblock %}

{% block article %}
<p class="mzp-c-article-intro">{{ ftl('vpn-ip-address-every-time-you') }}</p>

<h3>{{ ftl('vpn-ip-address-what-is-an-ip-address') }}</h3>
<p>{{ ftl('vpn-ip-address-your-ip-address') }}</p>

<figure class="c-article-figure">
{{ resp_img(
url='img/products/vpn/more/ipaddress-example.jpg',
srcset={
'img/products/vpn/more/ipaddress-example-high-res.jpg': '2x'
},
optional_attributes = {
'alt': ftl('vpn-ip-address-an-example-of-an-ip'),
'width': '512',
'height': '202'
}
)}}
<figcaption>{{ ftl('vpn-ip-address-if-you-look-up-your') }}</figcaption>
</figure>

<h3>{{ ftl('vpn-ip-address-does-it-travel') }}</h3>
<p>{{ ftl('vpn-ip-address-no-your-ip-v2', fallback='vpn-ip-address-no-your-ip') }}</p>

<h3>{{ ftl('vpn-ip-address-does-your-ip') }}</h3>
<p>{{ ftl('vpn-ip-address-yes-even-if') }}</p>

<h3>{{ ftl('vpn-ip-address-can-more-than') }}</h3>
<p>{{ ftl('vpn-ip-address-this-is-a') }}</p>

<figure class="c-article-figure">
{{ resp_img(
url='img/products/vpn/more/ipaddress-devices.jpg',
srcset= {
'img/products/vpn/more/ipaddress-devices.jpg': '2x'
},
optional_attributes = {
'alt': '',
'width': '700',
'height': '172'
}
) }}
</figure>

<h3>{{ ftl('vpn-ip-address-can-we-run') }}</h3>
<p>{{ ftl('vpn-ip-address-when-the-internet', sr='https://www.siliconrepublic.com/comms/ip-addresses-running-out',
variety='https://variety.com/2019/digital/news/u-s-households-have-an-average-of-11-connected-devices-and-5g-should-push-that-even-higher-1203431225/')
}}</p>
<p>{{ ftl('vpn-ip-address-we-now-have') }}</p>

<h3>{{ ftl('vpn-ip-address-should-you-hide') }}</h3>
<p>{{ ftl('vpn-ip-address-you-dont-need',
congress='https://blog.mozilla.org/en/mozilla/internet-policy/u-s-broadband-privacy-rules-will-fight-protect-user-privacy/',
doh='https://support.mozilla.org/kb/firefox-dns-over-https', firefox=url('firefox.new')) }}</p>
<p>{{ ftl('vpn-ip-address-there-are-also', url=url('products.vpn.more.when-to-use')) }}</p>

<h3>{{ ftl('vpn-ip-address-how-do-you') }}</h3>
<p>{{ ftl('vpn-ip-address-a-vpn-is-v2', fallback='vpn-ip-address-a-vpn-is', vpn=url('products.vpn.more.when-to-use'),
mozvpn=url('products.vpn.landing'), countries=settings.VPN_CONNECT_COUNTRIES) }}</p>
{% endblock %}
69 changes: 69 additions & 0 deletions bedrock/products/templates/products/vpn/more/vpn-or-proxy.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
{#
This Source Code Form is subject to the terms of the Mozilla Public
License, v. 2.0. If a copy of the MPL was not distributed with this
file, You can obtain one at https://mozilla.org/MPL/2.0/.
#}

{% extends "products/vpn/more/base-article.html" %}

{% block page_title %}{{ ftl('vpn-or-proxy-the-difference-between') }}{% endblock %}
{% block page_desc %}{{ ftl('vpn-or-proxy-vpns-and-proxies-are') }}{% endblock %}

{% set utm_params = 'utm_source=www.mozilla.org-vpn-or-proxy&utm_medium=referral&utm_campaign=products-vpn-more' %}

{% block article %}
<p class="mzp-c-article-intro">{{ ftl('vpn-or-proxy-virtual-private-networks') }}</p>

<h3>{{ ftl('vpn-or-proxy-stop-isps-from') }}</h3>
<p>{{ ftl('vpn-or-proxy-when-you-use-firefox', firefox=url('firefox.new'),
etp='https://blog.mozilla.org/products/firefox/control-trackers-with-firefox/?utm_source=www.mozilla.org-vpn-or-proxy&utm_medium=referral&utm_campaign=products-vpn-more',
trackers='https://blog.mozilla.org/internet-culture/mozilla-explains/what-is-a-web-tracker/?utm_source=www.mozilla.org-vpn-or-proxy&utm_medium=referral&utm_campaign=products-vpn-more')
}}</p>
<p>{{ ftl('vpn-or-proxy-because-your-internet') }}</p>
<p>{{ ftl('vpn-or-proxy-isps-can-use') }}</p>

<h3>{{ ftl('vpn-or-proxy-when-should-you') }}</h3>
<p>{{ ftl('vpn-or-proxy-vpns-and-secure') }}</p>

<figure class="c-article-figure">
{{ resp_img(
url='img/products/vpn/more/vpn-proxy.png',
srcset={
'img/products/vpn/more/vpn-proxy-high-res.png': '2x'
},
optional_attributes={
'alt': '',
'width': '960',
'height': '866'
}
)}}
</figure>

<h3>{{ ftl('vpn-or-proxy-secure-web-proxy') }}</h3>
<p>{{ ftl('vpn-or-proxy-a-secure-web') }}</p>
<p>{{ ftl('vpn-or-proxy-a-proxy-is-useful',
url='https://www.consumer.ftc.gov/articles/0014-tips-using-public-wi-fi-networks') }}</p>
<p>{{ ftl('vpn-or-proxy-firefox-private-network',
fpn='https://fpn.firefox.com/?utm_source=www.mozilla.org-vpn-or-proxy&utm_medium=referral&utm_campaign=products-vpn-more')
}}</p>

<h3>{{ ftl('vpn-or-proxy-vpns-devicelevel-protection') }}</h3>
<p>{{ ftl('vpn-or-proxy-vpns-do-more') }}</p>
<p>{{ ftl('vpn-or-proxy-a-vpn-works') }}</p>

<ol class="mzp-u-list-styled">
<li>{{ ftl('vpn-or-proxy-concealing-your-ip') }}</li>
<li>{{ ftl('vpn-or-proxy-encrypting-your-traffic') }}</li>
</ol>

<p>{{ ftl('vpn-or-proxy-a-vpn-also', mozvpn=url('products.vpn.landing'), countries=settings.VPN_CONNECT_COUNTRIES) }}
</p>

<h3>{{ ftl('vpn-or-proxy-choose-a-trustworthy') }}</h3>
<p>{{ ftl('vpn-or-proxy-the-most-important',
cnet='https://www.cnet.com/news/why-you-should-be-skeptical-about-a-vpns-no-logs-claims/',
pcmag='https://www.pcmag.com/news/7-vpn-services-found-recording-user-logs-despite-no-log-pledge') }}</p>
<p>{{ ftl('vpn-or-proxy-weve-done-the', mozvpn=url('products.vpn.landing'),
fpn='https://fpn.firefox.com/?utm_source=www.mozilla.org-vpn-or-proxy&utm_medium=referral&utm_campaign=products-vpn-more',
principles=url('privacy.principles'), mission=url('mozorg.mission')) }}</p>
{% endblock %}
77 changes: 77 additions & 0 deletions bedrock/products/templates/products/vpn/more/what-is-a-vpn-v2.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
{#
This Source Code Form is subject to the terms of the Mozilla Public
License, v. 2.0. If a copy of the MPL was not distributed with this
file, You can obtain one at https://mozilla.org/MPL/2.0/.
#}

{% extends "products/vpn/more/base-article.html" %}

{% block page_css %}
{{ css_bundle('mozilla-vpn-info') }}
{% endblock %}
{% block canonical_urls %}
<meta name="robots" content="noindex,follow">{% endblock %}

{% block page_title %}What is a VPN?{% endblock page_title %}
{% block page_desc %}
Get answers to common questions about VPNs so you feel informed on what they do, when to use one, and why.
{% endblock page_desc %}

{% set source = "?source=vpn-info-what-is-a-vpn" %}

{% block article %}

<h3>Protect your identity online with Mozilla VPN</h3>
<p>With Mozilla VPN, you can surf, stream, game, and get work done while maintaining your privacy online. Whether you’re
traveling, using public WiFi, or simply looking for more online security, we’ll always put your privacy first.</p>

<h3 class="c-section-heading">What is Mozilla VPN?</h3>
<p>A VPN, or Virtual Private Network, is a tool that allows you to access the internet securely wherever you are. Tools
like Mozilla VPN are available to anyone who wants to protect their connection to the internet, especially when it’s
over insecure networks like public WiFi. If you don’t want people being able to see where you’re located when you’re
online, you need a VPN. It’s even useful on a home network — without a VPN, websites and your Internet Service
Provider
can see your Internet traffic, and even the sites you’re browsing.</p>

<h3 class="c-section-heading">How does Mozilla VPN work?</h3>
<p>Mozilla VPN helps protect your data online by creating a secure “tunnel” between your device and the VPN or site
you’re
visiting. This “tunnel” protects you in two key ways:</p>
<ul class="mzp-u-list-styled">
<li>When enabled, this tunnel will encrypt the traffic — in other words, encode your activity on the Internet —
between you and
Mozilla VPN so that no one on your local WiFi can see it.</li>
<li>It’ll handle traffic from all apps and software running on your device, so you can browse and communicate freely
over a
secure private network connection. <strong>Without a VPN, your network traffic could be monitored by someone on the
same network
as your device.</strong></li>
</ul>
<p>You can also avoid trackers with VPN. How does this help you? Well, it can help cut down on intrusive advertising —
you
know, where you click a link once and all of a sudden it feels like you’re getting bombarded by ads that know
everything
about you. <strong>VPN can help you cut down on that terrible advertising.</strong></p>
<p>Mozilla VPN will also hide your IP, or Internet Protocol, address, which can help hide your location and protect your
identity. A VPN provider typically offers a number of connection gateways in different locations, which allows you to
use an IP address from a location different from your own.</p>
<p>That way, whatever site or service you’re connecting to sees the VPN’s IP, not your actual IP address, as the source
of
your traffic. Mozilla VPN, for example, routes your traffic through a secure server and lets you <strong>choose from
more than
30 countries through which you can route your traffic.</strong></p>
<p>In short, Mozilla VPN is a tool that allows you to take back control of your online activity from corporations,
hackers,
and thieves who would love to get a chance to steal your data or your identity, or otherwise compromise your online
life. By subscribing to Mozilla VPN, you’re also supporting our mission as a company to make the Internet a better
place
for all:</p>
<p><strong><a href="{{ url('mozorg.about.manifesto') }}#principles-04">Principle 4:</a> Individuals’ security and
privacy on the internet are fundamental and must not be treated as optional.</strong></p>
<p>Want to protect your online life? Get Mozilla VPN today.</p>
<aside class="vpn-cta">
<a href="{{ url('products.vpn.landing') }}{{ source }}#pricing" class="mzp-c-button mzp-t-product mzp-t-xl">
{{ ftl('vpn-shared-subscribe-link') }}
</a>
</aside>
{% endblock article %}
Loading

0 comments on commit e0e1edc

Please sign in to comment.