Skip to content

Commit

Permalink
Remove HTTP config server closes #2988
Browse files Browse the repository at this point in the history
  • Loading branch information
myleshorton committed Aug 19, 2015
1 parent d4c4f99 commit fb957fd
Show file tree
Hide file tree
Showing 4 changed files with 0 additions and 126 deletions.
1 change: 0 additions & 1 deletion src/github.com/getlantern/flashlight/config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,6 @@ func Init(version string) (*Config, error) {
m = &yamlconf.Manager{
FilePath: configPath,
FilePollInterval: 1 * time.Second,
ConfigServerAddr: *configaddr,
EmptyConfig: func() yamlconf.Config {
return &Config{}
},
Expand Down
1 change: 0 additions & 1 deletion src/github.com/getlantern/flashlight/config/flags.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import (

var (
configdir = flag.String("configdir", "", "directory in which to store configuration, including flashlight.yaml (defaults to current directory)")
configaddr = flag.String("configaddr", "", "if specified, run an http-based configuration server at this address")
cloudconfig = flag.String("cloudconfig", "", "optional http(s) URL to a cloud-based source for configuration updates")
cloudconfigca = flag.String("cloudconfigca", "", "optional PEM encoded certificate used to verify TLS connections to fetch cloudconfig")
addr = flag.String("addr", "", "ip:port on which to listen for requests. When running as a client proxy, we'll listen with http, when running as a server proxy we'll listen with https (required)")
Expand Down
11 changes: 0 additions & 11 deletions src/github.com/getlantern/yamlconf/yamlconf.go
Original file line number Diff line number Diff line change
Expand Up @@ -94,10 +94,6 @@ type Manager struct {
// to 1 second
FilePollInterval time.Duration

// ConfigServerAddr: optionally, specify an address at which to provide a
// RESTFUL HTTP server for making config updates.
ConfigServerAddr string

// EmptyConfig: required, factor for new empty Configs
EmptyConfig func() Config

Expand Down Expand Up @@ -192,13 +188,6 @@ func (m *Manager) Init() (Config, error) {

go m.processUpdates()

if m.ConfigServerAddr != "" {
err = m.startConfigServer()
if err != nil {
return nil, err
}
}

return m.getCfg(), nil
}

Expand Down
113 changes: 0 additions & 113 deletions src/github.com/getlantern/yamlconf/yamlconf_http.go

This file was deleted.

0 comments on commit fb957fd

Please sign in to comment.