From 4ed48e19f225528ac761cac75d4d4c16827eae51 Mon Sep 17 00:00:00 2001 From: jacobsalmela Date: Sat, 11 Oct 2014 15:29:44 -0500 Subject: [PATCH] reverting to default --- block hulu ads/lighttpd.conf | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/block hulu ads/lighttpd.conf b/block hulu ads/lighttpd.conf index dc0dc80c..2e6618e5 100644 --- a/block hulu ads/lighttpd.conf +++ b/block hulu ads/lighttpd.conf @@ -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" \ No newline at end of file