From f1f2614e6575982b70927324e49d91ff00ccfa4b Mon Sep 17 00:00:00 2001 From: jacobsalmela Date: Sat, 11 Oct 2014 14:09:55 -0500 Subject: [PATCH] again --- block hulu ads/lighttpd.conf | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/block hulu ads/lighttpd.conf b/block hulu ads/lighttpd.conf index 803b94af..dc0dc80c 100644 --- a/block hulu ads/lighttpd.conf +++ b/block hulu ads/lighttpd.conf @@ -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/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