diff --git a/README.md b/README.md index f00c502..c861e13 100755 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ PROXY, a simple elasticsearch proxy written in Go. # Features - Enable auto handling elasticsearch failure, via disk based indexing queue(WIP) -- Enable Opt-in TLS/HTTPS protect +- Enable opt-in TLS/HTTPS protect - Enable replicate indexing request to multi remote elasticsearch clusters(WIP) - Enable load balancing(indexing and search request), algorithm configurable(WIP) diff --git a/main.go b/main.go index 2444677..998b822 100644 --- a/main.go +++ b/main.go @@ -47,15 +47,6 @@ func main() { //modules module.New() - //load core modules first - //module.Register(module.Database, persist.DatabaseModule{}) - //module.Register(module.Storage, storage.StorageModule{}) - //module.Register(module.Filter, filter.FilterModule{}) - //module.Register(module.Stats, stats.SimpleStatsModule{}) - //module.Register(module.Queue, queue.DiskQueue{}) - //module.Register(module.Index, index.IndexModule{}) - //module.Register(module.System, pipeline.PipelineFrameworkModule{}) - //module.Register(module.System, cluster.ClusterModule{}) module.Register(module.API, api.APIModule{}) module.Register(module.UI, ui.UIModule{}) diff --git a/proxy.yml b/proxy.yml index 1e03ab7..c271e89 100644 --- a/proxy.yml +++ b/proxy.yml @@ -1,14 +1,10 @@ path.data: data path.logs: log + path.certs: test/cert tls_enabled: false -cookie_secret: PROXY-SECRET - -logging.level: debug - -#http_bind: 0.0.0.0:9001 api_bind: 0.0.0.0:2900 modules: @@ -16,26 +12,6 @@ modules: - name: api enabled: true -- name: web - enabled: false - auth: - enabled: false - oauth_provider: github - oauth_authorize_url: https://github.com/login/oauth/authorize - oauth_token_url: https://github.com/login/oauth/access_token - client_id: 850d747174ace88ce889 - client_secret: 3d437b64e06371d6f62769320438d3dfc95a8d8e - authorized_admin: - - medcl - - your_github_login_name - -- name: queue - enabled: true - -- name: persist - enabled: true - driver: sqlite - plugins: - name: proxy enabled: true