diff --git a/Dockerfile b/Dockerfile index e9f2cb7a..5c2dd5c8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,11 +19,11 @@ ADD . /go/src ARG VERSION # Build the server inside the container -RUN CGO_ENABLED=0 GOOS=${TARGETPLATFORM%/*} GOARCH=${TARGETPLATFORM#*/} go build -a -installsuffix cgo \ - -ldflags "-w -s -X main.Version=$VERSION" -o /gubernator /go/src/cmd/gubernator +RUN CGO_ENABLED=0 GOOS=${TARGETPLATFORM%/*} GOARCH=${TARGETPLATFORM#*/} go build \ + -ldflags "-w -s -X main.Version=$VERSION" -o /gubernator /go/src/cmd/gubernator/main.go -RUN CGO_ENABLED=0 GOOS=${TARGETPLATFORM%/*} GOARCH=${TARGETPLATFORM#*/} go build -a -installsuffix cgo \ - -ldflags "-w -s" -o /healthcheck /go/src/cmd/healthcheck +RUN CGO_ENABLED=0 GOOS=${TARGETPLATFORM%/*} GOARCH=${TARGETPLATFORM#*/} go build \ + -ldflags "-w -s" -o /healthcheck /go/src/cmd/healthcheck/main.go # Create our deploy image FROM scratch diff --git a/certs/ca.cert b/certs/ca.cert index 9fa4ef10..670d78c3 100644 --- a/certs/ca.cert +++ b/certs/ca.cert @@ -1,29 +1,31 @@ -----BEGIN CERTIFICATE----- -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 -----END CERTIFICATE----- diff --git a/certs/ca.key b/certs/ca.key index 57ec1af3..3e10a889 100644 --- a/certs/ca.key +++ b/certs/ca.key @@ -1,51 +1,52 @@ ------BEGIN RSA PRIVATE KEY----- -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 ------END RSA PRIVATE KEY----- +-----BEGIN PRIVATE KEY----- +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 +zxF8sH1SWeDb5Y2s0rJ4t4Zh+9jLpw== +-----END PRIVATE KEY----- diff --git a/certs/client-auth-ca.key b/certs/client-auth-ca.key index 0ff281dd..0ea0d315 100644 --- a/certs/client-auth-ca.key +++ b/certs/client-auth-ca.key @@ -1,30 +1,30 @@ -----BEGIN ENCRYPTED PRIVATE KEY----- -MIIFHzBJBgkqhkiG9w0BBQ0wPDAbBgkqhkiG9w0BBQwwDgQI/2GU+x1iW6wCAggA -MB0GCWCGSAFlAwQBKgQQLvmM7reT65QOjKgAjcdrPgSCBNDvT8WR6aYUAmo+wTO4 -IA5G2tMuAEupBFc4RDQJbCA8mLNcERXF+T/cD1vCqAcYDJL523mflrzJS7FflWpN -pVgEHOwcvhp96gPyiUyoJXeH9BsQEGtee5NEPw0aOUAlS6OVAGd3L2e7xM1JjMPL -rvlv16+qYVZniy5EAOvLgNa0eJyNd3bKolIqWedDMUWN7qFBik5oJdUmZ2WBMxFJ -2EgbNPV12FtZth1swYHDRcjAycz1O0HC7ymNbTsG3fGroh5kC6DrGOnMyPFbTel8 -FV9M0gu9ZCh20gUj/mI736n9SMXBWllGChITsGgaGaSn5H6sVuJ3Y09otHCRTzkA -u5li+QsCjlkkguUhBfT/x6RLVgMe0jNcg2vdVYl4LEcD3VkHbZc7AU2ufdhACg+m -PmRrTcd9oeDJ81PToHocPJ7CAkB+DIWO6MQ9MCK03rTduVW7auguxji5vP3l9kna -mSTfCy03IMHN4T4tP8uhcTx5Br2WKTHO2uafiH/ns4rhWet/Sy+GWA3VGXBcLzF0 -Lh7E+repWELgilLwmSSVH098KD6PwNBCGwCcFRDSI2sZCAYjE/CchIVi0d5vr9FD -YHTzP/7eO5nWs0DpCV1hogWv41d4ZPSI7YC7bxn2Q+kPlkuYGaLTiV0LQbMdWDBJ -35Px5dir5kw1c9Q4pq4FL9vDgUjesSUE848hspeJfIxHFenUE9vxk85UVShI0RV0 -MWjwqxPWczoHsJpGtaPFfrVcZ//SPFklrpEcoRABDS4jweCH+qcdu+Ngr2+GYsU6 -euOMn2u5F5rDY2ZTOimdNJugux9TnW4HjQPg2cZ9wtMX4nF9XEV1Cfqv4fbMDAsF -zB4+D4btwCPqGRwpdwJ7BjwbuEMRVXIBfZ6rTjxt3j3VBV6N8+pXO6kVyYLN8JsZ -LKPR5BYcA4ZnMWD+saoyVY0XqMLyR+Oz6WC8Z9P6VK9B0+fZL5F4CwzfGyOwu2oK -6elGtPSki7GmoFa2SogHItl33NX4/77oDhkNF4dv3Ud14el3aU9YM6m8kJWLBdtM -q4m3JiNGGFxHpMDiSWcPW8IpDAYyCpJfz1TNst+Dtc1C1g99d8s5OarlxmTOteKF -394bjTBg78LKSN+TLnA/cBbjjGvOVB0NBQ7MpZvP3aRDYLVlcAwsWD67E7RxJ/Pm -1YVaomCgoUPwEANKC1GmDjQaHiVMeTzYKkdEjr15azZBYvWp+d0SNwhMqPqOPaEH -EAvf5nYjTsfdWrg0YwJBDfA0VcF8keFfasLGZum474asa3fE34Kth0mOkH+2yWyI -efKInb2GF40cc5pbzJxFu10krjuHJVFj32VhVmmlwhaPw8say0vH6V8PLHWVWRD+ -oYZ41W8KxJ1CkeZSPlWSViqXBlBclqvGxRSPqKvtQLgofBxo284SnpoK9frD1iUW -2vkgw3lVcqQcB78CtRJ4wb9kYiGBZwakZSusOwuUz0yO+GxrDDAPQV+z+5gJ++Xr -9lrbOYMmx5Z9ohY0PUM1us2QckfHGxxB1qZrsDEDsLI4I5jfTIWn6S/97RUvL/vp -UpYktJhzcarEcteTivNadX7oUGGjua29KuawT0L90FHsvLoEZeIlTyBYSy5PFHgf -BEPXVS2yS0ucXm7l31aJrGwOog== +MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIdH0gkBj23oMCAggA +MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECAk8JjyOt3SYBIIEyLjfiBvJEO8w +fhZ3+ebjghjxi3iy3MAj1dZj3BwiqLHDIeOvAJ5Hpvyz9pdqx7rzdb8Qbfq/MqAf +u19/cDoxVN9toS/QAs5M3JidwjAnrJxgqpN5EnPKFFPh+/WsWrvyXBXyBjcgXBTd +8lYpPZDs1fKj46L+KxWcUZzLDKeIxx5RsOjSzDCg6G3mAx65G9fM3uI2JZzkOArq +lRU3GyZxpBxY/2s4RMIpV/rvI15hcLO09J/9uMk9dF61rt6E7kQHrLxcn2MPg/Ef +ktE8qMS6RPIqVo5YpxKzKEDXo6iVJ4UdWFn71CrTBC33bvAyGC7sonBshjDD+cWz +nP3n7ezo1l7J4hUsNyKBD/m/IGDSJd0wz1JNFQDNYaDOolyZiOFFXXtmIgDr4VZq +I+3UgdFY5UwkFo+tr5KynxwuJ0OKhhj69vUC9gfgeX8mc3Mh7mQ0ggUJ3WjRV5ry +Ml61hd4ta/LYx89MupEPiKb0g7zMsO26z437bjjx9QQ9m+D0eaWLoe8zI2jovLA2 +6PLDGKPXZTyDC5Xba3Jqmi8yP+vNE8m4Ba0nUx4FhP14Q5FAu63zd8IVe18nFcPP +riSZ+nFYhjyABRWaH7a9AVhe706E/GsxU6GEWPyvK8jWZD0ijMa1K3paYLwN8TlL +OGoxjxe3cDljcUk9+NLV/J0slYQFl3wekuQ2FTMYbceOd/vLiGAPQTWYtWdczGQt +5C8m6LqG1JMND9hZH3qebRzdrCVc/NKmz+OXHR5xVecFtxeNdeGVHKQ4iPRcdgOR +7wWaw5l8zaOz/xr/uBzYmTWdCfn0uuuiFqQJIFSFnaIE/ygLkZ5wxh6gffZk6Hgn ++mBWcSnEXcEMRl4j4d/X/7WUQpJwu1A2VnFJp1wgPkwCv7xhlNFM3qrqWm2JqDrh +0oj1ZtMkST/StdV4MTmnROeHFri26GZzt7zDW+mVfv9cGuRz2+tHGYIyGeqEz3ED +8YS/1mZDKz4sD0uGQf/vmsniUxsjc0nCotc6RZWUmaySZHZWWavvB4pfsZaD4Sow +RtsiG5ChHCHKPEmhxZHOI/SjX4w/+kSJFoFBc2a/rkBidWxzilduEIgVWTfHCV/6 +WSmL6/egKYW8fEDjiJhXDEFBnZwAjOYWjo0aZbG45qtnwHHbg/kk7KdQ3x3eIwEI +HFU6QLRfnpAVJjhydxvDBxO79jACl3kGgo9C5s+7Wlq38l+htGhDjQl9w2asJtI/ +ncvyJ67lr8f2VZedOwe7TkRkyDwq6bsVSRRxSjpUYJP55q9uuivzz2Q5Xehtbt4Z +ddaVYxhwOMJKGLpAcvbxd1XVqXvWsw2ve5tBwBQVwFxXkypD5MY1Z3YuEz8Prure +Zoa3lE7FaBiSv9MzQf1KpQTDnVCuMdhPDtYD0ZgsBK00TnPKR4y92x1hEOjulF1K +f7Plqr5oc1zaIGXV16KaFNuSG/dIMZXBz4gWMHriM81FkQYGsvKF/oC7XBJ4P7As +f2c9hmD0fyDB0jylm5idgwtbp2pI52VAUnV27H65/xU4lW0lDOOW5HNBxQPEvpPM +bUugAOfHR5aZwOMGWn0aVR5HYB4nBpBTIayZxIjpsGmIp85Lk9OmIYTdSHLsh7cF +mMLIvZaG0jqi47cL+buWeQ== -----END ENCRYPTED PRIVATE KEY----- diff --git a/certs/client-auth-ca.pem b/certs/client-auth-ca.pem index 46fcd1c8..a9d424f0 100644 --- a/certs/client-auth-ca.pem +++ b/certs/client-auth-ca.pem @@ -1,21 +1,23 @@ -----BEGIN CERTIFICATE----- -MIIDajCCAlICCQD4h1sg3O01MDANBgkqhkiG9w0BAQsFADB3MQswCQYDVQQGEwJU -WDELMAkGA1UECAwCVFgxIzAhBgNVBAoMGk1haWxndW4gVGVjaG5vbG9naWVzLCBJ -bmMuMRQwEgYDVQQDDAttYWlsZ3VuLmNvbTEgMB4GCSqGSIb3DQEJARYRYWRtaW5A -bWFpbGd1bi5jb20wHhcNMjIwMzAyMjE0NDExWhcNMzIwMjI4MjE0NDExWjB3MQsw -CQYDVQQGEwJUWDELMAkGA1UECAwCVFgxIzAhBgNVBAoMGk1haWxndW4gVGVjaG5v -bG9naWVzLCBJbmMuMRQwEgYDVQQDDAttYWlsZ3VuLmNvbTEgMB4GCSqGSIb3DQEJ -ARYRYWRtaW5AbWFpbGd1bi5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK -AoIBAQCtfCzUrC0WkfYzBX/hC3+mPLnlu8C3icGEvDidHBWCcOsvqZV9kqqme0PZ -HsZCEz29mHd5570rhyUd/bihluAm6cv5DsDHHHVL304VnYOpYk9T+XEQjX5gOWnu -lZdmlPm+iHMVIWHN0eMVRc/qwqjdtc501fk7vYgNTjvi8INPcYI8N4+BsFEshM1a -SEPIMSYAJsJKFsJTquVyfLvxsc+uL2Zi8D+GcivTscQWzCetRcM5MgZCKt7uEoss -UfNvl9TGQE07yCIkk9UnVM/z4GZ9nnpLtfYLl6b1+0BAzqOa05iT73AdNBdih8PT -BM8zR30yNXNiwdsOhGoJKfp1vyeZAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAEBg -wI0VFf4dYhqjIDnJ5IUnFuGe0nISerrbBLDFXVMA1A2s32E9Mhun3nUicW0fXyVP -8sRIvir1Z32o+tHEWg05qPXgk0LSNbcoq1pMBuKix6t8pBFDcevlC/oonAeunWMI -FZXnpxYhKjyOPg5KvqhqQqbqSvtcIGyy/dbgOrn+h4VxsIz11vUNDTwnlK9ZXi4d -mTjfUGhtoC0h6Y3jc7soBR0SzkR9abpjHhseN4Q4L7Pds/iEYNKz4gLOGceDIy0B -873VJ8XNSHOP7/6/8MM+DIFe4Z72Mx2z0fDuXj3saQ2CJdkhIGvgTlxmU2BUdHdi -q8gOQQ5/9b901pI1tgs= +MIIDzzCCAregAwIBAgIUfddMjWLf3sYH3SGFGrfP0GWqAa0wDQYJKoZIhvcNAQEL +BQAwdzELMAkGA1UEBhMCVFgxCzAJBgNVBAgMAlRYMSMwIQYDVQQKDBpNYWlsZ3Vu +IFRlY2hub2xvZ2llcywgSW5jLjEUMBIGA1UEAwwLbWFpbGd1bi5jb20xIDAeBgkq +hkiG9w0BCQEWEWFkbWluQG1haWxndW4uY29tMB4XDTIzMDMyODIzMDgwMVoXDTMz +MDMyNTIzMDgwMVowdzELMAkGA1UEBhMCVFgxCzAJBgNVBAgMAlRYMSMwIQYDVQQK +DBpNYWlsZ3VuIFRlY2hub2xvZ2llcywgSW5jLjEUMBIGA1UEAwwLbWFpbGd1bi5j +b20xIDAeBgkqhkiG9w0BCQEWEWFkbWluQG1haWxndW4uY29tMIIBIjANBgkqhkiG +9w0BAQEFAAOCAQ8AMIIBCgKCAQEAomJJjJWRsgWPr+stvH07e/5gDopermCPPbqe +nWxyjLUXhZyREqZ5rjPu5qqtujxQfhbO9nE3hAcvMrxlnSrUBbK2QMNFyiJYGFP7 +lk6NIqfrY2R6x1+XE8RlCT5Ze7ScGxPjhFocy8gS95pxBZ/LSoeA/5fiABiw5/Dd +u9UQsXP+TOVJj4ORFe8ITKUeX3FigK5g0CP2SodfQbQ0ePSAeJ/x1mzPZc+9esXI +u8mj33WK9Sn6QnyihIP0vuVx+jZVPglZooigAkCqPBxOV3tGG9+pfnAEGAf77q8b +uewGdUUTHSvZqQHAHeqIR9U5Z0GUN6ZnIq+fjRtYTdMgW+3L5QIDAQABo1MwUTAd +BgNVHQ4EFgQU43BIGhx16oKXmLWx1CiZx+TSekwwHwYDVR0jBBgwFoAU43BIGhx1 +6oKXmLWx1CiZx+TSekwwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOC +AQEASW+YDXY/H1KkyKVfCBTzVaSuGjzKaUWPIcED22MW/ehoMeRC3IglkGNp8Fkf +W/FZtui1yXWnchkeU5tUKKLEkKbZNx9nDp4s7wNOv148HPcLPtFnC+RuoRHXJB+O +RFJHlQjlY1COzqqXgTb/Lxw7T9PDHjLXUAy62bMd6Ws/uFtEIb4BCpNPed/tX5G1 +8JvUxJNcB/X1jrPwcsp1Ot5kTWLk6T46lFUUF0cD0lRlFKcilq4DOpI3yMRVy4vI +cRi0i6uyuwniTo2bn1FzeeQUjMELb/pgZ2r/Cou/Z0h0Cz8tM64CCNkGNwlZNxpl +NBwUZESpP7muqcoZGdLj7DCupQ== -----END CERTIFICATE----- diff --git a/certs/client-auth.key b/certs/client-auth.key index ef0e99a1..1ee95380 100644 --- a/certs/client-auth.key +++ b/certs/client-auth.key @@ -1,27 +1,28 @@ ------BEGIN RSA PRIVATE KEY----- -MIIEowIBAAKCAQEAxB3XH9zdLwZxcLtan7ZrUNwVkEN2KKvu31iNCWOFj+mWQ6HM -vbIYKC7lltTA0jMuAxyiKX/cRMGFZ7mlmfgxmDlAO9z4LLPOoumpRjK+OqLy8YlM -rit3r+XtikMzGPa4INEklfIn6kRzLz3pdUHGLVnf1YxChbcq9cmpa2kAfbBPZI+1 -NbEJgDlsDeUrdTeLbN5C+soyJ2So/ravverI/5lMizGqS8f9F+3IzJmRNXCNeNy6 -hpS6V9Vzy+/ZbdLnCRb2BNNCc6eFYy6OqHRvNvG64imuJG51cPsKvCgMoi3lB7fK -3BJ2y2rphUms4Nu5LXACIPu7m5bIat6jgutbpwIDAQABAoIBADilrefEMhdNMyMu -2sRbOrBGgewDsHObBgp5V3OozYF+JSsv5yW79YJV2XcxyOhuZBH+CVEXX5Z0l4YY -d577s8eWcdlYwE6ZOUyRVZWzPoNNYgMmd4GviIjET1Kqim3hhdnkzz6IjcL7NpIk -vfRipU2gMilKtERPXhdUwp0F3WBwNPVwiCX168MxcLrQtMjx/n863h0zaHbzv3cT -XWPt0Bjld36MKaXMTS7mm+EfNsZr2WHSrbEwzk9cjYQkevWIK1+EFKzo3dwhLxrO -iSbSLsuOaGRkFBXKfwJ4goQYSloPt1AXMK1G0lLSzH5/uDQFajwXDVCfHNiTG0tf -Sq18ToECgYEA8/DaLBsPpI/KKF4qY5l+Otb7sAG71AZVVMv3mZSRenyMJaGYXaaA -l7QNwH2vUyozVLwW3LQ3YipYN4tjYU5YugM7hG/lkHLFu31/ExnReUDeh6XcJCpc -o6PSyS9hDjfFLt1sh2enmXDYTfranBTxzwvmaqL9eI5/uleNWVxzOuECgYEAzc/B -yx5/SrBDSXiWn85u6n5V8EHRrcAsskGxNISP6gy6ARLSt7K/vfPuKuDDyGvepBB7 -jD/s48Pb41bV4xESroc6/4nDp2M1+CXRndWd72tclFLTobLmqzE17bIsJMN5U7CM -b7lyvaHoVCxVmtkXPe3qE5aZp3seMnlpfv1YL4cCgYEAur7olplE2WsGjO7Brqvj -+bF4zl4VZ5RNoPPgod8dm9JbC7fwx8jeasR5PqI5JQaKc1Tmf6ErQOg/zo3Tz7tF -q2ksGA/9gx6KByVksb+zIAssEFZF+B3B+7g/dqrhtxu0xVLXcbVFle7QeKoQzyot -j56Bj6MlPjSAzauW1xEyWaECgYAWBgZh2viaIHSC1zGfFjMOSsiddh2e7zKZPKhe -y1SvIf+Bf+cmmy0jgYfZ9MVenBRuEAl4f5q04M+V60PmEXyjSntIvxA9yEMNM9bT -gfltllqI0Lgu1HsUlKaFsgxBPt2r0/ejOQALRNkcsMXUVSjEisICqJn2rxkTI6Tj -Xu7h3wKBgDvvc/WXtpjgr71OwW95ZuzUsjlok+WvAAPSw5aqzUjbREotqYLm9I1g -3QwzySxtupiJMALHZWoiJrpsipKfLDx6Fj9zkvo/cuk0/27YWGSYVCJg6AsndoY7 -SLO6Oa2Ar/73wxMD/g+VqHkWe0IpFqU93lHys5y2g7SqMeaiWGav ------END RSA PRIVATE KEY----- +-----BEGIN PRIVATE KEY----- +MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQDJpFTQPaygT+yx +BSzCOAPISpJWyn3ZbUrfAros257Y8jY5RyY1tQ0D5MX90ppm1I0SpIEg9RYwjYuV +mgrVokrHQbTgrksBaA6Bcpx88ZnBMQwzso8VySxyl7BM2Ja4zx0/oU4x2kVlmCow +G9ina9qw8eQMDIebM8UtKEBaI5b5jlYTDzijNbO4CPvGnRzSUhFYdMo8mOThawtz +HLMd8ncpQAhRX0z5j3N/hgVnen0Kd17kFJuejVJ/G4ZfjgUHPssL9AaGhUpbOTyh ++pBFkkBYH9NzjXYJBbEGD+YCnR2X3arGq6rStzkxAW1AKjoquQIwAgRTIApC2Mk5 +ts50jAT1AgMBAAECggEAAp4YPsLKMqOO+EZPrC7Dd85mA2vqAdBOJEJ6DbqFH55X +T1uJ1rEku9v0qQSangKc2TTa+0VLNjKkMPs4sEjEzTzgXvlMPnauF4aYGvQc8ZnU +JXioLFl58vvenUTDgh8oK0sKA5Ioi/bTd1/pKlU3V8wwEGr6OKzNnrYyzajAHTmy +ngayAt2/xYWMP5fy+ityPOrc7p9wz4/PbzYQghqAEra6zfSim5gh9wxbrSCYXkS+ +PI/BlFByr+Sr3RwK9WZlZyVGT9g56x71p+2a84zc6GW7MU/AO6HTK99UYiay5PyT +J+uQ0gRbB9ogy4xXLYfKZtaImHviSYq7SWRmB4PPqQKBgQD5sdNbrdr3ha7fWxtY +W3FFMfsopjUPKabVTaXeBVTwJCzDaCECrmeTmQFrj1psx+LOkGzB3zb9Xm+pI9sJ +fRhxZyR/t+5g4A3s4wTiZSqaHbNqnjZ6AAW7j2XHBw2PPyTWe/BnCMRktQDZxm3J +8V2wETDtutm+IRm8D+cZQ+xs6QKBgQDOu91KZXDPhiKC/PAa8MUkNTB62XTH8091 +jo7Dl79m6IxOG71BbEJC/wUsPebkSvjqgiYKUsZ/Jwh3qpzrm8v8WU3FgtLdVxi4 +33RmI0NTs0XKZBBVEJSXvuIDdICSbaUAYHsZL2C5MIBEu/iNc4RqYVZpalEMb60y +4/G7/IngLQKBgHKoU5PPu7LZsjliTqY+Jz9M+jXqTIcP60obg8T10dEL63o3gKEI +kQtXwS0xAKbfCqkr7KUB6PBjwwZ6LoSm6uh4Imx7e30EpaBXhtCm/+8RIGgfCojv +JbLA4E2KUZGrvzC2bOgDQJu1+hQGaDfJG+pTmpIvsPj7niObcdVKOXCxAoGAZit4 +WR07HIS5J61j6JyXgaZ72CsCSRNZcMrMiaPEZ1KEjNGuvdeIA95PKydIpgjbbeJ2 +dGGmUg7zY1jBhruPm55zDirylYtG348n0paY3pPZ6QV9AN1Z4ojm4DhClptzkXUd +QTwl/EAZFF8lnpq5lW2XrC9r8M58dYsr2/EaHt0CgYBX5zcv8uuw1tMbPmkMFyP5 +gYquAh1MlIhAdjBlPhQ2UKAKgBeDMm6RSNyyl1FJxqsL+UpXlht/30DTcvCaFyOl +p4eTuswuUuozUdQOkIacP/ZGYv5XuoNTqLLigEXXuLaqp0R+mj4WtasNZ8gpJWzS +wMg31zpwL1/iUF6+zP0qzg== +-----END PRIVATE KEY----- diff --git a/certs/client-auth.pem b/certs/client-auth.pem index fd8d4837..0de443da 100644 --- a/certs/client-auth.pem +++ b/certs/client-auth.pem @@ -1,21 +1,23 @@ -----BEGIN CERTIFICATE----- -MIIDfzCCAmegAwIBAgIBBDANBgkqhkiG9w0BAQUFADB3MQswCQYDVQQGEwJUWDEL +MIIDvzCCAqegAwIBAgIBBDANBgkqhkiG9w0BAQsFADB3MQswCQYDVQQGEwJUWDEL MAkGA1UECAwCVFgxIzAhBgNVBAoMGk1haWxndW4gVGVjaG5vbG9naWVzLCBJbmMu MRQwEgYDVQQDDAttYWlsZ3VuLmNvbTEgMB4GCSqGSIb3DQEJARYRYWRtaW5AbWFp -bGd1bi5jb20wHhcNMjIwMzAyMjE0NDExWhcNMzIwMjI4MjE0NDExWjB2MQswCQYD +bGd1bi5jb20wHhcNMjMwMzI4MjMwODAxWhcNMzMwMzI1MjMwODAxWjB2MQswCQYD VQQGEwJVUzELMAkGA1UECAwCVFgxIzAhBgNVBAoMGk1haWxndW4gVGVjaG5vbG9n aWVzLCBJbmMuMRMwEQYDVQQDDApjbGllbnQuY29tMSAwHgYJKoZIhvcNAQkBFhFh ZG1pbkBtYWlsZ3VuLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB -AMQd1x/c3S8GcXC7Wp+2a1DcFZBDdiir7t9YjQljhY/plkOhzL2yGCgu5ZbUwNIz -LgMcoil/3ETBhWe5pZn4MZg5QDvc+CyzzqLpqUYyvjqi8vGJTK4rd6/l7YpDMxj2 -uCDRJJXyJ+pEcy896XVBxi1Z39WMQoW3KvXJqWtpAH2wT2SPtTWxCYA5bA3lK3U3 -i2zeQvrKMidkqP62r73qyP+ZTIsxqkvH/RftyMyZkTVwjXjcuoaUulfVc8vv2W3S -5wkW9gTTQnOnhWMujqh0bzbxuuIpriRudXD7CrwoDKIt5Qe3ytwSdstq6YVJrODb -uS1wAiD7u5uWyGreo4LrW6cCAwEAAaMXMBUwEwYDVR0lBAwwCgYIKwYBBQUHAwIw -DQYJKoZIhvcNAQEFBQADggEBAB3SuCqdh405X6Y8phoGimNyU7OmUPKMK0mwy8XC -N0E01pcplvBf8NOhexKwqLVopMYdKGea8n47hMqZ8voNFjXBEbD4DwokIMzokB1F -aEDe3XtagIq1bGTZF6q6XePN/v6HJfpr5hlNQtqLjA3x4vAaKYylRt83/YXTcYAZ -+TY1jJ74nRFOebqXJnc/7EXLwEZ0wBfYvwtuQ8+Nd77JMaBDIxK+0b2axf7pQLwk -CAzMTYd7JT7mTJUzB3FXt9l5UsKRppjrfaq7ms8X+AVtveER5ZbUHl0VOF7sB+Do -gCzicy85NQX8+H3Y+6axHM8+E/pWtONg5oEdOi6oreDK37k= +AMmkVNA9rKBP7LEFLMI4A8hKklbKfdltSt8CuizbntjyNjlHJjW1DQPkxf3SmmbU +jRKkgSD1FjCNi5WaCtWiSsdBtOCuSwFoDoFynHzxmcExDDOyjxXJLHKXsEzYlrjP +HT+hTjHaRWWYKjAb2Kdr2rDx5AwMh5szxS0oQFojlvmOVhMPOKM1s7gI+8adHNJS +EVh0yjyY5OFrC3Mcsx3ydylACFFfTPmPc3+GBWd6fQp3XuQUm56NUn8bhl+OBQc+ +ywv0BoaFSls5PKH6kEWSQFgf03ONdgkFsQYP5gKdHZfdqsarqtK3OTEBbUAqOiq5 +AjACBFMgCkLYyTm2znSMBPUCAwEAAaNXMFUwEwYDVR0lBAwwCgYIKwYBBQUHAwIw +HQYDVR0OBBYEFFkOa9qEpswwMpRckcJuxrMKafJsMB8GA1UdIwQYMBaAFONwSBoc +deqCl5i1sdQomcfk0npMMA0GCSqGSIb3DQEBCwUAA4IBAQAe2cf5oV+PKntGfsKK +MYIlnbiaxOSWaoWfHDnFvrJRqBXdS9j/ZvNVA563Db8Fm4tySIPPuqdVDNZ4DIUr +i3gciQb3WOSFDKTDQJ32XeTGypl2KQzY108+zRg8hgo4HvRrxvTKo371st4e0OIE +3u7CKJpMqk08SsHarKPLV3NHCtIaVGG52A0pvN4644UFSiErE/B3ntCoF0VmF9CJ +PPXFnt977h4AXZA0fbXrbgFy0V0EitbZh1gjUqIFHAubtCdDft7qlWC3MwRqbpY1 +Sye6THzEBAodO80I31KjMDKMklEXi5hAJk3cTzo3etKMQM+rhOyEwEJrBw461155 +7IUD -----END CERTIFICATE----- diff --git a/certs/client-auth.req b/certs/client-auth.req index ff5739f5..60df5b40 100644 --- a/certs/client-auth.req +++ b/certs/client-auth.req @@ -2,16 +2,16 @@ MIICuzCCAaMCAQAwdjELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAlRYMSMwIQYDVQQK DBpNYWlsZ3VuIFRlY2hub2xvZ2llcywgSW5jLjETMBEGA1UEAwwKY2xpZW50LmNv bTEgMB4GCSqGSIb3DQEJARYRYWRtaW5AbWFpbGd1bi5jb20wggEiMA0GCSqGSIb3 -DQEBAQUAA4IBDwAwggEKAoIBAQDEHdcf3N0vBnFwu1qftmtQ3BWQQ3Yoq+7fWI0J -Y4WP6ZZDocy9shgoLuWW1MDSMy4DHKIpf9xEwYVnuaWZ+DGYOUA73Pgss86i6alG -Mr46ovLxiUyuK3ev5e2KQzMY9rgg0SSV8ifqRHMvPel1QcYtWd/VjEKFtyr1yalr -aQB9sE9kj7U1sQmAOWwN5St1N4ts3kL6yjInZKj+tq+96sj/mUyLMapLx/0X7cjM -mZE1cI143LqGlLpX1XPL79lt0ucJFvYE00Jzp4VjLo6odG828briKa4kbnVw+wq8 -KAyiLeUHt8rcEnbLaumFSazg27ktcAIg+7ublshq3qOC61unAgMBAAGgADANBgkq -hkiG9w0BAQUFAAOCAQEADoMSPWSsSHm2GMeQNGfxi28QEz9XTIY262jiae6D9UdZ -fHF7v7JVtiG06OMg8TpdwyXWG3EiVeJZB2TOMjdFIMJXiIvGbkseamcguU4qLSqk -FSLG1V8bENaBdzDHqnjftq557lYGlsxGYbLaUmEPZocrBZRMcyps25Lqg7uJePnY -v+ssoQmWLo63Uu123E+q0tJCGpgcLC4zW5g9o2LXzvX3AokDbfMHeRmsWFfP+QS1 -EPXc+djwgHCTKyGRmevnJ+mCGDrkHFmW4tQw8NMfJmkqjGGwjaP/LrrSJ+wGR+AK -LB6z4Yb3ZITEioGgZomw9UVHFngmYW7sym7lcPTKyg== +DQEBAQUAA4IBDwAwggEKAoIBAQDJpFTQPaygT+yxBSzCOAPISpJWyn3ZbUrfAros +257Y8jY5RyY1tQ0D5MX90ppm1I0SpIEg9RYwjYuVmgrVokrHQbTgrksBaA6Bcpx8 +8ZnBMQwzso8VySxyl7BM2Ja4zx0/oU4x2kVlmCowG9ina9qw8eQMDIebM8UtKEBa +I5b5jlYTDzijNbO4CPvGnRzSUhFYdMo8mOThawtzHLMd8ncpQAhRX0z5j3N/hgVn +en0Kd17kFJuejVJ/G4ZfjgUHPssL9AaGhUpbOTyh+pBFkkBYH9NzjXYJBbEGD+YC +nR2X3arGq6rStzkxAW1AKjoquQIwAgRTIApC2Mk5ts50jAT1AgMBAAGgADANBgkq +hkiG9w0BAQUFAAOCAQEAamOT4DJfI1xYkSAMdM1tgXPnN3p3CJq7V52pbO8NLMqh +pMicRdqU/NNIMy6K5FJyQV72QQq7xnTgpQw3nuiOZTOaRW2ZPqkQJwbjLozfTe2V +i5PSwsc1etZ0GK7XUdJofBo8HKYa0GPtTkJaj4BrOeg4HUYXWVOrSz+/4QfGZ9A0 +7PBa9oGWdIx2zF0JJtt9idAejCLrmzReiBW/9remzIBO0AlaFJg8fhkYEUiu4FbD +xWuBMZVWNA3U8ZXEVoN1r91Z3tnKKmzi0YdR/sv9myijBNqoFUOVHxNGH2luTnIr +nkTKIrqMuHXysKrG+IuVGqODgQ0As5TgcnewJt2t5g== -----END CERTIFICATE REQUEST----- diff --git a/certs/gubernator.csr b/certs/gubernator.csr index 79541da2..51b78d4d 100644 --- a/certs/gubernator.csr +++ b/certs/gubernator.csr @@ -1,28 +1,28 @@ -----BEGIN CERTIFICATE REQUEST----- MIIE1zCCAr8CAQAwUzELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAlRYMSMwIQYDVQQK DBpNYWlsZ3VuIFRlY2hub2xvZ2llcywgSW5jLjESMBAGA1UEAwwJbG9jYWxob3N0 -MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAvr59qRI0FBU4zW/gFtnO -JE5DOcA2TFxH4cESPd2CCsV/KGTIyGbERBbvAj2f4s60Sn1I61veTWQ5yCf845VY -rg5IkTaBGIeiio+sDW9wOsZG74p3Op93dlIuMea9WXL1wxGzfFAmf32uoHaTPNm5 -OnMwvaorFmZDRJtQRtZ0bKIYMrGlL9/ywK+vYS/MZ88OLSpfpoiHRWkXQoGxeMnc -WFbnjhK9ULxYCPU53nb03efRtGIeVSOYkx9+ARn/lETotqJ+LNXBXXtj3EuYYch3 -Lso/xgvWpa61p3CxdrBwgdJcNJHghlr3bU9YBVYEx3XTTvaI4Th94uaygcK9U2ZZ -ISzgaAGNmRqCDecFkSCKRXzRh/oRwV5kDlktDp9dcmZ1TTUT2PHHiohrGECfbHxC -3lPmm2sRToYjF85PKlZKrVgf7JymlsnIkqOrEFCY5cTatxcF7Kpe4Vopa/yHmhaS -9Q21aQ5qLa5mhBZZLDjIXC/P85wYVdS5nOWmRIC4ButvHBW+f5mYEdtA49Pif56x -VkepdYKbq/6gweq2Z4qRVNE2zHDUol6CzY/DQ+zUHHJ493zoyCFHg+ZrH8HX+zV6 -zv703PG0k4v5S/X/mR5ze049wllf7XCMysWgQRpwvFlmzO06wb74VWx+Ovo8JjZz -kVFI2SPc0H+6e3WAj9xvmKUCAwEAAaA/MD0GCSqGSIb3DQEJDjEwMC4wLAYDVR0R +MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAmKeVRrE2yPRRo9PWLhQ9 +3SjyW923HiSaBY4izU1wH67DjhaGFEt0uYuYblndWFoApR7Xz0w9tN6XPFumH6xy +Phi6tTr+bAq3r2apt5RmmaNv/76A3PpqvEOqDQF1EWuQck13AhtSp93Wf3nZN7Jv +e1NxWkiQMA2xyuc2wQ7STFrywlI0LDpp8OkINn5mjF9d17Uq9GW63Qx7vS95HXf6 +7gdPGuVxepM+x6AzdTFj3x2ADhEiRn6TRJ4DuWoj6GKCIis6g0/LqBjHfwyqH7fC +qlXpz6aRo7NHKVsQRof78SPF1IaYkxcm2TJwVS0ynpQzruw84Xl1KObVUp0S7TS+ +NGG6A2iAf6t9ttLQkD1Hzyr9gqrWXfSYBn+3hfU1QiEbGO7kz92sYoG2/H0Q1NAJ +xrU32vNMDp2U4EybzP7mW8GTpdoHym/RTeZdWGQDYlUSsMRpLPvwbxzyaZfUgjae +6DqSM0VDRl34b0lUjtkrZzUxCXKS7OkF0h4k4lf1G6CVCXl5WgwIbGI28Lr2jjr8 +OjJf9qiBOvo46lEm/3xRkt+i1N9da25RrZBmQhmaTZgKpiTBk4Cetxkh4O+GvzBu +6SP1gMDsx535QzFuRbBErHfULKjmyxDl1FH72wT8eT08QMxMUN/d7Zf310FRvnxC +BJ06h3KP/5GIdUGZ2zJWgfECAwEAAaA/MD0GCSqGSIb3DQEJDjEwMC4wLAYDVR0R BCUwI4IJbG9jYWxob3N0hxAAAAAAAAAAAAAAAAAAAAABhwR/AAABMA0GCSqGSIb3 -DQEBCwUAA4ICAQCbwjiIqU/0nlskpYy1Wvw4WFyOzpN/FGTme0/QmKlO92b+uGX3 -2BGqe/jrf9bYe2EeMxDd01NxVBd6KFOwbhIA+5kM1fHarI+8YqK8QeRAAy42W6pP -kr7ZOMLv7K95/8ufERTQpzMga3mYAAIdXAaV2D8l7qs+eG60is6wsLYjMQto8Zoi -L+cp9A5lZQAOReKyZaKCm+GIRNDVdaTO4fvzj6ZynE4Lz4ewUVaKnRW8MGk/Syi7 -KEhR3cXZkKeZ3+XG2LSR/JBIf2U/Tlj1wzOJOIenKNo7ir5W77hVEh33ZDomeHLn -SRWFUwg8uuYmhy1/NMaJxbX+DQZw69QZoBfSXIyPEwZvYnZhuWQGpoJK8BB5IBqO -VJ02InL+Ni9TWy6LnCeFG67+GDjFGIw9wQb5Lw9O0Hp8OyuVevsGJfS5vezpEBaX -tMxNUx1RQnd8FIxZNluCUj/9Ad3uLPi53W6/IZiUvzrMebDiQSe8V29x4yzo3Jca -8totxCZVXw4SjN91JtdOvBpxlXqeUdtdpqv8kHkbKTOOpU1D2w/100SlhLatafxV -24FXN4mbshUfEbNMzSRb1wyGEGpA/ArNV5KPRtqO+86zGN0Bh+6RaqeMUTs5Zb6s -OqxnS/TUTJgxJhZTCL3SKeXtmfM5jnXkPcsB4vlGCgdkwHx0teJq3Syy3w== +DQEBCwUAA4ICAQAGLw+pX7mDLmuYJMfeVsCmFJFz8AYxX4VllTO/Mp0/F7ziLA61 +QXovSdI91ZeO0rzbvmxebIyg/yMoJO4Qt2hLTFYodFchktrr6EOwDQCUlW1Dsk8/ +JwQEPxIY7+qjE7aguKzLV0bbfZ2mHGMDJcI149c1LxpxnaRCxKuH2YwB2mDPsHgt +GZgQ9ZaoOpNxvc0xh0FAXKJKeWsWSNqXprQd+2Uln51cjDzuf1nJNUbu7cesH2iY +tg/5+lGH/aQRV+x08W/54ygwfpf1wqo3e3erwVo26z4Os/pJrAUHpzNyDJwzNyde +seSK4F0CniPA667SvfXX8XcJ4aD+kPzqCN/GrkBcJebYl2khaOs2hW6rDZXNICOa +TIv3FAoF1tF4HqLx2+dG2csa1R7QFsq8QOpI1+M50yM9Vmd3OFUwc4YCAjrh+mdI +cWsm2x+2x7HKvajGieI5iFUh4opf7iPog1o0LStLHeq+v9sYVcbU9dW/x3TFh4FK +X00sOXXMZ/LEEnREy6ZKN3Oct9VyDNZ48g2EksYzL+cg/VL13S1Oqx0YdP3VEIyi +JdToFx7f5srQFQlp7gyaoQ8D98zL6WuSGO1ywefAAxwDlJol3xz3GaZoNm1mFhyy +krXBjT+yc9Sm3V3+wZflVBLHQOnXrf04WK8FnBSsIzQsB1+JK5LS2Az8nA== -----END CERTIFICATE REQUEST----- diff --git a/certs/gubernator.key b/certs/gubernator.key index d47aa8c5..a26a7cb5 100644 --- a/certs/gubernator.key +++ b/certs/gubernator.key @@ -1,51 +1,52 @@ ------BEGIN RSA PRIVATE KEY----- -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 ------END RSA PRIVATE KEY----- +-----BEGIN PRIVATE KEY----- +MIIJQQIBADANBgkqhkiG9w0BAQEFAASCCSswggknAgEAAoICAQCYp5VGsTbI9FGj +09YuFD3dKPJb3bceJJoFjiLNTXAfrsOOFoYUS3S5i5huWd1YWgClHtfPTD203pc8 +W6YfrHI+GLq1Ov5sCrevZqm3lGaZo2//voDc+mq8Q6oNAXURa5ByTXcCG1Kn3dZ/ +edk3sm97U3FaSJAwDbHK5zbBDtJMWvLCUjQsOmnw6Qg2fmaMX13XtSr0ZbrdDHu9 +L3kdd/ruB08a5XF6kz7HoDN1MWPfHYAOESJGfpNEngO5aiPoYoIiKzqDT8uoGMd/ +DKoft8KqVenPppGjs0cpWxBGh/vxI8XUhpiTFybZMnBVLTKelDOu7DzheXUo5tVS +nRLtNL40YboDaIB/q3220tCQPUfPKv2CqtZd9JgGf7eF9TVCIRsY7uTP3axigbb8 +fRDU0AnGtTfa80wOnZTgTJvM/uZbwZOl2gfKb9FN5l1YZANiVRKwxGks+/BvHPJp +l9SCNp7oOpIzRUNGXfhvSVSO2StnNTEJcpLs6QXSHiTiV/UboJUJeXlaDAhsYjbw +uvaOOvw6Ml/2qIE6+jjqUSb/fFGS36LU311rblGtkGZCGZpNmAqmJMGTgJ63GSHg +74a/MG7pI/WAwOzHnflDMW5FsESsd9QsqObLEOXUUfvbBPx5PTxAzExQ393tl/fX +QVG+fEIEnTqHco//kYh1QZnbMlaB8QIDAQABAoICABlXbJ0FKzqV8H2ZW4tfudte +gklE17LN0bHNZDKfwdbInNcYHx78Xb61kVL0YR3bJxNCOQJFPlMpxoJzFnNYnch4 +M3qFdhn6d37LNK5wmM21h5C1j8/fVFu3geHR1ZzUNfD7sh9r6L9MQOD9mdU4rnAT +LJSXyjPn+hVcZ8cJzlh1mqoumlGjStX+4WmmdyCjbkEyZpSW1LwAaARCfsEpG0Nr +fDLTVxDJo9jg29n/Hny5+XmcV4vLVGhGMQkVOSvJOqAwe/CzjPP1VRzevdkxGMRN +KdjaZn/98XjIkL2csnLYBO3ggDCe3cidqm9BZw9TO/c0aXDmyE/Hbi9eOvec01w+ +IC6DwWnv64ujjRKGwvCwN7tOPlVERlJ7lSiraa/DFydDh/X/r0BJkZZtdtuTiqBQ +ogUxGO8z3TLNJh9M6pb52WZt1BAVeQrPB+ki9EYritUZ2RK0oAJagIgeQCTKX4kM +46WrW8wAJU0ps1yZQxHagGdZ4juB9cWdgkWqIP+JU2SOLuKPfIUXjeSMIn6Umt6n +SOa+gvRDz9zt+Er59BYcyO3S2aHAWbDOW4vOYrbmETH5+7HPX9tJ+mRl92GCLTWI +Ld70LweYbgdE80TerODUZqLBgzwG7R5NRuXlCjuzvTFrh4Y+rf+qHKzyIrhppvQm +OEG7KHifTiwuzt2NzZeJAoIBAQDElBq0w2YzP9t0abs6A3/SfU3YpdN5HkzzmQpi +sg/ayMo8GfCI4PYct0mZefnkOTlTAlQ80r470bXyMa7HEQU9GxeaTdsjxEj3H/j4 +vrdqVR8W2MFkoR6zBKH7SXzQy7OQPu7LyxMTC0/lvXqJWYDo6BFoUXCdIeyXR4YK +4eVFNJOrYxplXEZcuB1OB7YgVQpXKbT64ZiEqtnwCT1EEFpN4zcG1h3GRBhp1vTN +h5eNNa7gDAKk6U14EYtcpJ2eoA2klpJ4Qcj3ZxypEa41EAsgru9AAlhVjW3HiBG9 +MaofY1+wvhola6B6zHOpa/7PyXfbsZFqxYNBHTD28WGPMYvlAoIBAQDGzIBnmH5H +Ol99fgUB0gwLdr8cP6KxUqt9d89u7Q5TSe8Z9+i3arO1Op6FrCAygdug0Nrp9KRa +7diKj0kgAuVBP0mj8V/pxdU5iDgjVm4kWtfvkCX+taMQevi8jNT7veyX3GbdOlSK +6QtpXcaKZSaU5OKq6ITweryu239gJ4nt/DYYLI/DftOywzcBg+qhzTfITcxSaiq0 +zUjkSyN0JnEUsdlD+EVWvqtfwQ2mFqhURLMMnssPLXwgxXOOEJS29SL5Wu1ve1zJ +DUrsTnpH/1VjoRPB3IR4U7lw88nApE62GoyXtymC2ZeM0E0XQ5xYfmPbHWeCHAYg +L7MY4NJ5AnUdAoIBACbpnmO77kYk1N81cs9oE+xpy3ggUz09h0QNPmYNE2BesNG2 +3MtrpKxIh/Qulg3cWgGZi21C1k9nEtovhYZ4Uw4mh8SOtttcpojstk8fCZWt5eqS +2618y2PqfdoNUPzP5eqe2oxS1aLGcXlryY7YvdDc5108CcvBBGFp0hnjX4wUfUrG +4lnAK1l9RKfGlQHPc62PXvjuoU9ZtqxyV8NabVXPrXvX9KrjneWNnIX22kQkpUpK +dleIq0IiTvD20RCuZCT5fWL6urpmmeDJ1C9CzsEYf9mu3SeKSHnf8IsAAsoV1MJa +zzgrFuhYAmk+LIGbQvOlMcDt+i5whdnMLGC5ERUCggEAJtoAnj5nL3RxBQ2D3P83 +62Who9ur6AvICBVKLNuXWR+x4tlYWcA4rspuAKHLCRPn4F3w6pgtJrglAa9PEzp9 +o2rC8Y9St1U6fqvojL9vdxtp6B+7zTOiUq41vmOnnCtZ+bPRRpsHur4gxM7W5mUu +TRsOUWhv0q+qAGJVWm1fv2rzB3ZuAj7fEKimL12glU6OAE90BwdIoV0dScCFhUWe +A/VeCLKUmodY5rXL/RGghBeJBoZiGO1CvQTZuIH1DmyKEUF79bWeRIycf+I2c6uq +/HWWbuSx3vI9451BaKyz1VMK9vuM2U29GH/9EPbdr03EJiZw/DSN3ex0jAAkIhIg +4QKCAQBkftUVdpfFyCYh4tdxbK16pHqBjokT88RVUMvhKpJjl7PshttH3M1PeH4Z +1C0+9TpMJutKW4Az5lPrO/+LH0uuqUv4ILiBeqMSNHf6JvcNLyil0/dUJ7MzXAtL +uCiBdDsM3fyQh6KgCJsAUNPJ4HwVtmRWSUv0uZ0eACF4/Gbm0uyqFz3fARNn0ZQs ++Lwevb3UQNaIZa1zf0Z708JVgCOEll23N/zZW8ik9zG+gjTMKGNyKlWPeshIJlgA +nZfan/LdGzzCs/b1QtpFzBp1LkFVnrttTfGqhD6r+/NtpLRs1GxIGGGWejLZLrAd +Gmu7DntXA6QgdmCr4tQADmGLnrCw +-----END PRIVATE KEY----- diff --git a/certs/gubernator.pem b/certs/gubernator.pem index 43901757..b0dc1a89 100644 --- a/certs/gubernator.pem +++ b/certs/gubernator.pem @@ -1,31 +1,32 @@ -----BEGIN CERTIFICATE----- -MIIFPTCCAyWgAwIBAgIBATANBgkqhkiG9w0BAQsFADA/MQswCQYDVQQGEwJVUzEL +MIIFfTCCA2WgAwIBAgIBATANBgkqhkiG9w0BAQsFADA/MQswCQYDVQQGEwJVUzEL MAkGA1UECAwCVFgxIzAhBgNVBAoMGk1haWxndW4gVGVjaG5vbG9naWVzLCBJbmMu -MB4XDTIyMDMwMjIxNDQwOVoXDTMyMDIyODIxNDQwOVowUzELMAkGA1UEBhMCVVMx +MB4XDTIzMDMyODIzMDgwMFoXDTMzMDMyNTIzMDgwMFowUzELMAkGA1UEBhMCVVMx CzAJBgNVBAgMAlRYMSMwIQYDVQQKDBpNYWlsZ3VuIFRlY2hub2xvZ2llcywgSW5j LjESMBAGA1UEAwwJbG9jYWxob3N0MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIIC -CgKCAgEAvr59qRI0FBU4zW/gFtnOJE5DOcA2TFxH4cESPd2CCsV/KGTIyGbERBbv -Aj2f4s60Sn1I61veTWQ5yCf845VYrg5IkTaBGIeiio+sDW9wOsZG74p3Op93dlIu -Mea9WXL1wxGzfFAmf32uoHaTPNm5OnMwvaorFmZDRJtQRtZ0bKIYMrGlL9/ywK+v -YS/MZ88OLSpfpoiHRWkXQoGxeMncWFbnjhK9ULxYCPU53nb03efRtGIeVSOYkx9+ -ARn/lETotqJ+LNXBXXtj3EuYYch3Lso/xgvWpa61p3CxdrBwgdJcNJHghlr3bU9Y -BVYEx3XTTvaI4Th94uaygcK9U2ZZISzgaAGNmRqCDecFkSCKRXzRh/oRwV5kDlkt -Dp9dcmZ1TTUT2PHHiohrGECfbHxC3lPmm2sRToYjF85PKlZKrVgf7JymlsnIkqOr -EFCY5cTatxcF7Kpe4Vopa/yHmhaS9Q21aQ5qLa5mhBZZLDjIXC/P85wYVdS5nOWm -RIC4ButvHBW+f5mYEdtA49Pif56xVkepdYKbq/6gweq2Z4qRVNE2zHDUol6CzY/D -Q+zUHHJ493zoyCFHg+ZrH8HX+zV6zv703PG0k4v5S/X/mR5ze049wllf7XCMysWg -QRpwvFlmzO06wb74VWx+Ovo8JjZzkVFI2SPc0H+6e3WAj9xvmKUCAwEAAaMwMC4w -LAYDVR0RBCUwI4IJbG9jYWxob3N0hxAAAAAAAAAAAAAAAAAAAAABhwR/AAABMA0G -CSqGSIb3DQEBCwUAA4ICAQBNN340hTcmF9A+6Q1bmWtXC814imTk9+jDEjtuuE9Z -ry/24PhV9/Bw+1Vkipbo4BxnJUBPYwaq8z0uORxK5P6g5VngsnDvkHjfS2QHADOG -mBjePEnZpD6b0bRMwBzYlyCiIfvo+Ke1sh/XykO80I5NqGNLSONX1Jl187zFKVd9 -TW5tQVqSe6YiXvf80ZvW3oO/UDZDVQkQVxY8YhLw2PKNhJqYxjIv5FLnO+8m7IG3 -Q/XC2FScPpq8+xDR0OuXvQ8uWPuhBnBu5a9y7+ZtzjfB4U2JjpZEUFs24qFB5qYF -qXwduotVPA8Bqdo8oKM0wyZeQCTx9rH7gZsUXPwvVWkbZAVMrd7VGstyoXxl1zI0 -gsPT+LyW9Tvul+gORJGJ1+dPW2/iusXPJkWaXnkIUhiWlvCSH2fNhSGLPzEIfXww -FiGKe3NVpZPDoSlO6XlqSAycvxQZKCczkGheClQBcv9fhLkon9e0v1GojCZnmunf -JBuOpnhWfbF3AOKP2v9NqGFDNEydWXH4GWXo/3PKHdB0gGsCaVUoQY+AuXtUBu4B -1X8MFipjQSbOjKFBrg72Rrk1115MbyiXFoZH4e9WnSLbUrrJvr4KVgEv/1A9jksH -C4ZRGqkUTNKj9cIlXwA+qMOqarvYV0jOW3/59XHyMeRte3tAL1tNzOYvJQP1yuMV -zA== +CgKCAgEAmKeVRrE2yPRRo9PWLhQ93SjyW923HiSaBY4izU1wH67DjhaGFEt0uYuY +blndWFoApR7Xz0w9tN6XPFumH6xyPhi6tTr+bAq3r2apt5RmmaNv/76A3PpqvEOq +DQF1EWuQck13AhtSp93Wf3nZN7Jve1NxWkiQMA2xyuc2wQ7STFrywlI0LDpp8OkI +Nn5mjF9d17Uq9GW63Qx7vS95HXf67gdPGuVxepM+x6AzdTFj3x2ADhEiRn6TRJ4D +uWoj6GKCIis6g0/LqBjHfwyqH7fCqlXpz6aRo7NHKVsQRof78SPF1IaYkxcm2TJw +VS0ynpQzruw84Xl1KObVUp0S7TS+NGG6A2iAf6t9ttLQkD1Hzyr9gqrWXfSYBn+3 +hfU1QiEbGO7kz92sYoG2/H0Q1NAJxrU32vNMDp2U4EybzP7mW8GTpdoHym/RTeZd +WGQDYlUSsMRpLPvwbxzyaZfUgjae6DqSM0VDRl34b0lUjtkrZzUxCXKS7OkF0h4k +4lf1G6CVCXl5WgwIbGI28Lr2jjr8OjJf9qiBOvo46lEm/3xRkt+i1N9da25RrZBm +QhmaTZgKpiTBk4Cetxkh4O+GvzBu6SP1gMDsx535QzFuRbBErHfULKjmyxDl1FH7 +2wT8eT08QMxMUN/d7Zf310FRvnxCBJ06h3KP/5GIdUGZ2zJWgfECAwEAAaNwMG4w +LAYDVR0RBCUwI4IJbG9jYWxob3N0hxAAAAAAAAAAAAAAAAAAAAABhwR/AAABMB0G +A1UdDgQWBBS3hfyJ2JjpZbhCBYpsA9j4VtP4xTAfBgNVHSMEGDAWgBQnfIsOF7MP +15DMLlRMylgFmZphHjANBgkqhkiG9w0BAQsFAAOCAgEArDwg1dNHtj7hfJdXG+nA +yJOcItwuiOc8CBHfJGmdjpcg/le6g4xodm91sVWFDBsv2454IiRWNlvL8SjDRrd4 +46TvnaZYFIMFFr4JOE54iXmGRDKJBUNxkklcSSQuhQt2M/SiPuqzPU20GicQM34D +lDZqTv1jwXiKzJGau6aosjBNudYC6vEEhosNGy/RHZYvnVjpKA0fQSvZXpuruZAr +nbFtmJ6Kvy9cgMVpMpkuAwjRJMsGOtdg+Dap2hVyDEg8ngcwzcpp8j6/ddgtBt8P +dopBhQsOzXs6q2xEMn6BRhNkoAMslW8Gn/GXBpqlcrk4eL2JgYKC/azCCEQBXxq0 +RPefJrmad0kbbofuRjx3MqqwfE/cbP/ODnxM8clb0+bDeSGTgSdYTrwH/9Elz0VW +WDKCzSaiiT/StlzXbeHtp/M1eMKDtf8cI2lRBLU4OcF/5LzkSE3IM8IHH6tf9Z3E +jrpxR24j3q8lA/hIDWFT02uBM7rMR7idtklkeDsYSCHD6XtA7kV7lz+wrLo1P9x6 +Atf05hdZ2UzIaSou/L2QGPfGPPhnOxNHi5ySjesT7s2UolZdSk4Nw3N9JTDYViyo +tbrpY0LJ0Ek6eNtcCZ65ybUidSoAAD0dlSxhl2795/WEq8gdzN8tfhuQNkMwYhKj +ZlGCCfW0ErCaEVzqLo1PbNU= -----END CERTIFICATE----- diff --git a/certs/gubernator_no_ip_san.csr b/certs/gubernator_no_ip_san.csr index 9f594ab3..267a285d 100644 --- a/certs/gubernator_no_ip_san.csr +++ b/certs/gubernator_no_ip_san.csr @@ -1,28 +1,28 @@ -----BEGIN CERTIFICATE REQUEST----- MIIEwDCCAqgCAQAwUzELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAlRYMSMwIQYDVQQK DBpNYWlsZ3VuIFRlY2hub2xvZ2llcywgSW5jLjESMBAGA1UEAwwJbG9jYWxob3N0 -MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAxhWcZ2Eo/vWwiZS8RfTy -BfEpbnwL7eChyh/Qvjk+Xla4nRiKSu/xXLWGAaAPkNjJ2De/ARFXt8gSyjuGUGr0 -8wbwVdc2/gBaDoDFTBxmfMDE6di7EVB+nEhPPLVUlK7YTbkcaBcQpyuu2JA27Pt9 -bo+ABt+ooI3Bo6z5kpI3C2gbWhbUDwKasqidrLnO2bpxJQnAJ9yHmIg8wo1/e2oq -YH5HgXbHUVCCDyaaO9IgQL3+HRKQ7S1RghPbz/olJF7T1e6h2xEr/QuDlKTENxa9 -KIEErxlwCEWZ6z+bFviQrMhge41iLSecfBQpn0y3rkq7UKMZ0QYaOiOdG/NklxQB -SQVPV+FDN7jUqfEgQJDkFagWq8pzDjkXs04oXMkzxpUDSris/TUZ9wUmTq/P1pvJ -PFgy6FDfRWKb7pxXEzMy5evOFLkdM2ZFAwJyZ1naGie+ER4zcTeKY/e2IHCFXMnw -ksnhZpuFs1Y75BmLf6msKM0eua+Mdd+7PhmfB9OabTNOe/ifaKa9rQjtLxdpAVFF -SldrSo+7duAx5xAsZGbGO/eUMcj9e0x6QiUum/AX6LH4YCIBQj292A6IEYLatoz9 -5bONZzE3/9yCGWCTx2S8RZ/WVCKq1F3LsoOI24KvD/BPOK5TnSzATccLUAvx8Y1t -auxEYusRJbBDY7NzyloZMekCAwEAAaAoMCYGCSqGSIb3DQEJDjEZMBcwFQYDVR0R -BA4wDIIKZ3ViZXJuYXRvcjANBgkqhkiG9w0BAQsFAAOCAgEAvhJGctgIIwqQkyo9 -QcItLKeep2l+5wb1R4MkIbzSnX2VGpg8ZSP/CNtLxCfyoUxrxortRHCmMQuO6tus -W3H0N/n7gCobqdpy56sCSekUUi9pzj0qLfGZsYfaP0rAhQi/DmDi/MRF29f4nmFg -hGoHpHyOpc9F2Y4Zn3SO75MMFdN2l3itT8724IKqi7KwbFqdcaRFzDv5Cew9dXXE -smNrBVVMxeTtzGoAtFMAK0bm01VdmI3clg9Pf4kcrRqmz2w8Eevxs58wMYMVXvWV -I+Fra4Em8CXjQoCFC6mi/DxjJzTYq5QNDlXisLNzhnzrexxsconK5Sl05XRpwHk+ -YIMM4fsEuDIik5XkV/tW5nqHl8dv9aCfF4xwoX8fcvmJTtYdwW2kjXZNoQISRZc0 -bO9wbHUvJCFeH1PyZjjS4vPGtzTtLryHuYxsFctIi+nyR9zP+oniDIXKdUBX5fFL -igsBKm7Q/mqKBboQ+szYk//yrXZzERkuE4yGMkUoJiL9oc/M3FA+tIUH0IjZLk3K -76B3sbq9Q7FJo/MYHVbq/ITzh8MiKWKKKAZvzoSOIHyWi42CAN2m55d2SYjNwfOF -bxUib3pp9ET3SnI4/oOHBoM32uja478c8bH+s7BCDC9rQWT5kl6D2rDiGukbgvCn -ImAYfCfUwn4dfi7sCMhCLwIV/Fk= +MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAl8cMItWI0cdS5DFVLlvc +Uzp1+IOHcqC7i3pG7OwjpUHPxZK1LP2X79C6HYxaAxkvZbR/Z1ybp2nyGWQKdPcI +n1aqSFNMz1APja2zPsha05Fk8eNBhM1GuhoWabxE/aj5P3IvU2rJjswZ0+Zwgu53 +v9calpFNCmv20y/300e2E3eo2+DhRlORIfIGPwJOtHtu++qmEsWIRyiDpiNgpaMT +4QlkQ9Idy9BJSRd8JR0/QVjMaXIxVKq86OEFbphPBe3Mep7OeHP55bxXMR2GuRKU +FMSNoAjQwp3P87E6h2iAYI65P7UHH4P8AMTv32huK6ksjS9LjneRlETWXde1txhB +GHNG0lvGzoltXh3tZGRAcspTA3IQqEhwqPD9HTlVIFjOu2SSKDezCp2eaA7qjRqj +evdp85IE3dQY5oSU5dpj0PxapZrc32Evej8XTuMhQeGHH7Zn1vBxqMC5sTvovE/G +Mo7xSG5YeUYkEx5WWqrotHQHYO4MdG5oiZi/3grD6G3T4Lil427sdIIredMoMwTf +4psWZWrAyhBzMkk/C7JAnzzQqroMH8KgMF/Yv/4ppUUBLZ0IV9nQkTxaJJML3ER4 +gaj5MGiFUDuXpWP+hMQcYT1Kw9HEm0l/PlMGYkYw8GzNc9WpfUjJrzZO4bo1h9gN +RvrJ+CGBoSWCIKOWEWaxRm0CAwEAAaAoMCYGCSqGSIb3DQEJDjEZMBcwFQYDVR0R +BA4wDIIKZ3ViZXJuYXRvcjANBgkqhkiG9w0BAQsFAAOCAgEAdsv6peGeChEEOktT +l3optitCQ6XumvvlvosgJ58wXCbkC05Bz9BYRlqrDl8i+9KDSiKJQ6uVXtKE4bBR +hrlzZ+iuNouu3B84LC9Wy7yl2SJhMfPlzCcqwjmwMVI2YwoZEs0EqD9DoiIlKM5Z +mlqmeTAiYjrCj4Ktj+hg87xyBtrcyW6gpvzsH2qfw9UvkSxJNodtFolhfjjXcjkT +pNA8Ra7J24zU92yayUoqaJe5mII17HcUC2fSICxj38sTvC7K/tgi/Il8jyl+kzu2 +VozklLJoQnxUKasrEXG5wSWlQ9dntwYHY436o7kZ4vkYDXKFbqfZ+F96yeKaN95p +2KfJieIAsWRT8CFSUSJmvHE/Ee8i81ScG6U8onvPzHPOtwAWkFDxhCZRIWFzyd3e +C6PKhb8BON4bRxltDyhckxXQyQWv2TuS59me5PNNsaOdBOLFuovzzHTa9IhNUZ2a +XfNGGDtHM1mmQJAcuVfI4ZU9NJr2nY8zHmkshYLqBPpaYeBYZ3HkBdv3zs4GXy6G +w/kjwMvxrooK2mTOPvYPoFES7jK/pjaBWBNSzQMic/4eDDi/PIloaDD8cXPKjl6z +yJSbv4BYsxXeAQ5D9m8Bo3ZbYSKNfzy2GEJpSDNm8UzKCdMZnZZ2Th/fVKMA1LOA +txCwJ0SCH8BUnNSI4VZOLLPX7ms= -----END CERTIFICATE REQUEST----- diff --git a/certs/gubernator_no_ip_san.key b/certs/gubernator_no_ip_san.key index 6ee44664..a451256e 100644 --- a/certs/gubernator_no_ip_san.key +++ b/certs/gubernator_no_ip_san.key @@ -1,51 +1,52 @@ ------BEGIN RSA PRIVATE KEY----- -MIIJKAIBAAKCAgEAxhWcZ2Eo/vWwiZS8RfTyBfEpbnwL7eChyh/Qvjk+Xla4nRiK -Su/xXLWGAaAPkNjJ2De/ARFXt8gSyjuGUGr08wbwVdc2/gBaDoDFTBxmfMDE6di7 -EVB+nEhPPLVUlK7YTbkcaBcQpyuu2JA27Pt9bo+ABt+ooI3Bo6z5kpI3C2gbWhbU -DwKasqidrLnO2bpxJQnAJ9yHmIg8wo1/e2oqYH5HgXbHUVCCDyaaO9IgQL3+HRKQ -7S1RghPbz/olJF7T1e6h2xEr/QuDlKTENxa9KIEErxlwCEWZ6z+bFviQrMhge41i -LSecfBQpn0y3rkq7UKMZ0QYaOiOdG/NklxQBSQVPV+FDN7jUqfEgQJDkFagWq8pz -DjkXs04oXMkzxpUDSris/TUZ9wUmTq/P1pvJPFgy6FDfRWKb7pxXEzMy5evOFLkd -M2ZFAwJyZ1naGie+ER4zcTeKY/e2IHCFXMnwksnhZpuFs1Y75BmLf6msKM0eua+M -dd+7PhmfB9OabTNOe/ifaKa9rQjtLxdpAVFFSldrSo+7duAx5xAsZGbGO/eUMcj9 -e0x6QiUum/AX6LH4YCIBQj292A6IEYLatoz95bONZzE3/9yCGWCTx2S8RZ/WVCKq -1F3LsoOI24KvD/BPOK5TnSzATccLUAvx8Y1tauxEYusRJbBDY7NzyloZMekCAwEA -AQKCAgAxNYMyZ3/AvxaJR0ryciSB92RcjzKDeO+YgAjiiOQGmbKpTERm0275ohrV -Yocba8/RCCBKSp2pCWoplVoLtlZ93XZtTNbbiQjWW4UoIFIRoe4JTg9DAOVDO+97 -XGzTtxADVv5ImZpIfWClakZK3ztM8RdUHdINeMnnOHyTvgEwsz9ARTWPOQ1nXt40 -38AUdO3QzrhO7sk8ynOVvYMzDK/UYuqurexcNgzpaKSeQdhDXS+41zjrwvthvj84 -TqNVgr1Lg0nwWza7WVXp4njgWqTJYCviuAYN+ASB3b5QmZWPZwQZDYmbQCDu7i9c -5Lko8mXQZYRvWf2//cL1A6U0pwKeSnF2c1fl5Rm6jq4muQRS+zKikCiQnZchRWb4 -4Pbl5bT/1VdVOFecrEFDyV+62J/2RG5jEeNuagBhVsqqs1ygolsHIblhfCLKCX7d -9h3w/KlM8oy71ekmHwEC5BT3b/AHGqM2v1FEHedPyOTmSPdWwjft/NwvlJL37d6e -vTvBdpB+HNgkRcTtB4g1whUO4lZrvSPRfk+blG+hXbz9B5NblUVhVwqQ6or8j40y -OHVsAkjR+SXeOQrFdSOC56bmLlfNPzsn0ldfC+1ome1f7cXpfxlrcD5MqhxNKd1f -ZHXWrwDn3kyFBZUI9+ZDkY0RThNUjxrftdHGfw6v5AXc+cJH5QKCAQEA4cSZJGUt -kTLUrkCYpzSOR8o/4yB2OhKxrtKLN2eO1AwrSFkkbOKc/3iRJIoFGuyVmO6norbg -p2nawKzkGhl7FHquLXsyekz5FgUeo1+fAZ+9SASXp/YeFjJJb4E7t875DbX0XqyX -wz+ni2Vx53XVov2+rztm4gAza3dBiOgmE/iSgt1VjrPfU2iz/PjPR6lfjPhZ8YeW -1bOV11J6dd8GkdY6I/6B62lYvqcXE8+uRbSmN11Wkpw0KWqAZpObemgYrmkrd5jj -57G45uMtPu/3RCcN13/9uU0Iip+NWzoMw6tiWzJE5inN6H+krHFNjvi2d6sEeO77 -EcSC8BCaLQMNawKCAQEA4JwC82xyY2OCU8QBza5FW/b7WwRG29FfE5v5WhNu61O2 -Sb0T5KXHrrIAPAw/+TsjPg2u2l2JC+jMkDzFCkxIuHscgXeX1MWcEn7vSqFNNcZf -2h51pDGCzvVyQoIZurMHnlov6/7uthsLYjCR94Wf42BcLY0p9hiPLAgo+hqYOJK0 -l1MT/dbYgQ8ZB25XL9AumVWq+ZqRwFIa2+LhTL11koIo8qhWHeEsJ8+Ns+SoTkgo -A/VNKGM/e+BSXqa1mlBO0egq2Hf7b0emUL7Nk/pDPb9uJKXlDgytbc9LQ3ktTRGr -mY0gdFfo7+ar9S79KWNB1mUG8orh4hr0J8G0Szme+wKCAQEAt8EJGCtVnDFwE2e2 -F5laGKpPt3ArafbfMbhh4TVjdcl1zQvo7sq/F9us3r2LjC91TyUnwfLxBLHOfzX4 -7hlBKRj0/UWhfxN5ROfj2Psx8uNt7tj2CpnyQQSq6puX3HIUGYm4HPqDB0Ke/oER -5V7uBBxdAEjr4xRgxZ4p8+FnZKfTr7mwMlbKdRvqKwLjyqLbh2R36HMAXG0vjzKt -Q5TDxx1C8xrp6Y4z0fEzgkdtw4RWKQfKN8f1WKQ7X8HSMR3awNIOs+f3zxPCuAG9 -SNWNPqY+yOB+xTwisJlONysXSocKpclTdLYfxpVllYkepDhgYyQJnth79yknnXcV -1X7/gwKCAQA16PxEVPk3pcC4Pkl4hqWbJzK5a9NeG2jImh1FY3ix/wu3syw9KxU8 -dvjbcM1CEtGoqTwYqW6lbyD6VbutdxXVQadb48qLhUqqndDthr2zdIO5JKpz2HZf -GkZsdDGcwC/J8DekWzIMf31B+gpu8KGpv40gWcuCh+6FUQgUz6FNoti5oXUg7hpV -D7ygLfm7PiqRHyDEfDcThCFyOYh+FNNNcPRHGeRhk5Q3kfee//jtoSAJoyz7zqaE -IxliIn1gJnpko2b1QgcVdIsUwlcxd1YAUhwrq63Iq35M5v5XmZQn9V/MoTTy986v -Fhyb4sVc07gPr3v1ZyREUtfbWwDdNV1VAoIBAF4Okl1M1DVfDFRn7eR441sxx3cH -1ckEi3CLGsaYnTe15hZoFXjwYVDRHMgc+5F/TutIvuErBh7I3fWIJAmSOUwLB85Z -LnXd5d9U0PqgkawfkGwBW2KDn6FmpEqjoMlwZOM0kxY00cXxmQo1Itvwzp4qzEO2 -2zOjesl8R+a3x7rIfP9jVFSEwOHqSNKIvfViQy5veTAdZF82rP5d2wSD+jQny0PK -GCnD8FX4UG2Q9Cn/O3e9dl9g/zyDfHzmPYK3t3M9wc9KDyhjvRvxjPz03US5doo8 -CQSpny+0U5kyApBV340QI/XoA4qm8UlPvu/9mHmWkIDeY51MyRkzA8GsnTA= ------END RSA PRIVATE KEY----- +-----BEGIN PRIVATE KEY----- +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 +DSoFLe67mF8bW8Ak/KQ6FIzC3wRizA== +-----END PRIVATE KEY----- diff --git a/certs/gubernator_no_ip_san.pem b/certs/gubernator_no_ip_san.pem index 9b700db9..e5c97587 100644 --- a/certs/gubernator_no_ip_san.pem +++ b/certs/gubernator_no_ip_san.pem @@ -1,30 +1,31 @@ -----BEGIN CERTIFICATE----- -MIIFJjCCAw6gAwIBAgIBAjANBgkqhkiG9w0BAQsFADA/MQswCQYDVQQGEwJVUzEL +MIIFZjCCA06gAwIBAgIBAjANBgkqhkiG9w0BAQsFADA/MQswCQYDVQQGEwJVUzEL MAkGA1UECAwCVFgxIzAhBgNVBAoMGk1haWxndW4gVGVjaG5vbG9naWVzLCBJbmMu -MB4XDTIyMDMwMjIxNDQxMVoXDTMyMDIyODIxNDQxMVowUzELMAkGA1UEBhMCVVMx +MB4XDTIzMDMyODIzMDgwMVoXDTMzMDMyNTIzMDgwMVowUzELMAkGA1UEBhMCVVMx CzAJBgNVBAgMAlRYMSMwIQYDVQQKDBpNYWlsZ3VuIFRlY2hub2xvZ2llcywgSW5j LjESMBAGA1UEAwwJbG9jYWxob3N0MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIIC -CgKCAgEAxhWcZ2Eo/vWwiZS8RfTyBfEpbnwL7eChyh/Qvjk+Xla4nRiKSu/xXLWG -AaAPkNjJ2De/ARFXt8gSyjuGUGr08wbwVdc2/gBaDoDFTBxmfMDE6di7EVB+nEhP -PLVUlK7YTbkcaBcQpyuu2JA27Pt9bo+ABt+ooI3Bo6z5kpI3C2gbWhbUDwKasqid -rLnO2bpxJQnAJ9yHmIg8wo1/e2oqYH5HgXbHUVCCDyaaO9IgQL3+HRKQ7S1RghPb -z/olJF7T1e6h2xEr/QuDlKTENxa9KIEErxlwCEWZ6z+bFviQrMhge41iLSecfBQp -n0y3rkq7UKMZ0QYaOiOdG/NklxQBSQVPV+FDN7jUqfEgQJDkFagWq8pzDjkXs04o -XMkzxpUDSris/TUZ9wUmTq/P1pvJPFgy6FDfRWKb7pxXEzMy5evOFLkdM2ZFAwJy -Z1naGie+ER4zcTeKY/e2IHCFXMnwksnhZpuFs1Y75BmLf6msKM0eua+Mdd+7Phmf -B9OabTNOe/ifaKa9rQjtLxdpAVFFSldrSo+7duAx5xAsZGbGO/eUMcj9e0x6QiUu -m/AX6LH4YCIBQj292A6IEYLatoz95bONZzE3/9yCGWCTx2S8RZ/WVCKq1F3LsoOI -24KvD/BPOK5TnSzATccLUAvx8Y1tauxEYusRJbBDY7NzyloZMekCAwEAAaMZMBcw -FQYDVR0RBA4wDIIKZ3ViZXJuYXRvcjANBgkqhkiG9w0BAQsFAAOCAgEAij09h1uc -heWbukR/T9kiXQRMopNc+ODi9ceR1Di9oIlOusCGmVyqbMSMG5EIm67sSC5fUufp -jOsDHhgcDjTjrVoD+xuHYo0uczJanDvF33BbWK3lXbExRyZhy7vAs7ZPwfXoJJpS -em5LZSc+n9CCNxmnXiZ2haj6TzcOOm9ysP4pe5G66QrEhUKcFiUPY9njGu8HiFUj -sHjM2MBJAiogqmU3UNr+WfRn2o0viyuXX7hS1Ieojx7jTUMDPuEsVivxHJ/XXhU0 -cYMo6V8rve7JqqVyEe5R/Eyk0cbG+hfG5uYKtZ8pceKrOhQKO6jRxNSCznFQvV0g -p7qTEhPIWd0aIPivXse6BO8GtRZ6bXRxkS5MpYrFFQ3yH8F4DhETmQIEw2SsAH5f -GavXv58Zo8PNrJZqHShnSvOdrN5gmCnOm1b3LNdDySnVqyYXjcjXfptYrbyEl3c1 -a3Qisvkq4jDHLY5jPG5+hd68AAsDP527Mv0yhb5EVpXTdVbf9N8LGf2PrM586R9C -azn9FOlSI5hW/GcvXx4WUmPd4sRRqHRPGoUPzd9yX9mAJc+ag/IDecka5NAG10wD -Wh+aPNwvDEN5ITrRMkQuDL95SYnERUAq6/PYrG0jU61/AEQBrL48q2Ug/NSljQ7B -mr8iFuYzeSfbAPhCZbEqIKhLMuaQnimcAAg= +CgKCAgEAl8cMItWI0cdS5DFVLlvcUzp1+IOHcqC7i3pG7OwjpUHPxZK1LP2X79C6 +HYxaAxkvZbR/Z1ybp2nyGWQKdPcIn1aqSFNMz1APja2zPsha05Fk8eNBhM1GuhoW +abxE/aj5P3IvU2rJjswZ0+Zwgu53v9calpFNCmv20y/300e2E3eo2+DhRlORIfIG +PwJOtHtu++qmEsWIRyiDpiNgpaMT4QlkQ9Idy9BJSRd8JR0/QVjMaXIxVKq86OEF +bphPBe3Mep7OeHP55bxXMR2GuRKUFMSNoAjQwp3P87E6h2iAYI65P7UHH4P8AMTv +32huK6ksjS9LjneRlETWXde1txhBGHNG0lvGzoltXh3tZGRAcspTA3IQqEhwqPD9 +HTlVIFjOu2SSKDezCp2eaA7qjRqjevdp85IE3dQY5oSU5dpj0PxapZrc32Evej8X +TuMhQeGHH7Zn1vBxqMC5sTvovE/GMo7xSG5YeUYkEx5WWqrotHQHYO4MdG5oiZi/ +3grD6G3T4Lil427sdIIredMoMwTf4psWZWrAyhBzMkk/C7JAnzzQqroMH8KgMF/Y +v/4ppUUBLZ0IV9nQkTxaJJML3ER4gaj5MGiFUDuXpWP+hMQcYT1Kw9HEm0l/PlMG +YkYw8GzNc9WpfUjJrzZO4bo1h9gNRvrJ+CGBoSWCIKOWEWaxRm0CAwEAAaNZMFcw +FQYDVR0RBA4wDIIKZ3ViZXJuYXRvcjAdBgNVHQ4EFgQUnab38LbFMaOLvwOTp0Lr +hzmwYGgwHwYDVR0jBBgwFoAUJ3yLDhezD9eQzC5UTMpYBZmaYR4wDQYJKoZIhvcN +AQELBQADggIBABq3fJ4TzVhxxzBcrdyZGTlXDRhZdsoFXQtl7S88aCWhH1FAxssQ +DqS/rLA84A32A7kCjHDXsJ5UanMdnZycjr/GO1btgbsZMklBKgOnXkrABjbzJG/B +YFJXxpMToyMIP0ePvPnPli6ET4poNe9o31dbdg/bP9VkJRN60I6ZUwAG6YKbjE0b +bskNDmHUhtLU1+A+/4Ofhjq1rNOcb9Eo9CRw2WIp37rLQ5JqyMsbYc6qSvMnO7R6 +fWCbMG5l/JgnSyTy5kciVQj+9bFbb2Kxc6m0OCmGjz1hjddK3sE1SplGYLIwgBUj +f/sRI8CV8YfcFwHK9BzP3cWJkPU/2niF+JKJYvhOlrQlj3Ob+V5fAx1PXPAN7AIk +x/NGI9LkLRlUtH69zajoVx3C8WTWUjpnKAZr1nG6tBAZ+2XNNHVX9TU0Sn47esAB +52j1RPx69/xLEldx0R9hI1GHsAGmr+LdsL2AhnRsvmpPQl8lFgQnhkhPBxLVXAdq +keLngmoliD5ocLX9cG9roEVEg+tQCB2NXWfsBQGRLPec9P+p3JsxPZo/ZuklVdUl +3MyVmm1LBYA5aTTmIipRRUnYKYIf/OMvYQvzLOQas/h5/SYtHC4xU/uzm78pE6xH +RHtguNXJpMJESSbSrDFNdlZitiJx2mh/+43frm/cPSHR7Zbau+A77HMB -----END CERTIFICATE----- diff --git a/config.go b/config.go index 6062c912..8a63eb19 100644 --- a/config.go +++ b/config.go @@ -293,8 +293,10 @@ func SetupDaemonConfig(logger *logrus.Logger, configFile string) (DaemonConfig, } // Main config - setter.SetDefault(&conf.GRPCListenAddress, os.Getenv("GUBER_GRPC_ADDRESS"), "localhost:81") - setter.SetDefault(&conf.HTTPListenAddress, os.Getenv("GUBER_HTTP_ADDRESS"), "localhost:80") + setter.SetDefault(&conf.GRPCListenAddress, os.Getenv("GUBER_GRPC_ADDRESS"), + fmt.Sprintf("%s:81", LocalHost())) + setter.SetDefault(&conf.HTTPListenAddress, os.Getenv("GUBER_HTTP_ADDRESS"), + fmt.Sprintf("%s:80", LocalHost())) setter.SetDefault(&conf.HTTPStatusListenAddress, os.Getenv("GUBER_STATUS_HTTP_ADDRESS"), "") setter.SetDefault(&conf.GRPCMaxConnectionAgeSeconds, getEnvInteger(log, "GUBER_GRPC_MAX_CONN_AGE_SEC"), 0) setter.SetDefault(&conf.CacheSize, getEnvInteger(log, "GUBER_CACHE_SIZE"), 50_000) @@ -458,6 +460,38 @@ func SetupDaemonConfig(logger *logrus.Logger, configFile string) (DaemonConfig, return conf, nil } +// LocalHost returns the local IPV interface which Gubernator should bind to by default. +// There are a few reasons why the interface will be different on different platforms. +// +// ### Linux ### +// Gubernator should bind to either localhost IPV6 or IPV4 on Linux. In most cases using the DNS name "localhost" +// will result in binding to the correct interface depending on the Linux network configuration. +// +// ### GitHub Actions ### +// GHA does not support IPV6, as such trying to bind to `[::1]` will result in an +// error while running in GHA even if the linux runner defaults `localhost` to IPV6. +// As such we explicitly bind to 127.0.0.1 for GHA. +// +// ### Darwin (Apple OSX) ### +// Later versions of OSX bind to the publicly addressable interface if we use the DNS name "localhost" +// which is not the loop back interface. As a result OSX will warn the user with the message +// "Do you want the application to accept incoming network connections?" every time Gubernator is +// run, including when running unit tests. So for OSX we return 127.0.0.1. +func LocalHost() string { + // If running on OSX + if runtime.GOOS == "darwin" { + return "127.0.0.1" + } + + // If running on Github Actions + if os.Getenv("RUNNER_OS") != "" { + return "127.0.0.1" + } + + // All others (Linux) return "localhost" + return "localhost" +} + func setupEtcdTLS(conf *etcd.Config) error { var tlsCertFile, tlsKeyFile, tlsCAFile string diff --git a/daemon.go b/daemon.go index c1dc6e99..cebf3dd4 100644 --- a/daemon.go +++ b/daemon.go @@ -30,7 +30,6 @@ import ( "github.com/mailgun/holster/v4/etcdutil" "github.com/mailgun/holster/v4/setter" "github.com/mailgun/holster/v4/syncutil" - "github.com/mailgun/holster/v4/tracing" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/collectors" "github.com/prometheus/client_golang/prometheus/promhttp" @@ -64,19 +63,13 @@ type Daemon struct { // This function will block until the daemon responds to connections as specified // by GRPCListenAddress and HTTPListenAddress func SpawnDaemon(ctx context.Context, conf DaemonConfig) (*Daemon, error) { - var s *Daemon - - err := tracing.CallScope(ctx, func(ctx context.Context) error { - s = &Daemon{ - log: conf.Logger, - conf: conf, - } - setter.SetDefault(&s.log, logrus.WithField("category", "gubernator")) - - return s.Start(ctx) - }) + s := &Daemon{ + log: conf.Logger, + conf: conf, + } + setter.SetDefault(&s.log, logrus.WithField("category", "gubernator")) - return s, err + return s, s.Start(ctx) } func (s *Daemon) Start(ctx context.Context) error { diff --git a/net.go b/net.go index b20a743a..39495a8d 100644 --- a/net.go +++ b/net.go @@ -24,9 +24,9 @@ import ( "github.com/pkg/errors" ) -// If the passed address is "0.0.0.0" or "::" attempts to discover the actual ip address of the host +// ResolveHostIP attempts to discover the actual ip address of the host if the passed address is "0.0.0.0" or "::" func ResolveHostIP(addr string) (string, error) { - if slice.ContainsString(addr, []string{"0.0.0.0", "::", "0:0:0:0:0:0:0:0"}, nil) { + if slice.ContainsString(addr, []string{"0.0.0.0", "::", "0:0:0:0:0:0:0:0", ""}, nil) { // Use the hostname as the advertise address as it's most likely to be the external interface domainName, err := os.Hostname() if err != nil { diff --git a/peer_client.go b/peer_client.go index d7785e77..2131773c 100644 --- a/peer_client.go +++ b/peer_client.go @@ -519,8 +519,6 @@ func (c *PeerClient) Shutdown(ctx context.Context) error { defer c.mutex.Unlock() c.status = peerClosing - // We need to close the chan here to prevent a possible race - close(c.queue) defer func() { if c.conn != nil { @@ -534,6 +532,7 @@ func (c *PeerClient) Shutdown(ctx context.Context) error { waitChan := make(chan struct{}) go func() { c.wg.Wait() + close(c.queue) close(waitChan) }() diff --git a/store_test.go b/store_test.go index 558c9141..27195be4 100644 --- a/store_test.go +++ b/store_test.go @@ -76,7 +76,7 @@ func newV1Server(t *testing.T, address string, conf gubernator.Config) *v1Server func TestLoader(t *testing.T) { loader := gubernator.NewMockLoader() - srv := newV1Server(t, "", gubernator.Config{ + srv := newV1Server(t, "localhost:0", gubernator.Config{ Behaviors: gubernator.BehaviorConfig{ GlobalSyncWait: clock.Millisecond * 50, // Suitable for testing but not production GlobalTimeout: clock.Second, @@ -129,7 +129,7 @@ func TestStore(t *testing.T) { setup := func() (*MockStore2, *v1Server, gubernator.V1Client) { store := &MockStore2{} - srv := newV1Server(t, "", gubernator.Config{ + srv := newV1Server(t, "localhost:0", gubernator.Config{ Behaviors: gubernator.BehaviorConfig{ GlobalSyncWait: clock.Millisecond * 50, // Suitable for testing but not production GlobalTimeout: clock.Second, diff --git a/tls_test.go b/tls_test.go index 7ce5c008..c4f78fca 100644 --- a/tls_test.go +++ b/tls_test.go @@ -181,9 +181,6 @@ func TestSetupTLSSkipVerify(t *testing.T) { } func TestSetupTLSClientAuth(t *testing.T) { - // This test began failing with 'rpc error: code = Unavailable desc = connection closed before server preface received' - // for an unknown reason, and I don't have time to figure it out now. - t.Skip("failing test") serverTLS := gubernator.TLSConfig{ CaFile: "certs/ca.cert", CertFile: "certs/gubernator.pem",