moparisthebest/pi-hole
1
0
Fork 0
mirror of https://github.com/moparisthebest/pi-hole synced 2024-11-24 18:22:22 -05:00
Code Issues Releases Wiki Activity

again

Browse Source
This commit is contained in:
jacobsalmela 2014-10-11 14:09:55 -05:00
parent 6f58a9d723
commit f1f2614e65
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
block hulu ads/lighttpd.conf
View File

@ -27,7 +27,14 @@ include_shell "/usr/share/lighttpd/use-ipv6.pl " + server.port
include_shell "/usr/share/lighttpd/create-mime.assign.pl" include_shell "/usr/share/lighttpd/create-mime.assign.pl"
include_shell "/usr/share/lighttpd/include-conf-enabled.pl" include_shell "/usr/share/lighttpd/include-conf-enabled.pl"
<<<<<<< Updated upstream
$HTTP["host"] == "ads-v-darwin.hulu.com|ad.hulu.com|t.hulu.com|t2.hulu.com|doubleclick.net" { $HTTP["host"] == "ads-v-darwin.hulu.com|ad.hulu.com|t.hulu.com|t2.hulu.com|doubleclick.net" {
url.redirect = ( url.redirect = (
"^/(.*)" => "http://192.168.1.101:8200/MediaItems/19.mov", "^/(.*)" => "http://192.168.1.101:8200/MediaItems/19.mov",
) )
=======
$HTTP["host"] == "ads-v-darwin.hulu.com" {
url.redirect = (
"^/(.*)" => "http://192.168.1.101:8200/MediaItems/19.mov",
)
>>>>>>> Stashed changes