diff options
| author | Péter Szilágyi <peterke@gmail.com> | 2017-10-30 00:02:33 +0800 |
|---|---|---|
| committer | Péter Szilágyi <peterke@gmail.com> | 2017-11-21 21:09:39 +0800 |
| commit | 327dcd3622efd472c4d168cda657c55ef8e19889 (patch) | |
| tree | deb67ea5b94dd0a6d257d00def88ce0b5ccb7b81 /cmd/puppeth/module_faucet.go | |
| parent | ffc12f63ec57682e7c7f6653332856acbeef3183 (diff) | |
| download | go-tangerine-327dcd3622efd472c4d168cda657c55ef8e19889.tar go-tangerine-327dcd3622efd472c4d168cda657c55ef8e19889.tar.gz go-tangerine-327dcd3622efd472c4d168cda657c55ef8e19889.tar.bz2 go-tangerine-327dcd3622efd472c4d168cda657c55ef8e19889.tar.lz go-tangerine-327dcd3622efd472c4d168cda657c55ef8e19889.tar.xz go-tangerine-327dcd3622efd472c4d168cda657c55ef8e19889.tar.zst go-tangerine-327dcd3622efd472c4d168cda657c55ef8e19889.zip | |
cmd/faucet, cmd/puppeth: drop GitHub support at official request
Diffstat (limited to 'cmd/puppeth/module_faucet.go')
| -rw-r--r-- | cmd/puppeth/module_faucet.go | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/cmd/puppeth/module_faucet.go b/cmd/puppeth/module_faucet.go index 09113c3e6..812c32d83 100644 --- a/cmd/puppeth/module_faucet.go +++ b/cmd/puppeth/module_faucet.go @@ -42,7 +42,7 @@ ADD account.pass /account.pass ENTRYPOINT [ \ "faucet", "--genesis", "/genesis.json", "--network", "{{.NetworkID}}", "--bootnodes", "{{.Bootnodes}}", "--ethstats", "{{.Ethstats}}", "--ethport", "{{.EthPort}}", \ "--faucet.name", "{{.FaucetName}}", "--faucet.amount", "{{.FaucetAmount}}", "--faucet.minutes", "{{.FaucetMinutes}}", "--faucet.tiers", "{{.FaucetTiers}}", \ - {{if .GitHubUser}}"--github.user", "{{.GitHubUser}}", "--github.token", "{{.GitHubToken}}", {{end}}"--account.json", "/account.json", "--account.pass", "/account.pass" \ + "--account.json", "/account.json", "--account.pass", "/account.pass" \ {{if .CaptchaToken}}, "--captcha.token", "{{.CaptchaToken}}", "--captcha.secret", "{{.CaptchaSecret}}"{{end}}{{if .NoAuth}}, "--noauth"{{end}} \ ]` @@ -65,8 +65,6 @@ services: - FAUCET_AMOUNT={{.FaucetAmount}} - FAUCET_MINUTES={{.FaucetMinutes}} - FAUCET_TIERS={{.FaucetTiers}} - - GITHUB_USER={{.GitHubUser}} - - GITHUB_TOKEN={{.GitHubToken}} - CAPTCHA_TOKEN={{.CaptchaToken}} - CAPTCHA_SECRET={{.CaptchaSecret}} - NO_AUTH={{.NoAuth}}{{if .VHost}} @@ -94,8 +92,6 @@ func deployFaucet(client *sshClient, network string, bootnodes []string, config "Bootnodes": strings.Join(bootnodes, ","), "Ethstats": config.node.ethstats, "EthPort": config.node.portFull, - "GitHubUser": config.githubUser, - "GitHubToken": config.githubToken, "CaptchaToken": config.captchaToken, "CaptchaSecret": config.captchaSecret, "FaucetName": strings.Title(network), @@ -114,8 +110,6 @@ func deployFaucet(client *sshClient, network string, bootnodes []string, config "ApiPort": config.port, "EthPort": config.node.portFull, "EthName": config.node.ethstats[:strings.Index(config.node.ethstats, ":")], - "GitHubUser": config.githubUser, - "GitHubToken": config.githubToken, "CaptchaToken": config.captchaToken, "CaptchaSecret": config.captchaSecret, "FaucetAmount": config.amount, @@ -152,8 +146,6 @@ type faucetInfos struct { minutes int tiers int noauth bool - githubUser string - githubToken string captchaToken string captchaSecret string } @@ -171,11 +163,6 @@ func (info *faucetInfos) Report() map[string]string { "Captha protection": fmt.Sprintf("%v", info.captchaToken != ""), "Ethstats username": info.node.ethstats, } - if info.githubUser != "" { - report["GitHub authentication"] = info.githubUser - } else { - report["GitHub authentication"] = "disabled, rate-limited" - } if info.noauth { report["Debug mode (no auth)"] = "enabled" } @@ -249,8 +236,6 @@ func checkFaucet(client *sshClient, network string) (*faucetInfos, error) { amount: amount, minutes: minutes, tiers: tiers, - githubUser: infos.envvars["GITHUB_USER"], - githubToken: infos.envvars["GITHUB_TOKEN"], captchaToken: infos.envvars["CAPTCHA_TOKEN"], captchaSecret: infos.envvars["CAPTCHA_SECRET"], noauth: infos.envvars["NO_AUTH"] == "true", |