Skip to content

Commit 24cd01d

Browse files
rolandshoemakerrolandshoemaker
committed
Revert to setting full addresses instead of just ports
1 parent 5c4eaf8 commit 24cd01d

File tree

6 files changed

+43
-46
lines changed

6 files changed

+43
-46
lines changed

‎cmd/boulder-ca/main.go‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -105,9 +105,9 @@ func loadSigner(issuerConfig ca_config.IssuerConfig) (crypto.Signer, error) {
105105
}
106106

107107
func main() {
108-
caPort := flag.Int("ca-port", 0, "CA gRPC listen port override")
109-
ocspPort := flag.Int("ocsp-port", 0, "OCSP gRPC listen port override")
110-
debugPort := flag.Int("debug-port", 0, "Debug server port override")
108+
caAddr := flag.String("ca-addr", "", "CA gRPC listen address override")
109+
ocspAddr := flag.String("ocsp-addr", "", "OCSP gRPC listen address override")
110+
debugAddr := flag.String("debug-addr", "", "Debug server address override")
111111
configFile := flag.String("config", "", "File path to the configuration file for this service")
112112
flag.Parse()
113113
if *configFile == "" {
@@ -122,14 +122,14 @@ func main() {
122122
err = features.Set(c.CA.Features)
123123
cmd.FailOnError(err, "Failed to set feature flags")
124124

125-
if *caPort != 0 {
126-
c.CA.GRPCCA.Address = fmt.Sprintf(":%d", *caPort)
125+
if *caAddr != "" {
126+
c.CA.GRPCCA.Address = *caAddr
127127
}
128-
if *ocspPort != 0 {
129-
c.CA.GRPCOCSPGenerator.Address = fmt.Sprintf(":%d", *ocspPort)
128+
if *ocspAddr != "" {
129+
c.CA.GRPCOCSPGenerator.Address = *ocspAddr
130130
}
131-
if *debugPort != 0 {
132-
c.CA.DebugAddr = fmt.Sprintf(":%d", *debugPort)
131+
if *debugAddr != "" {
132+
c.CA.DebugAddr = *debugAddr
133133
}
134134

135135
if c.CA.MaxNames == 0 {

‎cmd/boulder-publisher/main.go‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package main
22

33
import (
44
"flag"
5-
"fmt"
65
"os"
76

87
ct "github.com/google/certificate-transparency-go"
@@ -34,8 +33,8 @@ type config struct {
3433
}
3534

3635
func main() {
37-
grpcPort := flag.Int("port", 0, "gRPC listen port override")
38-
debugPort := flag.Int("debug-port", 0, "Debug server port override")
36+
grpcAddr := flag.String("addr", "", "gRPC listen address override")
37+
debugAddr := flag.String("debug-addr", "", "Debug server address override")
3938
configFile := flag.String("config", "", "File path to the configuration file for this service")
4039
flag.Parse()
4140
if *configFile == "" {
@@ -49,11 +48,11 @@ func main() {
4948
err = features.Set(c.Publisher.Features)
5049
cmd.FailOnError(err, "Failed to set feature flags")
5150

52-
if *grpcPort != 0 {
53-
c.Publisher.GRPC.Address = fmt.Sprintf(":%d", *grpcPort)
51+
if *grpcAddr != "" {
52+
c.Publisher.GRPC.Address = *grpcAddr
5453
}
55-
if *debugPort != 0 {
56-
c.Publisher.DebugAddr = fmt.Sprintf(":%d", *debugPort)
54+
if *debugAddr != "" {
55+
c.Publisher.DebugAddr = *debugAddr
5756
}
5857

5958
scope, logger := cmd.StatsAndLogging(c.Syslog, c.Publisher.DebugAddr)

‎cmd/boulder-ra/main.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,8 @@ type config struct {
100100
}
101101

102102
func main() {
103-
grpcPort := flag.Int("port", 0, "gRPC listen port override")
104-
debugPort := flag.Int("debug-port", 0, "Debug server port override")
103+
grpcAddr := flag.String("addr", "", "gRPC listen address override")
104+
debugAddr := flag.String("debug-addr", "", "Debug server address override")
105105
configFile := flag.String("config", "", "File path to the configuration file for this service")
106106
flag.Parse()
107107
if *configFile == "" {
@@ -116,11 +116,11 @@ func main() {
116116
err = features.Set(c.RA.Features)
117117
cmd.FailOnError(err, "Failed to set feature flags")
118118

119-
if *grpcPort != 0 {
120-
c.RA.GRPC.Address = fmt.Sprintf(":%d", *grpcPort)
119+
if *grpcAddr != "" {
120+
c.RA.GRPC.Address = *grpcAddr
121121
}
122-
if *debugPort != 0 {
123-
c.RA.DebugAddr = fmt.Sprintf(":%d", *debugPort)
122+
if *debugAddr != "" {
123+
c.RA.DebugAddr = *debugAddr
124124
}
125125

126126
scope, logger := cmd.StatsAndLogging(c.Syslog, c.RA.DebugAddr)

‎cmd/boulder-sa/main.go‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package main
22

33
import (
44
"flag"
5-
"fmt"
65
"os"
76

87
"github.com/letsencrypt/boulder/cmd"
@@ -28,8 +27,8 @@ type config struct {
2827
}
2928

3029
func main() {
31-
grpcPort := flag.Int("port", 0, "gRPC listen port override")
32-
debugPort := flag.Int("debug-port", 0, "Debug server port override")
30+
grpcAddr := flag.String("addr", "", "gRPC listen address override")
31+
debugAddr := flag.String("debug-addr", "", "Debug server address override")
3332
configFile := flag.String("config", "", "File path to the configuration file for this service")
3433
flag.Parse()
3534
if *configFile == "" {
@@ -44,11 +43,11 @@ func main() {
4443
err = features.Set(c.SA.Features)
4544
cmd.FailOnError(err, "Failed to set feature flags")
4645

47-
if *grpcPort != 0 {
48-
c.SA.GRPC.Address = fmt.Sprintf(":%d", *grpcPort)
46+
if *grpcAddr != "" {
47+
c.SA.GRPC.Address = *grpcAddr
4948
}
50-
if *debugPort != 0 {
51-
c.SA.DebugAddr = fmt.Sprintf(":%d", *debugPort)
49+
if *debugAddr != "" {
50+
c.SA.DebugAddr = *debugAddr
5251
}
5352

5453
scope, logger := cmd.StatsAndLogging(c.Syslog, c.SA.DebugAddr)

‎cmd/boulder-va/main.go‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package main
22

33
import (
44
"flag"
5-
"fmt"
65
"os"
76
"strings"
87
"time"
@@ -51,8 +50,8 @@ type config struct {
5150
}
5251

5352
func main() {
54-
grpcPort := flag.Int("port", 0, "gRPC listen port override")
55-
debugPort := flag.Int("debug-port", 0, "Debug server port override")
53+
grpcAddr := flag.String("addr", "", "gRPC listen address override")
54+
debugAddr := flag.String("debug-addr", "", "Debug server address override")
5655
configFile := flag.String("config", "", "File path to the configuration file for this service")
5756
flag.Parse()
5857
if *configFile == "" {
@@ -67,11 +66,11 @@ func main() {
6766
err = features.Set(c.VA.Features)
6867
cmd.FailOnError(err, "Failed to set feature flags")
6968

70-
if *grpcPort != 0 {
71-
c.VA.GRPC.Address = fmt.Sprintf(":%d", *grpcPort)
69+
if *grpcAddr != "" {
70+
c.VA.GRPC.Address = *grpcAddr
7271
}
73-
if *debugPort != 0 {
74-
c.VA.DebugAddr = fmt.Sprintf(":%d", *debugPort)
72+
if *debugAddr != "" {
73+
c.VA.DebugAddr = *debugAddr
7574
}
7675

7776
scope, logger := cmd.StatsAndLogging(c.Syslog, c.VA.DebugAddr)

‎test/startservers.py‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -79,24 +79,24 @@ def start(race_detection, fakeclock=None):
7979
[8012, 'boulder-va --config %s' % os.path.join(default_config_dir, "va-remote-b.json")],
8080
])
8181
progs.extend([
82-
[8003, 'boulder-sa --config %s --port 9095 --debug-port 8003' % os.path.join(default_config_dir, "sa.json")],
83-
[8103, 'boulder-sa --config %s --port 9195 --debug-port 8103' % os.path.join(default_config_dir, "sa.json")],
82+
[8003, 'boulder-sa --config %s --addr :9095 --debug-addr :8003' % os.path.join(default_config_dir, "sa.json")],
83+
[8103, 'boulder-sa --config %s --addr :9195 --debug-addr :8103' % os.path.join(default_config_dir, "sa.json")],
8484
[4500, 'ct-test-srv --config test/ct-test-srv/ct-test-srv.json'],
85-
[8009, 'boulder-publisher --config %s --port 9091 --debug-port 8009' % os.path.join(default_config_dir, "publisher.json")],
86-
[8109, 'boulder-publisher --config %s --port 9191 --debug-port 8109' % os.path.join(default_config_dir, "publisher.json")],
85+
[8009, 'boulder-publisher --config %s --addr :9091 --debug-addr :8009' % os.path.join(default_config_dir, "publisher.json")],
86+
[8109, 'boulder-publisher --config %s --addr :9191 --debug-addr :8109' % os.path.join(default_config_dir, "publisher.json")],
8787
[9380, 'mail-test-srv --closeFirst 5 --cert test/mail-test-srv/localhost/cert.pem --key test/mail-test-srv/localhost/key.pem'],
8888
[8005, 'ocsp-responder --config %s' % os.path.join(default_config_dir, "ocsp-responder.json")],
8989
# The gsb-test-srv needs to be started before the VA or its intial DB
9090
# update will fail and all subsequent lookups will be invalid
9191
[6000, 'gsb-test-srv -apikey my-voice-is-my-passport'],
9292
[8055, 'dns-test-srv'],
93-
[8004, 'boulder-va --config %s --port 9092 --debug-port 8004' % os.path.join(default_config_dir, "va.json")],
94-
[8104, 'boulder-va --config %s --port 9192 --debug-port 8104' % os.path.join(default_config_dir, "va.json")],
95-
[8001, 'boulder-ca --config %s --ca-port 9093 --ocsp-port 9096 --debug-port 8001' % os.path.join(default_config_dir, "ca.json")],
96-
[8101, 'boulder-ca --config %s --ca-port 9193 --ocsp-port 9196 --debug-port 8101' % os.path.join(default_config_dir, "ca.json")],
93+
[8004, 'boulder-va --config %s --addr :9092 --debug-addr :8004' % os.path.join(default_config_dir, "va.json")],
94+
[8104, 'boulder-va --config %s --addr :9192 --debug-addr :8104' % os.path.join(default_config_dir, "va.json")],
95+
[8001, 'boulder-ca --config %s --ca-addr :9093 --ocsp-addr :9096 --debug-addr :8001' % os.path.join(default_config_dir, "ca.json")],
96+
[8101, 'boulder-ca --config %s --ca-addr :9193 --ocsp-addr :9196 --debug-addr :8101' % os.path.join(default_config_dir, "ca.json")],
9797
[8006, 'ocsp-updater --config %s' % os.path.join(default_config_dir, "ocsp-updater.json")],
98-
[8002, 'boulder-ra --config %s --port 9094 --debug-port 8002' % os.path.join(default_config_dir, "ra.json")],
99-
[8102, 'boulder-ra --config %s --port 9194 --debug-port 8102' % os.path.join(default_config_dir, "ra.json")],
98+
[8002, 'boulder-ra --config %s --addr :9094 --debug-addr :8002' % os.path.join(default_config_dir, "ra.json")],
99+
[8102, 'boulder-ra --config %s --addr :9194 --debug-addr :8102' % os.path.join(default_config_dir, "ra.json")],
100100
[4431, 'boulder-wfe2 --config %s' % os.path.join(default_config_dir, "wfe2.json")],
101101
[4000, 'boulder-wfe --config %s' % os.path.join(default_config_dir, "wfe.json")],
102102
])

0 commit comments

Comments
 (0)