Add LITESTREAM_CONFIG env var

This commit is contained in:
Ben Johnson
2021-01-13 13:17:38 -07:00
parent 57a02a8628
commit a42f83f3cb
13 changed files with 117 additions and 185 deletions

View File

@@ -71,6 +71,6 @@ Arguments:
Defaults to %s
`[1:],
DefaultConfigPath,
DefaultConfigPath(),
)
}

View File

@@ -113,7 +113,7 @@ Arguments:
Optional, filters by replica.
`[1:],
DefaultConfigPath,
DefaultConfigPath(),
)
}

View File

@@ -22,9 +22,6 @@ var (
Version = "(development build)"
)
// DefaultConfigPath is the default configuration path.
const DefaultConfigPath = "/etc/litestream.yml"
func main() {
log.SetFlags(0)
@@ -165,11 +162,20 @@ type ReplicaConfig struct {
// S3 settings
AccessKeyID string `yaml:"access-key-id"`
SecretAccessKey string `yaml:"secret-access-key"`
Region string `yaml:"region"`
Bucket string `yaml:"bucket"`
}
// DefaultConfigPath returns the default config path.
func DefaultConfigPath() string {
if v := os.Getenv("LITESTREAM_CONFIG"); v != "" {
return v
}
return "/etc/litestream.yml"
}
func registerConfigFlag(fs *flag.FlagSet, p *string) {
fs.StringVar(p, "config", DefaultConfigPath, "config path")
fs.StringVar(p, "config", DefaultConfigPath(), "config path")
}
// newDBFromConfig instantiates a DB based on a configuration.
@@ -226,7 +232,7 @@ func newS3ReplicaFromConfig(db *litestream.DB, config *ReplicaConfig) (*s3.Repli
return nil, fmt.Errorf("%s: s3 bucket required", db.Path())
}
r := aws.NewS3Replica(db, config.Name)
r := s3.NewReplica(db, config.Name)
r.AccessKeyID = config.AccessKeyID
r.SecretAccessKey = config.SecretAccessKey
r.Region = config.Region

View File

@@ -130,5 +130,5 @@ Arguments:
-v
Enable verbose logging output.
`[1:], DefaultConfigPath)
`[1:], DefaultConfigPath())
}

View File

@@ -142,6 +142,6 @@ Examples:
$ litestream restore -replica s3 -generation xxxxxxxx /path/to/db
`[1:],
DefaultConfigPath,
DefaultConfigPath(),
)
}

View File

@@ -112,6 +112,6 @@ Examples:
$ litestream snapshots -replica s3 /path/to/db
`[1:],
DefaultConfigPath,
DefaultConfigPath(),
)
}

View File

@@ -131,6 +131,6 @@ Examples:
$ litestream restore -replica s3 /path/to/db
`[1:],
DefaultConfigPath,
DefaultConfigPath(),
)
}

View File

@@ -121,6 +121,6 @@ Examples:
$ litestream snapshots -replica s3 -generation xxxxxxxx /path/to/db
`[1:],
DefaultConfigPath,
DefaultConfigPath(),
)
}