diff --git a/install/lantern.install4j b/install/lantern.install4j index 311d66e01f..7c86e0733b 100644 --- a/install/lantern.install4j +++ b/install/lantern.install4j @@ -628,7 +628,7 @@ Lantern requires your Google Account credentials to access the Internet. What yo - + true diff --git a/install/osx/configureOsx.bash b/install/osx/configureOsx.bash index 2bef4d8768..5e94ec464a 100644 --- a/install/osx/configureOsx.bash +++ b/install/osx/configureOsx.bash @@ -67,10 +67,10 @@ log "Copied pac file!!" log "Configuring network services" while read s; do - echo "Configuring network: $s" + log "Configuring network: $s" sudo networksetup -setautoproxyurl "$s" file://localhost$HOME/.lantern/proxy.pac || log "Could not set auto proxy URL for $s" sudo networksetup -setautoproxystate "$s" "on" || log "Could not turn auto proxy on for $s" - echo "Configured network: $s" + log "Configured network: $s" done < <(networksetup -listallnetworkservices | tail +2) log "Done configuring network services!!" diff --git a/proxy_off.pac b/proxy_off.pac new file mode 100644 index 0000000000..7f410390f9 --- /dev/null +++ b/proxy_off.pac @@ -0,0 +1,3 @@ +function FindProxyForURL(url, host) { + return "DIRECT"; +} diff --git a/proxy_on.pac b/proxy_on.pac new file mode 100644 index 0000000000..d33e92c206 --- /dev/null +++ b/proxy_on.pac @@ -0,0 +1,3 @@ +function FindProxyForURL(url, host) { + return "PROXY 127.0.0.1:8787"; +}