Skip to content

Commit 92d1925

Browse files
committed
Fix boulder
©! I, Hugo Landau <hlandau@devever.net>, hereby licence these changes under the ©! licence with SHA256 hash ©! fd80a26fbb3f644af1fa994134446702932968519797227e07a1368dea80f0bc.
1 parent 78e755c commit 92d1925

File tree

1 file changed

+50
-17
lines changed

1 file changed

+50
-17
lines changed

.travis/boulder.patch

Lines changed: 50 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,41 @@
1+
diff --git a/cmd/shell.go b/cmd/shell.go
2+
index 353d5e1f..8c2a432b 100644
3+
--- a/cmd/shell.go
4+
+++ b/cmd/shell.go
5+
@@ -24,7 +24,6 @@ import (
6+
"fmt"
7+
"io/ioutil"
8+
"log"
9+
- "log/syslog"
10+
"net/http"
11+
"net/http/pprof"
12+
"os"
13+
@@ -130,19 +129,7 @@ func StatsAndLogging(logConf SyslogConfig, addr string) (metrics.Scope, blog.Log
14+
}
15+
16+
func NewLogger(logConf SyslogConfig) blog.Logger {
17+
- tag := path.Base(os.Args[0])
18+
- syslogger, err := syslog.Dial(
19+
- "",
20+
- "",
21+
- syslog.LOG_INFO, // default, not actually used
22+
- tag)
23+
- FailOnError(err, "Could not connect to Syslog")
24+
- syslogLevel := int(syslog.LOG_INFO)
25+
- if logConf.SyslogLevel != 0 {
26+
- syslogLevel = logConf.SyslogLevel
27+
- }
28+
- logger, err := blog.New(syslogger, logConf.StdoutLevel, syslogLevel)
29+
- FailOnError(err, "Could not connect to Syslog")
30+
+ logger := blog.NewMock()
31+
32+
_ = blog.Set(logger)
33+
cfsslLog.SetLogger(cfsslLogger{logger})
134
diff --git a/start.py b/start.py
2-
index 347883e..448295f 100755
35+
index 1c1a90bb..b5a0955c 100755
336
--- a/start.py
437
+++ b/start.py
5-
@@ -18,6 +18,7 @@ import startservers
38+
@@ -19,6 +19,7 @@ import startservers
639
if not startservers.start(race_detection=False):
740
sys.exit(1)
841
try:
@@ -11,25 +44,25 @@ index 347883e..448295f 100755
1144

1245
# If we reach here, a child died early. Log what died:
1346
diff --git a/test/config-next/va.json b/test/config-next/va.json
14-
index 374ff68..4e701da 100644
47+
index f90e1856..8721b69f 100644
1548
--- a/test/config-next/va.json
1649
+++ b/test/config-next/va.json
17-
@@ -4,7 +4,7 @@
50+
@@ -3,7 +3,7 @@
1851
"userAgent": "boulder",
19-
"debugAddr": "localhost:8004",
52+
"debugAddr": ":8004",
2053
"portConfig": {
2154
- "httpPort": 5002,
2255
+ "httpPort": 80,
2356
"httpsPort": 5001,
2457
"tlsPort": 5001
2558
},
2659
diff --git a/test/config/ca.json b/test/config/ca.json
27-
index eb6a2c1..7c6c0e3 100644
60+
index d5f78c2c..66cfa251 100644
2861
--- a/test/config/ca.json
2962
+++ b/test/config/ca.json
30-
@@ -5,11 +5,11 @@
31-
"ecdsaProfile": "ecdsaEE",
32-
"debugAddr": ":8001",
63+
@@ -27,11 +27,11 @@
64+
]
65+
},
3366
"Issuers": [{
3467
- "ConfigFile": "test/test-ca.key-pkcs11.json",
3568
+ "File": "test/test-ca.key",
@@ -42,24 +75,24 @@ index eb6a2c1..7c6c0e3 100644
4275
"NumSessions": 2
4376
}],
4477
diff --git a/test/config/va.json b/test/config/va.json
45-
index 8d0fcef..4da51fc 100644
78+
index 91a6727c..2921c453 100644
4679
--- a/test/config/va.json
4780
+++ b/test/config/va.json
48-
@@ -4,7 +4,7 @@
81+
@@ -3,7 +3,7 @@
4982
"userAgent": "boulder",
50-
"debugAddr": "localhost:8004",
83+
"debugAddr": ":8004",
5184
"portConfig": {
5285
- "httpPort": 5002,
5386
+ "httpPort": 80,
5487
"httpsPort": 5001,
5588
"tlsPort": 5001
5689
},
5790
diff --git a/test/hostname-policy.json b/test/hostname-policy.json
58-
index 6397ee9..15ad50c 100644
91+
index 5eaad17e..503badc1 100644
5992
--- a/test/hostname-policy.json
6093
+++ b/test/hostname-policy.json
61-
@@ -1,12 +1,6 @@
62-
{
94+
@@ -5,12 +5,6 @@
95+
],
6396
"Blacklist": [
6497
"in-addr.arpa",
6598
- "example",
@@ -73,7 +106,7 @@ index 6397ee9..15ad50c 100644
73106
]
74107
}
75108
diff --git a/test/rate-limit-policies.yml b/test/rate-limit-policies.yml
76-
index 41aadd3..66c2662 100644
109+
index 157d9d2b..6e8070b6 100644
77110
--- a/test/rate-limit-policies.yml
78111
+++ b/test/rate-limit-policies.yml
79112
@@ -4,7 +4,7 @@ totalCertificates:
@@ -85,7 +118,7 @@ index 41aadd3..66c2662 100644
85118
overrides:
86119
ratelimit.me: 1
87120
lim.it: 0
88-
@@ -30,7 +30,7 @@ pendingAuthorizationsPerAccount:
121+
@@ -41,7 +41,7 @@ pendingOrdersPerAccount:
89122
threshold: 3
90123
certificatesPerFQDNSet:
91124
window: 24h

0 commit comments

Comments
 (0)