aboutsummaryrefslogtreecommitdiffstats
path: root/cmd/swarm/config.go
Commit message (Collapse)AuthorAgeFilesLines
* swarm, cmd/swarm: Merge branch 'master' into multiple-ens-endpointsJanos Guljas2018-02-221-1/+1
|\
| * various: remove redundant parentheses (#15793)Furkan KAMACI2018-01-031-1/+1
| |
* | cmd/swarm: return error early in buildConfig functionJanos Guljas2017-12-201-0/+3
| |
* | cmd/swarm: add validation for EnsAPIs configuration parameterJanos Guljas2017-12-191-0/+35
| |
* | cmd/swarm, swarm: disable ENS API by defaultJanos Guljas2017-12-181-18/+5
| | | | | | | | | | | | Specifying ENS API CLI flag, env variable or configuration field is required for ENS resolving. Backward compatibility is preserved with --ens-api="" CLI flag value.
* | cmd/swarm: Merge branch 'master' into multiple-ens-endpointsJanos Guljas2017-12-141-1/+1
|\| | | | | | | Fix a conflict in cmd/swarm envVarsOverride function.
| * all: use gometalinter.v2, fix new gosimple issues (#15650)Zach2017-12-131-1/+1
| |
* | swarm, cmd/swarm: Merge branch 'master' into multiple-ens-endpointsJanos Guljas2017-12-131-5/+26
|/ | | | | | | | | | | | Merge with changes that implement config file PR #15548. Field *EnsApi string* in swarm/api.Config is replaced with *EnsAPIs []string*. A new field *EnsDisabled bool* is added to swarm/api.Config for easy way to disable ENS resolving with config file. Signature of function swarm.NewSwarm is changed and simplified.
* cmd/swarm: add config file (#15548)holisticode2017-12-121-0/+321
This commit adds a TOML configuration option to swarm. It reuses the TOML configuration structure used in geth with swarm customized items. The commit: * Adds a "dumpconfig" command to the swarm executable which allows printing the (default) configuration to stdout, which then can be redirected to a file in order to customize it. * Adds a "--config <file>" option to the swarm executable which will allow to load a configuration file in TOML format from the specified location in order to initialize the Swarm node The override priorities are like follows: environment variables override command line arguments override config file override default config.