From d485ad28d0992b4f6e8dbfbed448614b2083e943 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Tue, 31 Jul 2018 09:56:54 +0100
Subject: [PATCH] Don't need the incoming
---
doc/EN/mobile.org | 1 -
src/freedombone-utils-firewall | 36 ++++++++++++++++------------------
website/EN/mobile.html | 3 +--
3 files changed, 18 insertions(+), 22 deletions(-)
diff --git a/doc/EN/mobile.org b/doc/EN/mobile.org
index 8b8994990..f03c6a796 100644
--- a/doc/EN/mobile.org
+++ b/doc/EN/mobile.org
@@ -97,7 +97,6 @@ Now edit the hosts file which was pulled and append:
127.0.0.1 google-analytics.com
127.0.0.1 ssl.google-analytics.com
127.0.0.1 telemetry.mozilla.org
-127.0.0.1 incoming.telemetry.mozilla.org
#+end_src
Then upload the hosts file back again with:
diff --git a/src/freedombone-utils-firewall b/src/freedombone-utils-firewall
index 837d5f569..7e907164d 100755
--- a/src/freedombone-utils-firewall
+++ b/src/freedombone-utils-firewall
@@ -54,8 +54,7 @@ function block_firefox_telemetry {
# Within firefox source code see submit_telemetry_data.py
if ! grep -q 'telemetry.mozilla' /etc/hosts; then
- echo '127.0.0.1 telemetry.mozilla.org' >> /etc/hosts
- echo '127.0.0.1 incoming.telemetry.mozilla.org' >> /etc/hosts
+ echo '127.0.0.1 telemetry.mozilla.org' >> /etc/hosts
fi
if grep -q "$FIREFOX_TELEMETRY_IP" /etc/firewall.conf; then
@@ -361,29 +360,28 @@ function mesh_firewall {
MESH_FIREWALL_SCRIPT=${rootdir}/usr/bin/mesh-firewall
if ! grep -q 'telemetry.mozilla' "${rootdir}/etc/hosts"; then
- echo '127.0.0.1 telemetry.mozilla.org' >> "${rootdir}/etc/hosts"
- echo '127.0.0.1 incoming.telemetry.mozilla.org' >> "${rootdir}/etc/hosts"
+ echo '127.0.0.1 telemetry.mozilla.org' >> "${rootdir}/etc/hosts"
fi
if ! grep -q 'facebook' "${rootdir}/etc/hosts"; then
- { echo '127.0.0.1 www.facebook.com';
- echo '127.0.0.1 facebook.com';
- echo '127.0.0.1 static.ak.fbcdn.net';
- echo '127.0.0.1 www.static.ak.fbcdn.net';
- echo '127.0.0.1 login.facebook.com';
- echo '127.0.0.1 www.login.facebook.com';
- echo '127.0.0.1 fbcdn.net';
- echo '127.0.0.1 www.fbcdn.net';
- echo '127.0.0.1 fbcdn.com';
- echo '127.0.0.1 www.fbcdn.com';
- echo '127.0.0.1 static.ak.connect.facebook.com';
- echo '127.0.0.1 www.static.ak.connect.facebook.com'; } >> "${rootdir}/etc/hosts"
+ { echo '127.0.0.1 www.facebook.com';
+ echo '127.0.0.1 facebook.com';
+ echo '127.0.0.1 static.ak.fbcdn.net';
+ echo '127.0.0.1 www.static.ak.fbcdn.net';
+ echo '127.0.0.1 login.facebook.com';
+ echo '127.0.0.1 www.login.facebook.com';
+ echo '127.0.0.1 fbcdn.net';
+ echo '127.0.0.1 www.fbcdn.net';
+ echo '127.0.0.1 fbcdn.com';
+ echo '127.0.0.1 www.fbcdn.com';
+ echo '127.0.0.1 static.ak.connect.facebook.com';
+ echo '127.0.0.1 www.static.ak.connect.facebook.com'; } >> "${rootdir}/etc/hosts"
fi
if ! grep -q 'google' "${rootdir}/etc/hosts"; then
- { echo '127.0.0.1 www.google-analytics.com';
- echo '127.0.0.1 google-analytics.com';
- echo '127.0.0.1 ssl.google-analytics.com'; } >> "${rootdir}/etc/hosts"
+ { echo '127.0.0.1 www.google-analytics.com';
+ echo '127.0.0.1 google-analytics.com';
+ echo '127.0.0.1 ssl.google-analytics.com'; } >> "${rootdir}/etc/hosts"
fi
{ echo '#!/bin/bash';
diff --git a/website/EN/mobile.html b/website/EN/mobile.html
index a8efea9ca..37a147c69 100644
--- a/website/EN/mobile.html
+++ b/website/EN/mobile.html
@@ -4,7 +4,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
<head>
<title>Freedombone</title>
-<!-- 2018-06-24 Sun 23:03 -->
+<!-- 2018-07-31 Tue 09:56 -->
<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
<meta name="generator" content="Org-mode" />
<meta name="author" content="Bob Mottram" />
@@ -323,7 +323,6 @@ Now edit the hosts file which was pulled and append:
127.0.0.1 google-analytics.com
127.0.0.1 ssl.google-analytics.com
127.0.0.1 telemetry.mozilla.org
-127.0.0.1 incoming.telemetry.mozilla.org
</pre>
</div>
--
GitLab