diff options
| author | jacobsalmela <jacob.salmela@gmail.com> | 2014-10-12 00:29:44 +0400 |
|---|---|---|
| committer | jacobsalmela <jacob.salmela@gmail.com> | 2014-10-12 00:29:44 +0400 |
| commit | 4ed48e19f225528ac761cac75d4d4c16827eae51 (patch) | |
| tree | 8cbd99dcd61f316f3ec14b2869055a0144b239c6 /block hulu ads/lighttpd.conf | |
| parent | f1f2614e6575982b70927324e49d91ff00ccfa4b (diff) | |
reverting to default
Diffstat (limited to 'block hulu ads/lighttpd.conf')
| -rw-r--r-- | block hulu ads/lighttpd.conf | 14 |
1 files changed, 1 insertions, 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 |