From 45a03ff62d2f5c401cf168ffc1f974d59e0fc8d1 Mon Sep 17 00:00:00 2001 From: nadoo <287492+nadoo@users.noreply.github.com> Date: Tue, 29 Aug 2017 10:05:06 +0800 Subject: [PATCH] examples: add order number --- conf.go | 2 -- .../glider.conf | 0 .../glider.conf | 0 .../glider.conf | 0 .../glider.conf | 0 .../glider.conf | 0 .../office.rule | 0 .../bypass.rule | 0 .../glider.conf | 0 .../glider.conf | 0 .../home.rule | 0 .../office.rule | 0 examples/README.md | 28 +++++++++---------- 13 files changed, 14 insertions(+), 16 deletions(-) rename examples/{simple_proxy_service => 1.simple_proxy_service}/glider.conf (100%) rename examples/{one_forwarder => 2.one_forwarder}/glider.conf (100%) rename examples/{forward_chain => 3.forward_chain}/glider.conf (100%) rename examples/{multiple_forwarders => 4.multiple_forwarders}/glider.conf (100%) rename examples/{rule_default_direct => 5.rule_default_direct}/glider.conf (100%) rename examples/{rule_default_direct => 5.rule_default_direct}/office.rule (100%) rename examples/{rule_default_forwarder => 6.rule_default_forwarder}/bypass.rule (100%) rename examples/{rule_default_forwarder => 6.rule_default_forwarder}/glider.conf (100%) rename examples/{rule_multiple_rule_files => 7.rule_multiple_rule_files}/glider.conf (100%) rename examples/{rule_multiple_rule_files => 7.rule_multiple_rule_files}/home.rule (100%) rename examples/{rule_multiple_rule_files => 7.rule_multiple_rule_files}/office.rule (100%) diff --git a/conf.go b/conf.go index 85b1063..7556142 100644 --- a/conf.go +++ b/conf.go @@ -114,8 +114,6 @@ func NewRuleConfFromFile(ruleFile string) (*RuleConf, error) { f.StringSliceUniqVar(&p.IP, "ip", nil, "ip") f.StringSliceUniqVar(&p.CIDR, "cidr", nil, "cidr") - // f.StringSliceUniqVar(&p.Include, "include", nil, "include file path(eg: you can include a domain list file)") - err := f.Parse() if err != nil { fmt.Fprintf(os.Stderr, "ERROR: %s\n", err) diff --git a/examples/simple_proxy_service/glider.conf b/examples/1.simple_proxy_service/glider.conf similarity index 100% rename from examples/simple_proxy_service/glider.conf rename to examples/1.simple_proxy_service/glider.conf diff --git a/examples/one_forwarder/glider.conf b/examples/2.one_forwarder/glider.conf similarity index 100% rename from examples/one_forwarder/glider.conf rename to examples/2.one_forwarder/glider.conf diff --git a/examples/forward_chain/glider.conf b/examples/3.forward_chain/glider.conf similarity index 100% rename from examples/forward_chain/glider.conf rename to examples/3.forward_chain/glider.conf diff --git a/examples/multiple_forwarders/glider.conf b/examples/4.multiple_forwarders/glider.conf similarity index 100% rename from examples/multiple_forwarders/glider.conf rename to examples/4.multiple_forwarders/glider.conf diff --git a/examples/rule_default_direct/glider.conf b/examples/5.rule_default_direct/glider.conf similarity index 100% rename from examples/rule_default_direct/glider.conf rename to examples/5.rule_default_direct/glider.conf diff --git a/examples/rule_default_direct/office.rule b/examples/5.rule_default_direct/office.rule similarity index 100% rename from examples/rule_default_direct/office.rule rename to examples/5.rule_default_direct/office.rule diff --git a/examples/rule_default_forwarder/bypass.rule b/examples/6.rule_default_forwarder/bypass.rule similarity index 100% rename from examples/rule_default_forwarder/bypass.rule rename to examples/6.rule_default_forwarder/bypass.rule diff --git a/examples/rule_default_forwarder/glider.conf b/examples/6.rule_default_forwarder/glider.conf similarity index 100% rename from examples/rule_default_forwarder/glider.conf rename to examples/6.rule_default_forwarder/glider.conf diff --git a/examples/rule_multiple_rule_files/glider.conf b/examples/7.rule_multiple_rule_files/glider.conf similarity index 100% rename from examples/rule_multiple_rule_files/glider.conf rename to examples/7.rule_multiple_rule_files/glider.conf diff --git a/examples/rule_multiple_rule_files/home.rule b/examples/7.rule_multiple_rule_files/home.rule similarity index 100% rename from examples/rule_multiple_rule_files/home.rule rename to examples/7.rule_multiple_rule_files/home.rule diff --git a/examples/rule_multiple_rule_files/office.rule b/examples/7.rule_multiple_rule_files/office.rule similarity index 100% rename from examples/rule_multiple_rule_files/office.rule rename to examples/7.rule_multiple_rule_files/office.rule diff --git a/examples/README.md b/examples/README.md index d10a2ef..d0aa9a9 100644 --- a/examples/README.md +++ b/examples/README.md @@ -1,32 +1,32 @@ # Glider Configuration Examples -## Simple Proxy Service +## 1. Simple Proxy Service Just listen on 8443 as HTTP/SOCKS5 proxy on the same port, forward all requests directly. ``` Clients --> Listener --> Internet ``` -- [simple_proxy_service](simple_proxy_service) +- [simple_proxy_service](1.simple_proxy_service) -## One remote upstream proxy +## 2. One remote upstream proxy ``` Clients --> Listener --> Forwarder --> Internet ``` -- [one_forwarder](one_forwarder) +- [one_forwarder](2.one_forwarder) -## One remote upstream PROXY CHAIN +## 3. One remote upstream PROXY CHAIN ``` Clients --> Listener --> Forwarder1 --> Forwarder2 --> Internet ``` -- [forward_chain](forward_chain) +- [forward_chain](3.forward_chain) -## Multiple upstream proxies +## 4. Multiple upstream proxies ``` |Forwarder ----------------->| @@ -34,10 +34,10 @@ Just listen on 8443 as HTTP/SOCKS5 proxy on the same port, forward all requests |Forwarder --> Forwarder->...| ``` -- [multiple_forwarders](multiple_forwarders) +- [multiple_forwarders](4.multiple_forwarders) -## With Rule File: Default Direct, Rule file use forwarder +## 5. With Rule File: Default Direct, Rule file use forwarder Default: ``` @@ -50,10 +50,10 @@ Destinations specified in rule file: |Forwarder --> Forwarder->...| ``` -- [rule_default_direct](rule_default_direct) +- [rule_default_direct](5.rule_default_direct) -## With Rule File: Default use forwarder, rule file use direct +## 6. With Rule File: Default use forwarder, rule file use direct Default: ``` @@ -67,10 +67,10 @@ Destinations specified in rule file: Clients --> Listener --> Internet ``` -- [rule_default_forwarder](rule_default_forwarder) +- [rule_default_forwarder](6.rule_default_forwarder) -## With Rule File: multiple rule files +## 7. With Rule File: multiple rule files Default: ``` @@ -89,4 +89,4 @@ Destinations specified in rule file2: |Forwarder5 --> Forwarder6->...| ``` -- [rule_multiple_rule_files](rule_multiple_rule_files) \ No newline at end of file +- [rule_multiple_rule_files](7.rule_multiple_rule_files) \ No newline at end of file