Merge branch 'master' into log-rotate-size

Author: Christopher M. Neill

.gitignore

@@ -5,3 +5,5 @@ hellorunnable
 dump.rdb
 erl_crash.dump
 npm-debug.log
+ca.srl
+.DS_Store

ansible/prod-hosts/docks.js

@@ -43,6 +43,13 @@ ec2.describeInstances(params, function (err, data) {
     });
   });
 
+  // Filter out staging docks
+  instances = instances.filter(function (instance) {
+    return !instance.Tags.some(function (tag) {
+      return tag.Key === 'env' && tag.Value === 'staging';
+    });
+  })
+
   // Map the instances to their private ip addresses
   // NOTE This will work locally because of the wilcard ssh proxy in the config
   var hosts = instances.map(function (instance) {

ansible/roles/docker_client/files/certs/staging-swarm-manager/cert.pem

@@ -0,0 +1,21 @@
+-----BEGIN CERTIFICATE-----
+MIIDejCCAmKgAwIBAgIJAJ/550P03JdFMA0GCSqGSIb3DQEBCwUAMIGQMQswCQYD
+VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZyYW5j
+aXNjbzERMA8GA1UEChMIUnVubmFibGUxDDAKBgNVBAsTA09wczESMBAGA1UEAxMJ
+bG9jYWxob3N0MR8wHQYJKoZIhvcNAQkBFhBvcHNAcnVubmFibGUuY29tMB4XDTE1
+MTIwNzIyMTc1MVoXDTE2MTIwNjIyMTc1MVowETEPMA0GA1UEAwwGY2xpZW50MIIB
+IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4z5nsXMSt99oGRUrj1LEEhMb
+GNwGRwurhzu5ctpHI7Fi4O70/GbiGdpcXEpjrh8mXSdoZ1LtRdj7DwKsyXN8XJfJ
+uOo3a1p3gXQzxJJw2p1yAjPHvW8nHQoShkRUTnfJxYLfQHMj6+8Kg99w4yJDTzik
+lyI6IEk9edFVVWXasuzJaBkxHHh19LpP2nl4fBtNtG4yQ+1ddOScBz5+ITMz8LIM
+uHjdUH9H/sebU4yzcPla+X7kVJLcG0plCU8uZfZWkH5QmTK8hFxaZCjqlEYtxWMI
+9mG/OYJYjs0vwCxPLQxRSVmlfo+bctGNY5nMKusxe78BBTjtAM5oiR70RfCmowID
+AQABo1UwUzAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwMgYDVR0RBCsw
+KYcECgABhocECgQG+4cEChQBO4cECgAB74cEfwAAAYIJbG9jYWxob3N0MA0GCSqG
+SIb3DQEBCwUAA4IBAQA6/dZjQBz1rmyjAixguqVB0ijppVzkN3ubyU3DBxCaBJ8d
+dOHzoT06vweke8lRJ21VgYKXhpj7zSLUv4adqZVc6zYZLatLGwEjqLknm4NMjzm5
+Gm97dOWjQPiPFI3RBGtUN52GbPIA3lgEyLGMmc4pVl0tKyT5O90Fl9r+faI75vau
+XF72sUMtqkuCj2Ikebf0GBgWWujT3eLVzE076ydBacn7tPXYSCPGx9kKFfSVqiC6
+2qvnVdkCFwvSKa0HgPOHihGwG1EK6WVaBdh1sfOGVlGOR0aObj3SzR+fGoA6/L/M
+clWl1s+a2YUKAw7GF8wZS5MZLCaJeqlmYfkE1mlX
+-----END CERTIFICATE-----

ansible/roles/docker_client/files/certs/staging-swarm-manager/key.pem

@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEpQIBAAKCAQEA4z5nsXMSt99oGRUrj1LEEhMbGNwGRwurhzu5ctpHI7Fi4O70
+/GbiGdpcXEpjrh8mXSdoZ1LtRdj7DwKsyXN8XJfJuOo3a1p3gXQzxJJw2p1yAjPH
+vW8nHQoShkRUTnfJxYLfQHMj6+8Kg99w4yJDTziklyI6IEk9edFVVWXasuzJaBkx
+HHh19LpP2nl4fBtNtG4yQ+1ddOScBz5+ITMz8LIMuHjdUH9H/sebU4yzcPla+X7k
+VJLcG0plCU8uZfZWkH5QmTK8hFxaZCjqlEYtxWMI9mG/OYJYjs0vwCxPLQxRSVml
+fo+bctGNY5nMKusxe78BBTjtAM5oiR70RfCmowIDAQABAoIBAQCdaBjDngYVP7cH
+yNZHjPkr2/glHCNtCvRh1Ej8+Z3VZ4YqcNtaCpoLdmoLs6ugbQtR834qNBMPEuG0
+4BF36Xr3WFzura59ukiVbzx8qUNq6yyRwfRVj6z0PIngX2xWfjtRiPnD1v3G6+nI
+tvmnG5CsS3wXBCpnOtROkWYepVL8JCKffnsXkbv8zGwjb9+rWgmID+p43pD3WVqY
+mPpa54iprEFq57OgoEkvN73oihv25KvW8JBc3CJE0qE9fYmAxsnGiUFdBpzJUPgB
+anm27BX9SGsDqu0wn4Ywfj9v2jocecVWryOlVjD0WS9snUNnFvNRVU/xNDn0BEBg
+WICwxJTBAoGBAPUEKt+y6kxDK5xsN4ZelLGNcub17MKBfKlBDk17huT4YbXaznKG
+QXj85cm6CRqk1GcJgTBMHal8pvTekaPB5B1pur4yaKT4g5axry7JR4X3V32Pj4Zu
+N6AzckmQJ+K7+wae2RC+bMr8xEh+sREXyE+y0nrlVY8AIq5AKZWB3rcZAoGBAO1u
+R0S5RG0lvxphwsv0At8uFDSV1zmsio/8X2hoqww3g3Vvd9o+GE7/th6QEAL9imvx
+dHhWy6+3OHYCMJDO+RpUvZ4M96WiMN1mFVZHQFvqS6Zm5oSzfXrvFCkgA9N3kIxf
+RZTK/4WrkVHDnGuPJERVxECcsgRhz8WJn+VJ++8bAoGBAJENwZAj7P/vOE9n5ctg
+DSm8cwz3BQ719+aABEas3eSKg9ZUzqoQf4xwNF4kDCXA9Zp2jwwX0+u2R2VqqtBH
+BpS/NnZJg5g/JDA/y1WohfZyw1Irfq34bGgkbQHOHT7nSSrXOezmv6PA1zeQAaX7
+7XP5ixCE2w1I6D8+7x96/m5pAoGBAMEXOFqJmT5yvjIEY1levp8maERDv98llSJ4
+CldtF/49f2mYF46jhT1p9IByhLMJ4vLaUPA1Fj128jH2oeyChk+FrxfET/qiJr9H
+b/7Uv2CA8LkJYlt1ZYz+thSj9riZujKOoJXbaWcaGnq2bJWEuefhIFOzm4q4yTJL
+NIBSZNMVAoGAU9P8xwxhUV7lf5RodMPC2uMcBQPcJ6613kC3ZaJdUSRuP0J2O2hi
+BY2GitG0MAbRhUiZHWXVeFxKabwp5Rnnc/sBvWYA9o7x1DM84t6GIEVJ+MXRLFuY
+ziR4K3icra6M/qSc0lMZZSYH9YIhsEIInD7gVLxsGeAfXfqKpNAvAiY=
+-----END RSA PRIVATE KEY-----

ansible/roles/docker_client/scripts/genClientCert.sh

@@ -28,7 +28,7 @@ openssl req \
 chmod 400 "$CLIENT/client.csr"
 
 echo extendedKeyUsage=clientAuth,serverAuth > "$CLIENT/extfile.cnf"
-echo subjectAltName=IP:10.4.6.251,IP:10.20.1.59,IP:10.0.1.239,IP:127.0.0.1,DNS:localhost >> "$CLIENT/extfile.cnf"
+echo subjectAltName=IP:10.0.1.134,IP:10.4.6.251,IP:10.20.1.59,IP:10.0.1.239,IP:127.0.0.1,DNS:localhost >> "$CLIENT/extfile.cnf"
 
 # generate cert for client
 openssl x509 \