From 4c4ec03375e993de6af2d9bdd285c01d1958513e Mon Sep 17 00:00:00 2001
From: Yorick Barbanneau <ephase@xieme-art.org>
Date: Wed, 4 Apr 2018 22:44:38 +0200
Subject: [PATCH] Reworked FW_Hosts module and files

---
 modules.d/{BlockHosts.conf => FW_Hosts.conf}           |  2 +-
 modules.d/{BlockHosts => FW_Hosts}/base.txt            | 10 +++++-----
 modules.d/{BlockHosts => FW_Hosts}/mcafee.txt          |  0
 .../{BlockHosts => FW_Hosts}/ms-skype-messenger.txt    |  3 +--
 4 files changed, 7 insertions(+), 8 deletions(-)
 rename modules.d/{BlockHosts.conf => FW_Hosts.conf} (85%)
 rename modules.d/{BlockHosts => FW_Hosts}/base.txt (97%)
 rename modules.d/{BlockHosts => FW_Hosts}/mcafee.txt (100%)
 rename modules.d/{BlockHosts => FW_Hosts}/ms-skype-messenger.txt (93%)

diff --git a/modules.d/BlockHosts.conf b/modules.d/FW_Hosts.conf
similarity index 85%
rename from modules.d/BlockHosts.conf
rename to modules.d/FW_Hosts.conf
index 195bd0f..f65f46a 100644
--- a/modules.d/BlockHosts.conf
+++ b/modules.d/FW_Hosts.conf
@@ -10,7 +10,7 @@
 		},
         {
             "action" : "BlockHost",
-            "file" : "ms-skype-messeger.txt"
+            "file" : "ms-skype-messenger.txt"
         }
 	]
 }
diff --git a/modules.d/BlockHosts/base.txt b/modules.d/FW_Hosts/base.txt
similarity index 97%
rename from modules.d/BlockHosts/base.txt
rename to modules.d/FW_Hosts/base.txt
index 7480605..451d401 100644
--- a/modules.d/BlockHosts/base.txt
+++ b/modules.d/FW_Hosts/base.txt
@@ -29,7 +29,6 @@ a23-67-60-97.deploy.static.akamaitechnologies.com
 a23-9-123-27.deploy.static.akamaitechnologies.com
 a569.g.akamai.net
 activity.windows.com
-ad.doubleclick.net
 ads.msn.com
 ads.msn.com.nsatc.net
 ads1.msads.net
@@ -66,7 +65,10 @@ e2236.g.akamaiedge.net
 e7173.g.akamaiedge.net
 e8011.g.akamaiedge.net
 fe1.update.microsoft.com.akadns.net
-fe2.update.microsoft.com.akadns.net
+
+#Problem with windows update
+#fe2.update.microsoft.com.akadns.net
+ 
 fe3.delivery.dsp.mp.microsoft.com.nsatc.net
 feedback.microsoft-hohm.com
 feedback.search.microsoft.com
@@ -138,13 +140,11 @@ survey.watson.microsoft.com
 t.urs.microsoft.com.nsatc.net
 telecommand.telemetry.microsoft.com
 telemetry.appex.bing.net
-telemetry.appex.bing.net:443
 telemetry.appex.search.prod.ms.akadns.net
 telemetry.microsoft.com
 telemetry.urs.microsoft.com
 tunnel.cfw.trustedsource.org
 uci.officeapps.live.com
-updatekeepalive.mcafee.com
 urs.smartscreen.microsoft.com
 v10.vortex-win.data.microsoft.com
 vortex-sandbox.data.glbdns2.microsoft.com
@@ -158,4 +158,4 @@ watson.telemetry.microsoft.com
 wes.df.telemetry.microsoft.com
 win10.ipv6.microsoft.com
 www.msftconnecttest.com
-www.msftncsi.com
+www.msftncsi.com
\ No newline at end of file
diff --git a/modules.d/BlockHosts/mcafee.txt b/modules.d/FW_Hosts/mcafee.txt
similarity index 100%
rename from modules.d/BlockHosts/mcafee.txt
rename to modules.d/FW_Hosts/mcafee.txt
diff --git a/modules.d/BlockHosts/ms-skype-messenger.txt b/modules.d/FW_Hosts/ms-skype-messenger.txt
similarity index 93%
rename from modules.d/BlockHosts/ms-skype-messenger.txt
rename to modules.d/FW_Hosts/ms-skype-messenger.txt
index 9acce47..2cd994b 100644
--- a/modules.d/BlockHosts/ms-skype-messenger.txt
+++ b/modules.d/FW_Hosts/ms-skype-messenger.txt
@@ -17,10 +17,9 @@ live.rads.msn.com
 m.hotmail.com
 mscrl.microsoft.com
 msnbot-65-55-108-23.search.msn.com
-preview.msn.com
 rad.live.com
 rad.msn.com
 rpt.msn.com
 s.gateway.messenger.live.com
 otf.msn.com
-ui.skype.com
+ui.skype.com
\ No newline at end of file