Clean up README and test configs (#4185)

- docker-rebuild isn't needed now that boulder and bhsm containers run directly off
 the boulder-tools image.
- Remove DNS options from RA config.
- Remove GSB options from VA config.

README.md

@@ -106,10 +106,6 @@ Alternatively, you can override the docker-compose.yml default with an environme
 
 Boulder's default VA configuration (`test/config/va.json`) is configured to connect to port 5002 to validate HTTP-01 challenges and port 5001 to validate TLS-ALPN-01 challenges. If you want to solve challenges with a client running on your host you should make sure it uses these ports to respond to validation requests, or update the VA configuration's `portConfig` to use ports 80 and 443 to match how the VA operates in production and staging environments. If you use a host-based firewall (e.g. `ufw` or `iptables`) make sure you allow connections from the Docker instance to your host on the required ports.
 
-If a base image changes (i.e. `letsencrypt/boulder-tools`) you will need to rebuild images for both the boulder and bhsm containers and re-create them. The quickest way to do this is with this command:
-
-    ./docker-rebuild.sh
-
 
 ### Working with Certbot
 

cmd/config.go

@@ -182,14 +182,6 @@ type OCSPUpdaterConfig struct {
 	Features map[string]bool
 }
 
-// GoogleSafeBrowsingConfig is the JSON config struct for the VA's use of the
-// Google Safe Browsing API.
-type GoogleSafeBrowsingConfig struct {
-	APIKey    string
-	DataDir   string
-	ServerURL string
-}
-
 // SyslogConfig defines the config for syslogging.
 type SyslogConfig struct {
 	StdoutLevel int

docker-rebuild.sh

@@ -1,11 +0,0 @@
-#!/bin/bash -ex
-# Stop any running boulder containers
-docker-compose stop
-# Rebuild anything that has changed since the last run
-docker-compose build
-# If docker-compose run is used before using `up -d` docker will
-# default to using old containers built from previous images
-# (if anything has changed). `up` takes any changes in configuration
-# or image into consideration when choosing which containers to
-# bring back up and will recreate any that are out of date
-docker-compose up -d

test/config-next/ra.json

@@ -122,10 +122,5 @@
   "syslog": {
     "stdoutlevel": 6,
     "sysloglevel": 4
-  },
-
-  "common": {
-    "dnsTimeout": "1s",
-    "dnsAllowLoopbackAddresses": true
   }
 }

test/config-next/va.json

@@ -26,11 +26,6 @@
         "ra.boulder"
       ]
     },
-    "GoogleSafeBrowsing": {
-      "APIKey": "my-voice-is-my-passport",
-      "DataDir": "/tmp",
-      "ServerURL": "http://va1.boulder:6000"
-    },
     "features": {
       "CAAValidationMethods": true,
       "CAAAccountURI": true,

test/config/ra.json

@@ -3,11 +3,6 @@
     "rateLimitPoliciesFilename": "test/rate-limit-policies.yml",
     "maxConcurrentRPCServerRequests": 100000,
     "maxContactsPerRegistration": 100,
-    "dnsTries": 3,
-    "dnsResolvers": [
-      "127.0.0.1:8053",
-      "127.0.0.1:8054"
-    ],
     "debugAddr": ":8002",
     "hostnamePolicyFile": "test/hostname-policy.json",
     "maxNames": 100,
@@ -100,10 +95,5 @@
   "syslog": {
     "stdoutlevel": 6,
     "sysloglevel": 4
-  },
-
-  "common": {
-    "dnsTimeout": "1s",
-    "dnsAllowLoopbackAddresses": true
   }
 }

test/config/va.json

@@ -26,11 +26,6 @@
         "ra.boulder"
       ]
     },
-    "GoogleSafeBrowsing": {
-      "APIKey": "my-voice-is-my-passport",
-      "DataDir": "/tmp",
-      "ServerURL": "http://va1.boulder:6000"
-    },
     "features": {
     }
   },