breeze/ngrok
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rename proxy_url configuration variable

Browse Source
This commit is contained in:
Alan Shreve
2013-09-20 19:41:50 +03:00
parent 22537c0136
commit 97fcb417ac
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/ngrok/client/config.go
View File

@@ -15,7 +15,7 @@ import (
)
type Configuration struct {
ProxyUrl string `yaml:"proxy_url"`
HttpProxy string `yaml:"http_proxy"`
ServerAddr string `yaml:"server_addr"`
InspectAddr string `yaml:"inspect_addr"`
TrustHostRootCerts bool `yaml:"trust_host_root_certs"`
@@ -79,8 +79,8 @@ func LoadConfiguration(opts *Options) (config *Configuration, err error) {
config.InspectAddr = "127.0.0.1:4040"
}
if config.ProxyUrl == "" {
config.ProxyUrl = os.Getenv("http_proxy")
if config.HttpProxy == "" {
config.HttpProxy = os.Getenv("http_proxy")
}
// override configuration with command-line options
@@ -141,9 +141,9 @@ func LoadConfiguration(opts *Options) (config *Configuration, err error) {
return
}
if config.ProxyUrl != "" {
if config.HttpProxy != "" {
var proxyUrl *url.URL
if proxyUrl, err = url.Parse(config.ProxyUrl); err != nil {
if proxyUrl, err = url.Parse(config.HttpProxy); err != nil {
return
} else {
if proxyUrl.Scheme != "http" && proxyUrl.Scheme != "https" {

2
src/ngrok/client/model.go
View File

@@ -76,7 +76,7 @@ func newClientModel(config *Configuration, ctl mvc.Controller) *ClientModel {
serverAddr: config.ServerAddr,
// proxy address
proxyUrl: config.ProxyUrl,
proxyUrl: config.HttpProxy,
// auth token
authToken: config.AuthToken,