mirror of
https://github.com/pi-hole/pi-hole.git
synced 2025-01-11 14:34:44 +00:00
again
This commit is contained in:
parent
6f58a9d723
commit
f1f2614e65
1 changed files with 7 additions and 0 deletions
|
@ -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
|
||||||
|
|
Loading…
Reference in a new issue