letsencrypt
/
boulder
mirror of https://github.com/letsencrypt/boulder.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Allow cli override of gRPC listen and service addresses

This commit is contained in:
Roland Bracewell Shoemaker 2018-04-20 12:16:02 -07:00
parent ebc86fd778
commit d424d0580b
9 changed files with 81 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
cmd/boulder-ca/main.go
View File

@ -105,6 +105,9 @@ func loadSigner(issuerConfig ca_config.IssuerConfig) (crypto.Signer, error) {
}
func main() {
caAddr := flag.String("ca-grpc-addr", "", "CA gRPC listen address override")
ocspAddr := flag.String("ocsp-grpc-addr", "", "OCSP gRPC listen address override")
saAddr := flag.String("sa-addr", "", "SA gRPC server address override")
configFile := flag.String("config", "", "File path to the configuration file for this service")
flag.Parse()
if *configFile == "" {
@ -119,6 +122,16 @@ func main() {
err = features.Set(c.CA.Features)
cmd.FailOnError(err, "Failed to set feature flags")
if *caAddr != "" {
c.CA.GRPCCA.Address = *caAddr
}
if *ocspAddr != "" {
c.CA.GRPCOCSPGenerator.Address = *ocspAddr
}
if *saAddr != "" {
c.CA.SAService.ServerAddresses = []string{*saAddr}
}
if c.CA.MaxNames == 0 {
cmd.Fail(fmt.Sprintf("Error in CA config: MaxNames must not be 0"))
}

9
cmd/boulder-publisher/main.go
View File

@ -33,6 +33,8 @@ type config struct {
}
func main() {
grpcAddr := flag.String("grpc-addr", "", "gRPC listen address override")
saAddr := flag.String("sa-addr", "", "SA gRPC server address override")
configFile := flag.String("config", "", "File path to the configuration file for this service")
flag.Parse()
if *configFile == "" {
@ -46,6 +48,13 @@ func main() {
err = features.Set(c.Publisher.Features)
cmd.FailOnError(err, "Failed to set feature flags")
if *grpcAddr != "" {
c.Publisher.GRPC.Address = *grpcAddr
}
if *saAddr != "" {
c.Publisher.SAService.ServerAddresses = []string{*saAddr}
}
scope, logger := cmd.StatsAndLogging(c.Syslog, c.Publisher.DebugAddr)
defer logger.AuditPanic()
logger.Info(cmd.VersionString())

17
cmd/boulder-ra/main.go
View File

@ -100,6 +100,10 @@ type config struct {
}
func main() {
grpcAddr := flag.String("grpc-addr", "", "gRPC listen address override")
saAddr := flag.String("sa-addr", "", "SA gRPC server address override")
vaAddr := flag.String("va-addr", "", "VA gRPC server address override")
caAddr := flag.String("ca-addr", "", "CA gRPC server address override")
configFile := flag.String("config", "", "File path to the configuration file for this service")
flag.Parse()
if *configFile == "" {
@ -114,6 +118,19 @@ func main() {
err = features.Set(c.RA.Features)
cmd.FailOnError(err, "Failed to set feature flags")
if *grpcAddr != "" {
c.RA.GRPC.Address = *grpcAddr
}
if *saAddr != "" {
c.RA.SAService.ServerAddresses = []string{*saAddr}
}
if *vaAddr != "" {
c.RA.VAService.ServerAddresses = []string{*vaAddr}
}
if *caAddr != "" {
c.RA.CAService.ServerAddresses = []string{*caAddr}
}
scope, logger := cmd.StatsAndLogging(c.Syslog, c.RA.DebugAddr)
defer logger.AuditPanic()
logger.Info(cmd.VersionString())

5
cmd/boulder-sa/main.go
View File

@ -27,6 +27,7 @@ type config struct {
}
func main() {
grpcAddr := flag.String("grpc-addr", "", "gRPC listen address override")
configFile := flag.String("config", "", "File path to the configuration file for this service")
flag.Parse()
if *configFile == "" {
@ -41,6 +42,10 @@ func main() {
err = features.Set(c.SA.Features)
cmd.FailOnError(err, "Failed to set feature flags")
if *grpcAddr != "" {
c.SA.GRPC.Address = *grpcAddr
}
scope, logger := cmd.StatsAndLogging(c.Syslog, c.SA.DebugAddr)
defer logger.AuditPanic()
logger.Info(cmd.VersionString())

5
cmd/boulder-va/main.go
View File

@ -50,6 +50,7 @@ type config struct {
}
func main() {
grpcAddr := flag.String("grpc-addr", "", "gRPC listen address override")
configFile := flag.String("config", "", "File path to the configuration file for this service")
flag.Parse()
if *configFile == "" {
@ -64,6 +65,10 @@ func main() {
err = features.Set(c.VA.Features)
cmd.FailOnError(err, "Failed to set feature flags")
if *grpcAddr != "" {
c.VA.GRPC.Address = *grpcAddr
}
scope, logger := cmd.StatsAndLogging(c.Syslog, c.VA.DebugAddr)
defer logger.AuditPanic()
logger.Info(cmd.VersionString())

9
cmd/boulder-wfe/main.go
View File

@ -77,6 +77,8 @@ func setupWFE(c config, logger blog.Logger, stats metrics.Scope) (core.Registrat
}
func main() {
saAddr := flag.String("sa-addr", "", "SA gRPC server address override")
raAddr := flag.String("ra-addr", "", "RA gRPC server address override")
configFile := flag.String("config", "", "File path to the configuration file for this service")
flag.Parse()
if *configFile == "" {
@ -91,6 +93,13 @@ func main() {
err = features.Set(c.WFE.Features)
cmd.FailOnError(err, "Failed to set feature flags")
if *saAddr != "" {
c.WFE.SAService.ServerAddresses = []string{*saAddr}
}
if *raAddr != "" {
c.WFE.RAService.ServerAddresses = []string{*raAddr}
}
scope, logger := cmd.StatsAndLogging(c.Syslog, c.WFE.DebugAddr)
defer logger.AuditPanic()
logger.Info(cmd.VersionString())

9
cmd/boulder-wfe2/main.go
View File

@ -186,6 +186,8 @@ func setupWFE(c config, logger blog.Logger, stats metrics.Scope) (core.Registrat
}
func main() {
saAddr := flag.String("sa-addr", "", "SA gRPC server address override")
raAddr := flag.String("ra-addr", "", "RA gRPC server address override")
configFile := flag.String("config", "", "File path to the configuration file for this service")
flag.Parse()
if *configFile == "" {
@ -203,6 +205,13 @@ func main() {
err = features.Set(c.WFE.Features)
cmd.FailOnError(err, "Failed to set feature flags")
if *saAddr != "" {
c.WFE.SAService.ServerAddresses = []string{*saAddr}
}
if *raAddr != "" {
c.WFE.RAService.ServerAddresses = []string{*raAddr}
}
scope, logger := cmd.StatsAndLogging(c.Syslog, c.WFE.DebugAddr)
defer logger.AuditPanic()
logger.Info(cmd.VersionString())

5
cmd/expiration-mailer/main.go
View File

@ -439,6 +439,7 @@ func initStats(scope metrics.Scope) mailerStats {
}
func main() {
saAddr := flag.String("sa-addr", "", "SA gRPC server address override")
configFile := flag.String("config", "", "File path to the configuration file for this service")
certLimit := flag.Int("cert_limit", 0, "Count of certificates to process per expiration period")
reconnBase := flag.Duration("reconnectBase", 1*time.Second, "Base sleep duration between reconnect attempts")
@ -458,6 +459,10 @@ func main() {
err = features.Set(c.Mailer.Features)
cmd.FailOnError(err, "Failed to set feature flags")
if *saAddr != "" {
c.Mailer.SAService.ServerAddresses = []string{*saAddr}
}
scope, logger := cmd.StatsAndLogging(c.Syslog, c.Mailer.DebugAddr)
defer logger.AuditPanic()
logger.Info(cmd.VersionString())

12
cmd/orphan-finder/main.go
View File

@ -128,7 +128,7 @@ func parseLogLine(sa certificateStorage, logger blog.Logger, line string) (found
return true, true
}
func setup(configFile string) (blog.Logger, core.StorageAuthority) {
func setup(configFile string, saAddr string) (blog.Logger, core.StorageAuthority) {
configJSON, err := ioutil.ReadFile(configFile)
cmd.FailOnError(err, "Failed to read config file")
var conf config
@ -136,6 +136,11 @@ func setup(configFile string) (blog.Logger, core.StorageAuthority) {
cmd.FailOnError(err, "Failed to parse config file")
err = features.Set(conf.Features)
cmd.FailOnError(err, "Failed to set feature flags")
if saAddr != "" {
conf.SAService.ServerAddresses = []string{saAddr}
}
logger := cmd.NewLogger(conf.Syslog)
tlsConfig, err := conf.TLS.Load()
@ -158,6 +163,7 @@ func main() {
command := os.Args[1]
flagSet := flag.NewFlagSet(command, flag.ContinueOnError)
saAddr := flagSet.String("sa-addr", "", "SA gRPC server address override")
configFile := flagSet.String("config", "", "File path to the configuration file for this service")
logPath := flagSet.String("log-file", "", "Path to boulder-ca log file to parse")
derPath := flagSet.String("der-file", "", "Path to DER certificate file")
@ -177,7 +183,7 @@ func main() {
switch command {
case "parse-ca-log":
logger, sa := setup(*configFile)
logger, sa := setup(*configFile, *saAddr)
if *logPath == "" {
usage()
}
@ -200,7 +206,7 @@ func main() {
case "parse-der":
ctx := context.Background()
_, sa := setup(*configFile)
_, sa := setup(*configFile, *saAddr)
if *derPath == "" || *regID == 0 {
usage()
}