tyler.durden
/
pi-hole
mirror of https://github.com/pi-hole/pi-hole.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

reverting to default

This commit is contained in:
jacobsalmela 2014-10-11 15:29:44 -05:00
parent f1f2614e65
commit 4ed48e19f2
1 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
block hulu ads/lighttpd.conf
View File

@ -25,16 +25,4 @@ compress.filetype = ( "application/javascript", "text/css", "text/html
# default listening port for IPv6 falls back to the IPv4 port
include_shell "/usr/share/lighttpd/use-ipv6.pl " + server.port
include_shell "/usr/share/lighttpd/create-mime.assign.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" {
url.redirect = (
"^/(.*)" => "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
include_shell "/usr/share/lighttpd/include-conf-enabled.pl"