No commit message

ZenixYang · Jun 25, 2017 · 15b5b67 · 15b5b67
1 parent 6f566c7
commit 15b5b67
Show file tree

Hide file tree

Showing 11 changed files with 68 additions and 39 deletions.
diff --git a/FQ b/FQ
@@ -1,4 +1,4 @@
-## 2017-06-22 06:53:40
+## 2017-06-26 00:26:10
 ## https://github.com/sy618/hosts
 157.240.7.35 0-edge-chat.facebook.com
 157.240.7.35 0-edge-chat.messenger.com
@@ -581,7 +581,7 @@
 219.76.4.76 drive8.google.com
 219.76.4.76 drive9.google.com
 219.76.4.76 drivenotepad.appspot.com
-219.76.4.75 dropbox.com
+162.125.248.1 dropbox.com
 46.51.218.82 duckduckgo.com
 119.161.14.18 e.yimg.com
 219.76.4.76 earth-api-samples.googlecode.com
@@ -983,6 +983,7 @@
 106.10.199.10 hk.news.yahoo.com
 106.10.138.240 hk.yahoo.com
 106.10.136.146 hsrd.yahoo.com
+216.18.168.28 hubt.pornhub.com
 104.20.83.194 i.apkpure.com
 103.245.222.193 i.imgur.com
 157.240.7.52 i.instagram.com
@@ -1105,6 +1106,7 @@
 208.80.154.224 ja.m.wikipedia.org
 64.233.188.121 javascript-blocker.toggleable.com
 219.76.4.76 jmt0.google.com
+31.192.120.36 jp.pornhub.com
 219.76.4.76 jp.youtube.com
 151.101.77.164 js.nyt.com
 151.101.77.164 json8.nytimes.com
@@ -1390,6 +1392,7 @@
 219.76.4.76 polymer-project.org
 64.233.188.109 pop.gmail.com
 64.233.188.16 pop.googlemail.com
+31.192.120.36 pornhub.com
 157.240.7.35 portal.fb.com
 151.101.76.84 post.pinterest.com
 219.76.4.76 pr.vp.video.l.google.com
@@ -1503,6 +1506,7 @@
 219.76.4.76 security.google.com
 219.76.4.76 servicemanagement.clients6.google.com
 219.76.4.76 services.google.com
+67.22.32.162 services.pornhub.com
 162.125.3.6 showbox.dropbox.com
 119.81.248.34 single.upsight-api.com
 219.76.4.76 sites.google.com
@@ -1692,7 +1696,7 @@
 219.76.4.76 uk.youtube.com
 119.161.14.18 up.flickr.com
 151.101.77.164 up.nytimes.com
-54.192.212.38 update.getsync.com
+52.20.43.156 update.getsync.com
 219.76.4.76 update.googleapis.com
 107.152.25.197 upload.box.com
 219.76.4.76 upload.client.google.com
@@ -2077,6 +2081,7 @@
 219.76.4.76 www.panoramio.com
 151.101.76.84 www.pinterest.com
 219.76.4.76 www.polymer-project.org
+31.192.120.36 www.pornhub.com
 219.76.4.76 www.recaptcha.net
 104.25.32.112 www.t66y.com
 219.76.4.76 www.teachparentstech.org

diff --git a/FQ1 b/FQ1
@@ -1,4 +1,4 @@
-## 2017-06-22 06:53:40
+## 2017-06-26 00:26:10
 ## https://github.com/sy618/hosts
 157.240.7.35 0-edge-chat.facebook.com
 157.240.7.35 0-edge-chat.messenger.com
@@ -581,7 +581,7 @@
 216.58.200.33 drive8.google.com
 216.58.200.33 drive9.google.com
 216.58.200.33 drivenotepad.appspot.com
-219.76.4.75 dropbox.com
+162.125.248.1 dropbox.com
 46.51.218.82 duckduckgo.com
 119.161.14.18 e.yimg.com
 216.58.200.33 earth-api-samples.googlecode.com
@@ -983,6 +983,7 @@
 106.10.199.10 hk.news.yahoo.com
 106.10.138.240 hk.yahoo.com
 106.10.136.146 hsrd.yahoo.com
+216.18.168.28 hubt.pornhub.com
 104.20.83.194 i.apkpure.com
 103.245.222.193 i.imgur.com
 157.240.7.52 i.instagram.com
@@ -1105,6 +1106,7 @@
 208.80.154.224 ja.m.wikipedia.org
 64.233.188.121 javascript-blocker.toggleable.com
 216.58.200.33 jmt0.google.com
+31.192.120.36 jp.pornhub.com
 216.58.200.33 jp.youtube.com
 151.101.77.164 js.nyt.com
 151.101.77.164 json8.nytimes.com
@@ -1390,6 +1392,7 @@
 216.58.200.33 polymer-project.org
 64.233.188.109 pop.gmail.com
 64.233.188.16 pop.googlemail.com
+31.192.120.36 pornhub.com
 157.240.7.35 portal.fb.com
 151.101.76.84 post.pinterest.com
 216.58.200.33 pr.vp.video.l.google.com
@@ -1503,6 +1506,7 @@
 216.58.200.33 security.google.com
 216.58.200.33 servicemanagement.clients6.google.com
 216.58.200.33 services.google.com
+67.22.32.162 services.pornhub.com
 162.125.3.6 showbox.dropbox.com
 119.81.248.34 single.upsight-api.com
 216.58.200.33 sites.google.com
@@ -1692,7 +1696,7 @@
 216.58.200.33 uk.youtube.com
 119.161.14.18 up.flickr.com
 151.101.77.164 up.nytimes.com
-54.192.212.38 update.getsync.com
+52.20.43.156 update.getsync.com
 216.58.200.33 update.googleapis.com
 107.152.25.197 upload.box.com
 216.58.200.33 upload.client.google.com
@@ -2077,6 +2081,7 @@
 216.58.200.33 www.panoramio.com
 151.101.76.84 www.pinterest.com
 216.58.200.33 www.polymer-project.org
+31.192.120.36 www.pornhub.com
 216.58.200.33 www.recaptcha.net
 104.25.32.112 www.t66y.com
 216.58.200.33 www.teachparentstech.org

diff --git a/dnsmasq/dnsfq b/dnsmasq/dnsfq
@@ -1,4 +1,4 @@
-## 2017-06-23 00:09:18
+## 2017-06-26 00:25:16
 ## https://github.com/sy618/hosts
 # This work is licensed under a CC BY-NC 4.0 International License.
 # https://creativecommons.org/licenses/by-nc/4.0/deed.zh
@@ -214,9 +214,14 @@ address=/skyapi.onedrive.live.com/104.44.88.28
 address=/pinimg.com/151.101.76.84
 address=/pinterest.com/151.101.76.84
 
+## Pornhub
+address=/pornhub.com/31.192.120.36
+address=/services.pornhub.com/67.22.32.162
+address=/hubt.pornhub.com/216.18.168.28
+
 ## Resilio Sync
 address=/getsync.com/54.192.212.38
-#address=/update.getsync.com/34.192.28.55
+address=/update.getsync.com/52.20.43.156
 
 ## Rfi
 address=/cn.rfi.fr/203.198.20.177

diff --git a/dnsmasq/dnsfq1 b/dnsmasq/dnsfq1
@@ -1,4 +1,4 @@
-## 2017-06-23 00:09:18
+## 2017-06-26 00:25:16
 ## https://github.com/sy618/hosts
 # This work is licensed under a CC BY-NC 4.0 International License.
 # https://creativecommons.org/licenses/by-nc/4.0/deed.zh
@@ -133,12 +133,12 @@ address=/googlewave.com/216.58.200.33
 address=/googlezeitgeist.com/216.58.200.33
 address=/googlezip.net/216.58.200.33
 address=/gstatic.com/216.58.200.33
-#address=/gvt0.com/219.76.4.69
-#address=/gvt1.com/219.76.4.69
-#address=/gvt2.com/219.76.4.69
-server=/gvt0.com/208.67.222.222
-server=/gvt1.com/208.67.222.222
-server=/gvt2.com/208.67.222.222
+address=/gvt0.com/219.76.4.69
+address=/gvt1.com/219.76.4.69
+address=/gvt2.com/219.76.4.69
+#server=/gvt0.com/208.67.222.222
+#server=/gvt1.com/208.67.222.222
+#server=/gvt2.com/208.67.222.222
 address=/gwtproject.org/216.58.200.33
 address=/html5rocks.com/216.58.200.33
 address=/keyhole.com/216.58.200.33
@@ -166,10 +166,10 @@ address=/goo.gl/216.58.200.33
 #address=/android.clients.google.com/216.58.200.33
 #address=/gcm-http.googleapis.com/216.58.200.33
 #address=/mail.google.com/216.58.200.33
-server=/googlevideo.com/208.67.222.222
-#address=/googlevideo.com/219.76.4.69
-address=/redirector.googlevideo.com/216.58.200.33
-address=/manifest.googlevideo.com/216.58.200.33
+#server=/googlevideo.com/208.67.222.222
+address=/googlevideo.com/219.76.4.69
+#address=/redirector.googlevideo.com/216.58.200.33
+#address=/manifest.googlevideo.com/216.58.200.33
 #cn IP google
 #address=/dl.google.com/203.208.43.105
 #address=/redirector.gvt1.com/203.208.43.105
@@ -214,9 +214,14 @@ address=/skyapi.onedrive.live.com/104.44.88.28
 address=/pinimg.com/151.101.76.84
 address=/pinterest.com/151.101.76.84
 
+## Pornhub
+address=/pornhub.com/31.192.120.36
+address=/services.pornhub.com/67.22.32.162
+address=/hubt.pornhub.com/216.18.168.28
+
 ## Resilio Sync
 address=/getsync.com/54.192.212.38
-#address=/update.getsync.com/34.192.28.55
+address=/update.getsync.com/52.20.43.156
 
 ## Rfi
 address=/cn.rfi.fr/203.198.20.177

diff --git a/dnsmasq/dnsmasq.txt b/dnsmasq/dnsmasq.txt
@@ -10,7 +10,11 @@ dnsmasq功能很多，我们这里主要用来重定向、加快网络响应 和
 2 规则介绍
    2.1 自.由.上.网，享受无墙般体验。dnsmasq规则：
 https://raw.githubusercontent.com/sy618/hosts/master/dnsmasq/dnsfq
-这规则并不是万能的，目前仅解析部分高频使用的域名。若想完整访问外网请自行改用代理方式。
+默认使用了反向代理服务器中转流量实现谷歌服务，不喜勿用！其余的大部分域名都是指向官方IP。可能对电信宽带不友好，因为电信对出国线路特别挑剔。
+
+使用谷歌官方IP的规则：https://raw.githubusercontent.com/sy618/hosts/master/dnsmasq/dnsfq1
+直连谷歌，安全、速度快。不过可能部分视频播放不了，完全看运气了。
+
 
    2.2 屏蔽广告hosts规则
 可以使用vokins的专门去国内广告hosts

diff --git a/dnsmasq/dnsmasq说明.md b/dnsmasq/dnsmasq说明.md
@@ -1,22 +1,27 @@
 ## dnsmasq规则文件说明：
-* dnsfq：GFW翻墙专用。这个需要大家共同努力完善。（已支持汤不热网页视频播放）
+* dnsfq：GFW翻墙专用。这个需要大家共同努力完善。（支持汤不热网页视频播放）
 https://raw.githubusercontent.com/sy618/hosts/master/dnsmasq/dnsfq
+* dnsfq1：同上，备用数据。使用谷歌官方IP直连，速度快。
+https://raw.githubusercontent.com/sy618/hosts/master/dnsmasq/dnsfq1
 
 * ip.conf：屏蔽运营商劫持IP与一些广告IP（如何查看是否被劫持，使用nslookup命令测试一个不存在的域名，若返回IP就是劫持）
 https://raw.githubusercontent.com/vokins/yhosts/master/dnsmasq/ip.conf
 
 * union.conf：屏蔽广告家族
 https://raw.githubusercontent.com/vokins/yhosts/master/dnsmasq/union.conf
 
-* hosts：默认使用的是vokins的完整AD hosts，并删除了与dnsad重复的域名，需要配合dnsad一起使用。
-（如PC需看视频的，请自行更换为不带屏蔽视频广告的hosts.txt规则，https://raw.githubusercontent.com/vokins/yhosts/master/hosts.txt）
+* hosts：默认使用的是vokins的完整AD hosts。
+https://raw.githubusercontent.com/vokins/yhosts/master/hosts
+（PC用户，请自行更换为不带屏蔽视频广告的hosts.txt规则，https://raw.githubusercontent.com/vokins/yhosts/master/hosts.txt）
+
+## 推荐搭配方案：
+dnsfq + hosts + ip.conf + union.conf
 
 ## sh文件夹 是[华硕老毛子固件专用自动脚本](https://github.com/sy618/hosts/tree/master/dnsmasq/sh)
 * start.sh：立刻更新规则的脚本
 * setting.sh：初次运行的脚本，全自动修改配置与启用dnsmasq，只需要运行一次。
 * del.sh：删除所有更改，出问题了只需要运行一下即可还原
 
-### tomato 是[tomato固件专用脚本](https://github.com/sy618/hosts/tree/master/dnsmasq/tomato)
 
 ## [dnsmasq.txt](https://github.com/sy618/hosts/blob/master/dnsmasq/dnsmasq.txt )恩山论坛更详细的手动教程与自动脚本教程帖子。
 
diff --git a/dnsmasq/sh/setting.sh b/dnsmasq/sh/setting.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 ###此脚本配置只需运行一次###
 ###只适用老毛子华硕固件###
-###一键运行命令（初次运行）： mkdir -p /etc/storage/dnsmasq/dns;wget --no-check-certificate https://raw.githubusercontent.com/sy618/hosts/master/dnsmasq/sh/setting.sh -O /etc/storage/dnsmasq/dns/setting.sh;/bin/sh /etc/storage/dnsmasq/dns/setting.sh
+###一键运行命令（初次运行）： mkdir -p /etc/storage/dnsmasq/dns;wget --no-check-certificate https://raw.githubusercontent.com/sy618/hosts/master/dnsmasq/sh/setting.sh -O /etc/storage/dnsmasq/dns/setting.sh;sh /etc/storage/dnsmasq/dns/setting.sh
 echo "————————————开始脚本—————————————"
 echo " "
 echo "·········写入配置信息···········"

diff --git a/dnsmasq/sh/start.sh b/dnsmasq/sh/start.sh
@@ -5,7 +5,7 @@ mkdir -p /etc/storage/dnsmasq/dns/conf
 ##下载hosts规则
 cd /etc/storage/dnsmasq/dns
 wget --no-check-certificate https://raw.githubusercontent.com/vokins/yhosts/master/hosts -O hosts
-sed -i -e '/gay\|uvwxyz/d' -i -e "1 i\## update：$(date "+%Y-%m-%d %H:%M:%S")" hosts
+sed -i -e '/gay\|uvwxyz\|XiaoQiang\|alfredapp\|dxomark/d' -i -e "1 i\## update：$(date "+%Y-%m-%d %H:%M:%S")" hosts
 
 #下载dnsmasq规则
 cd /etc/storage/dnsmasq/dns/conf

diff --git a/dnsmasq/sh/【华硕老毛子固件】全自动脚本.md b/dnsmasq/sh/【华硕老毛子固件】全自动脚本.md
@@ -2,15 +2,14 @@
 * start.sh：立刻更新规则的脚本
 * setting.sh：初次运行的脚本，自动修改配置与启用dnsmasq，只需要运行一次。
 * del.sh：删除所有更改，出问题了只需要运行一下即可还原
-* ▲以上脚本只适用于老毛子华硕固件，其他固件请勿直接使用
-* H大的老毛子华硕固件：http://www.right.com.cn/forum/thread-161324-1-1.html ###
-* 脚本参考自恩山论坛原帖：http://www.right.com.cn/forum/thread-184121-1-1.html ###
-* 其他路由器固件需要自动脚本的朋友，请提供DNS配置文件［dnsmasq.conf］、定时任务［crontab］文件的路径给我才能制作脚本。
+* 此脚本只适用于老毛子华硕固件，其他固件请勿直接使用
+* hiboy大的老毛子华硕固件：http://www.right.com.cn/forum/thread-161324-1-1.html
+* 脚本参考自恩山论坛原帖：http://www.right.com.cn/forum/thread-184121-1-1.html
 
 ### 使用脚本
 请先找个可以运行命令的终端控制区。如老毛子固件打开【网页终端】（Shellinabox）功能来运行命令或脚本。在【配置扩展环境】→启用【网页终端】→【打开网页终端】，进入终端界面后输入路由账号、密码即可开始。直接复制以下的一键命令执行即可。
-* 一键运行命令（初次运行）：mkdir -p /etc/storage/dnsmasq/dns;wget --no-check-certificate https://raw.githubusercontent.com/sy618/hosts/master/dnsmasq/sh/setting.sh -O /etc/storage/dnsmasq/dns/setting.sh;sh /etc/storage/dnsmasq/dns/setting.sh
-* 一键还原命令（删除修改）：sh /etc/storage/dnsmasq/dns/del.sh
+* 一键运行命令：mkdir -p /etc/storage/dnsmasq/dns;wget --no-check-certificate https://raw.githubusercontent.com/sy618/hosts/master/dnsmasq/sh/setting.sh -O /etc/storage/dnsmasq/dns/setting.sh;sh /etc/storage/dnsmasq/dns/setting.sh
+* 一键还原命令：sh /etc/storage/dnsmasq/dns/del.sh
 
 ### 其他命令
 * 查看规则文件dnsfq是否下载成功，命令cat /etc/storage/dnsmasq/dns/conf/dnsfq，即可看到第一行的update日期时间。

diff --git a/f b/f
diff --git a/md/hosts文件说明.md b/md/hosts文件说明.md
@@ -1,9 +1,13 @@
 ### hosts文件说明:
 *  [p](https://raw.githubusercontent.com/sy618/hosts/master/p) ：play商店下载数据
 *  [y](https://raw.githubusercontent.com/sy618/hosts/master/y) ：YouTube播放视频数据
-*  [f](https://raw.githubusercontent.com/sy618/hosts/master/f) ： fq数据（不再公开）
 *  [AD](https://raw.githubusercontent.com/vokins/yhosts/master/hosts)：vokins的中国去广告hosts
+
 *  [FQ](https://raw.githubusercontent.com/sy618/hosts/master/FQ)： 完整FQ数据。合并了fq+play+YouTube
-*  [ADFQ](https://raw.githubusercontent.com/sy618/hosts/master/ADFQ)：合并了以上[AD](https://raw.githubusercontent.com/vokins/yhosts/master/hosts)与[FQ](https://raw.githubusercontent.com/sy618/hosts/master/FQ)。
+*  [FQ1](https://raw.githubusercontent.com/sy618/hosts/master/FQ1)：临时数据。与FQ相同，区别在于使用了谷歌官方IP，速度相对快些。
+
+* /data文件夹：拆分数据
+* /dnsmasq文件夹：路由器专用
+
+*  [ADFQ](https://raw.githubusercontent.com/sy618/hosts/master/ADFQ)：将停止提供合并数据。
 
-* [FQ1](https://raw.githubusercontent.com/sy618/hosts/master/FQ1)：临时数据。与FQ相同，区别在于使用了谷歌官方IP，速度相对快些。不过部分运营商（如电信）打开YouTube可能会被谷歌拒绝访问。这是谷歌故意做的限制。