Skip to content
This repository has been archived by the owner on Jan 4, 2021. It is now read-only.

Commit

Permalink
Merge pull request #640 from smortex/discover-using-choria-service
Browse files Browse the repository at this point in the history
(#638) Allow discovery with choria::service
  • Loading branch information
ripienaar committed Dec 16, 2020
2 parents df12de9 + 11705ba commit 969d7b7
Show file tree
Hide file tree
Showing 14 changed files with 162 additions and 162 deletions.
2 changes: 1 addition & 1 deletion lib/mcollective/discovery/choria.rb
Expand Up @@ -77,7 +77,7 @@ def discover_collective(filter)
def discover_agents(filter)
pql = filter.map do |agent|
if ["rpcutil", "scout"].include?(agent)
discover_classes(["mcollective::service"])
"(%s or %s)" % [discover_classes(["mcollective::service"]), discover_classes(["choria::service"])]
elsif agent =~ /^\/(.+)\/$/
'resources {type = "File" and tag ~ "mcollective_agent_.*?%s.*?_server"}' % [string_regexi($1)]
else
Expand Down
6 changes: 3 additions & 3 deletions spec/fixtures/intermediate/ca-key.pem
@@ -1,5 +1,5 @@
-----BEGIN EC PRIVATE KEY-----
MHcCAQEEIEnb0AMY9tUIZyVgUwSmBO/m+LppzaSFZZS+8/I+aYGSoAoGCCqGSM49
AwEHoUQDQgAEd8c39I4OFzRHZzGKCeO7yC+fyBY6uI6X5IWV3KwggWCJJT4ISAGX
0nU3UcyiRKsmPIkgxfBAN5+0FVcR6wAPcA==
MHcCAQEEIC2ND0b5qLJr2+KKBXGt2l3P4POphPQANWuqNdG5TqLmoAoGCCqGSM49
AwEHoUQDQgAEyuiEAuSn2G9IXA3dQiT8VU4/CnRcr+O9U4neOl0FerMB3HmKyeXa
uhb5miRmkhclCDHhfZ2mEEYjorHpN78k5w==
-----END EC PRIVATE KEY-----
16 changes: 8 additions & 8 deletions spec/fixtures/intermediate/ca.csr
@@ -1,10 +1,10 @@
-----BEGIN CERTIFICATE REQUEST-----
MIIBVjCB/QIBADB5MQswCQYDVQQGEwJYWDERMA8GA1UECBMITG9jYWxpdHkxDTAL
BgNVBAcTBENpdHkxDzANBgNVBAoTBkNob3JpYTElMCMGA1UECxMcVW5pdCB0ZXN0
aW5nIEludGVybWVkaWF0ZSBDQTEQMA4GA1UEAxMHUm9vdCBDQTBZMBMGByqGSM49
AgEGCCqGSM49AwEHA0IABHfHN/SODhc0R2cxignju8gvn8gWOriOl+SFldysIIFg
iSU+CEgBl9J1N1HMokSrJjyJIMXwQDeftBVXEesAD3CgIjAgBgkqhkiG9w0BCQ4x
EzARMA8GA1UdEwQIMAYBAf8CAQEwCgYIKoZIzj0EAwIDSAAwRQIhAOQ2L6Hr6fXO
+7QAQedmbyJR6J2Fv4kMOGaiPNgF4TydAiAwK29n6rstqCh0Us7Pc09/sLVTRdC3
r+j6AbgL4UFUnw==
MIIBWDCCAQACAQAweTELMAkGA1UEBhMCWFgxETAPBgNVBAgTCExvY2FsaXR5MQ0w
CwYDVQQHEwRDaXR5MQ8wDQYDVQQKEwZDaG9yaWExJTAjBgNVBAsTHFVuaXQgdGVz
dGluZyBJbnRlcm1lZGlhdGUgQ0ExEDAOBgNVBAMTB1Jvb3QgQ0EwWTATBgcqhkjO
PQIBBggqhkjOPQMBBwNCAATK6IQC5KfYb0hcDd1CJPxVTj8KdFyv471Tid46XQV6
swHceYrJ5dq6FvmaJGaSFyUIMeF9naYQRiOisek3vyTnoCUwIwYJKoZIhvcNAQkO
MRYwFDASBgNVHRMBAf8ECDAGAQH/AgEBMAoGCCqGSM49BAMCA0YAMEMCIBJJvwKB
aO5jZ66gVBve6sKtXIIOXKUsZh6AhX56Smj7Ah8fJ7FnsqSUTU49opsDPXoewBpZ
DZ9LHxiI0vkJ9GAm
-----END CERTIFICATE REQUEST-----
20 changes: 10 additions & 10 deletions spec/fixtures/intermediate/ca.pem
@@ -1,14 +1,14 @@
-----BEGIN CERTIFICATE-----
MIICOTCCAd+gAwIBAgIUY88uzOsg/a6dcV84k0fqGPCniH8wCgYIKoZIzj0EAwIw
MIICOjCCAeGgAwIBAgIURTziIqknJ31SjTa8h/3eD/Y7F94wCgYIKoZIzj0EAwIw
eTELMAkGA1UEBhMCWFgxETAPBgNVBAgTCExvY2FsaXR5MQ0wCwYDVQQHEwRDaXR5
MQ8wDQYDVQQKEwZDaG9yaWExJTAjBgNVBAsTHFVuaXQgdGVzdGluZyBJbnRlcm1l
ZGlhdGUgQ0ExEDAOBgNVBAMTB1Jvb3QgQ0EwHhcNMTkxMTIyMDI0NDAwWhcNNDkx
MTE0MDI0NDAwWjB5MQswCQYDVQQGEwJYWDERMA8GA1UECBMITG9jYWxpdHkxDTAL
BgNVBAcTBENpdHkxDzANBgNVBAoTBkNob3JpYTElMCMGA1UECxMcVW5pdCB0ZXN0
aW5nIEludGVybWVkaWF0ZSBDQTEQMA4GA1UEAxMHUm9vdCBDQTBZMBMGByqGSM49
AgEGCCqGSM49AwEHA0IABHfHN/SODhc0R2cxignju8gvn8gWOriOl+SFldysIIFg
iSU+CEgBl9J1N1HMokSrJjyJIMXwQDeftBVXEesAD3CjRTBDMA4GA1UdDwEB/wQE
AwIBBjASBgNVHRMBAf8ECDAGAQH/AgEBMB0GA1UdDgQWBBSH7K00sGKz1eBr2ve/
o7CLaR7wsjAKBggqhkjOPQQDAgNIADBFAiEA4tQ1INJ7qUth87F/iDldEUi++uHs
lm4xbfdinNZmx14CIH8Ldq6qWNP2DRv0TVJ/AQr0PIqlp2mpshT5u0YBFcr2
ZGlhdGUgQ0ExEDAOBgNVBAMTB1Jvb3QgQ0EwIBcNMjAxMjE1MTkyNTAwWhgPMjA1
MDEyMDgxOTI1MDBaMHkxCzAJBgNVBAYTAlhYMREwDwYDVQQIEwhMb2NhbGl0eTEN
MAsGA1UEBxMEQ2l0eTEPMA0GA1UEChMGQ2hvcmlhMSUwIwYDVQQLExxVbml0IHRl
c3RpbmcgSW50ZXJtZWRpYXRlIENBMRAwDgYDVQQDEwdSb290IENBMFkwEwYHKoZI
zj0CAQYIKoZIzj0DAQcDQgAEyuiEAuSn2G9IXA3dQiT8VU4/CnRcr+O9U4neOl0F
erMB3HmKyeXauhb5miRmkhclCDHhfZ2mEEYjorHpN78k56NFMEMwDgYDVR0PAQH/
BAQDAgEGMBIGA1UdEwEB/wQIMAYBAf8CAQEwHQYDVR0OBBYEFF1I0sZQto6OHo44
6wq82/OgBP8mMAoGCCqGSM49BAMCA0cAMEQCIGl26ISPY7Y6T+RCth9/9Qq4qJEy
/T3oSvCPO2nLD15mAiAD/uKAXprWGd/VLn3gye2hpAE3jpchEW28InPDXS7Whg==
-----END CERTIFICATE-----
20 changes: 10 additions & 10 deletions spec/fixtures/intermediate/certs/ca.pem
@@ -1,14 +1,14 @@
-----BEGIN CERTIFICATE-----
MIICOTCCAd+gAwIBAgIUY88uzOsg/a6dcV84k0fqGPCniH8wCgYIKoZIzj0EAwIw
MIICOjCCAeGgAwIBAgIURTziIqknJ31SjTa8h/3eD/Y7F94wCgYIKoZIzj0EAwIw
eTELMAkGA1UEBhMCWFgxETAPBgNVBAgTCExvY2FsaXR5MQ0wCwYDVQQHEwRDaXR5
MQ8wDQYDVQQKEwZDaG9yaWExJTAjBgNVBAsTHFVuaXQgdGVzdGluZyBJbnRlcm1l
ZGlhdGUgQ0ExEDAOBgNVBAMTB1Jvb3QgQ0EwHhcNMTkxMTIyMDI0NDAwWhcNNDkx
MTE0MDI0NDAwWjB5MQswCQYDVQQGEwJYWDERMA8GA1UECBMITG9jYWxpdHkxDTAL
BgNVBAcTBENpdHkxDzANBgNVBAoTBkNob3JpYTElMCMGA1UECxMcVW5pdCB0ZXN0
aW5nIEludGVybWVkaWF0ZSBDQTEQMA4GA1UEAxMHUm9vdCBDQTBZMBMGByqGSM49
AgEGCCqGSM49AwEHA0IABHfHN/SODhc0R2cxignju8gvn8gWOriOl+SFldysIIFg
iSU+CEgBl9J1N1HMokSrJjyJIMXwQDeftBVXEesAD3CjRTBDMA4GA1UdDwEB/wQE
AwIBBjASBgNVHRMBAf8ECDAGAQH/AgEBMB0GA1UdDgQWBBSH7K00sGKz1eBr2ve/
o7CLaR7wsjAKBggqhkjOPQQDAgNIADBFAiEA4tQ1INJ7qUth87F/iDldEUi++uHs
lm4xbfdinNZmx14CIH8Ldq6qWNP2DRv0TVJ/AQr0PIqlp2mpshT5u0YBFcr2
ZGlhdGUgQ0ExEDAOBgNVBAMTB1Jvb3QgQ0EwIBcNMjAxMjE1MTkyNTAwWhgPMjA1
MDEyMDgxOTI1MDBaMHkxCzAJBgNVBAYTAlhYMREwDwYDVQQIEwhMb2NhbGl0eTEN
MAsGA1UEBxMEQ2l0eTEPMA0GA1UEChMGQ2hvcmlhMSUwIwYDVQQLExxVbml0IHRl
c3RpbmcgSW50ZXJtZWRpYXRlIENBMRAwDgYDVQQDEwdSb290IENBMFkwEwYHKoZI
zj0CAQYIKoZIzj0DAQcDQgAEyuiEAuSn2G9IXA3dQiT8VU4/CnRcr+O9U4neOl0F
erMB3HmKyeXauhb5miRmkhclCDHhfZ2mEEYjorHpN78k56NFMEMwDgYDVR0PAQH/
BAQDAgEGMBIGA1UdEwEB/wQIMAYBAf8CAQEwHQYDVR0OBBYEFF1I0sZQto6OHo44
6wq82/OgBP8mMAoGCCqGSM49BAMCA0cAMEQCIGl26ISPY7Y6T+RCth9/9Qq4qJEy
/T3oSvCPO2nLD15mAiAD/uKAXprWGd/VLn3gye2hpAE3jpchEW28InPDXS7Whg==
-----END CERTIFICATE-----
54 changes: 27 additions & 27 deletions spec/fixtures/intermediate/certs/rip.mcollective.pem
@@ -1,34 +1,34 @@
-----BEGIN CERTIFICATE-----
MIIDBTCCAqygAwIBAgIUVI0kU2/qW/L8xCn7oqPSjxm2fRgwCgYIKoZIzj0EAwIw
MIIDBTCCAqygAwIBAgIUYpJ6oJL9Wi/svje/ASA6bO760LcwCgYIKoZIzj0EAwIw
gYExCzAJBgNVBAYTAlhYMREwDwYDVQQIEwhMb2NhbGl0eTENMAsGA1UEBxMEQ2l0
eTEPMA0GA1UEChMGQ2hvcmlhMSUwIwYDVQQLExxVbml0IHRlc3RpbmcgSW50ZXJt
ZWRpYXRlIENBMRgwFgYDVQQDEw9JbnRlcm1lZGlhdGUgQ0EwHhcNMTkxMTIyMDI0
NDAwWhcNMjAxMTIxMDI0NDAwWjAaMRgwFgYDVQQDEw9yaXAubWNvbGxlY3RpdmUw
ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDbo3ht8Q/MGVOcBzkvY7sS
24zPy+ntn42je/LLGdG7DZ7o7+lfCkG1ZpyGirS/Dp7jRe2WF0jHufFbQW7Nl+VN
zE3/WbsPfmww5nQA8zEE7UvoISLwCFB+bOXs/wOIIkbEw8lTpcsH29s5iG98xcMT
IOD8jKtDWETlS3YNPC90RwB5qmB7PRIcQ0px7i12V+VdxgRrLT7Q1d6cl7NCThow
1z7dRTKH15rRTXN0VaJoBxKYtHmJsP1O7QFxCrziL3J7MXMtFBdHC62LQTS32WL4
4yWl1zBmG4/rQfFybZ7wHl6RalrXwPFaf7A2dasoS9WGqWbkpxUDFP+6aHBehtnZ
ZWRpYXRlIENBMRgwFgYDVQQDEw9JbnRlcm1lZGlhdGUgQ0EwHhcNMjAxMjE1MTky
NTAwWhcNMjExMjE1MTkyNTAwWjAaMRgwFgYDVQQDEw9yaXAubWNvbGxlY3RpdmUw
ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDHUyCDidoT5z9BD8FAmoXs
Sx0AvSc631pMJ4ieAOwG0X4HBTCgCcD1uzxDZQbV3BC9IIvc0qs6Hah//XluDiz7
ny9Icmeq3HeQKsTVn1XWW0+B3Swu0JYEN2DgR6LUfC3d/uV+zuTyfWXIxP6w2Rk8
0Spr2UzEViAGes9UMBU/SMqgzwhyW+pdi5VUk9RKiNTHma92ZokydIgddRF/vXru
HqODxNpkgWTTjMsFC+yvzGlJzJJcAOMUglKoFqaWIqcibsDRhgcApvsD1rlzPFLY
5vaiIi82h3+KrViWFxljy4OK/kccRh/zg1x5iplwVm4Oz/GrzjZTy6wzn/H00rvP
AgMBAAGjgZwwgZkwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMB
BggrBgEFBQcDAjAMBgNVHRMBAf8EAjAAMB0GA1UdDgQWBBSFd8EIGYIPKs4twxz7
Mn1/s/0dDzAfBgNVHSMEGDAWgBTAIwLAHkO+msDgetFXu3OXLmGP3jAaBgNVHREE
EzARgg9yaXAubWNvbGxlY3RpdmUwCgYIKoZIzj0EAwIDRwAwRAIgDvnXg/aOU6xm
8XKCwlCwINzHyywE/68rd6funxNLLb8CICp6si+Iyifnxrm7NL/nl7b+Vd6mVmJ2
9wrLUIksdqNy
BggrBgEFBQcDAjAMBgNVHRMBAf8EAjAAMB0GA1UdDgQWBBTbBslReh39sDdsnl1U
CFz56W4VZTAfBgNVHSMEGDAWgBSW4g6Q6h5OzyPUEa/uTAJ3rWMXXTAaBgNVHREE
EzARgg9yaXAubWNvbGxlY3RpdmUwCgYIKoZIzj0EAwIDRwAwRAIgNvuUVTNwdgPj
fQzlFiNBjLdEZjBeX4Hds7Y0oVLX6o8CIA9dfluhOT1aurF3R+hPL4VmPF2d1odb
PtTAM2puIbCT
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
MIICYjCCAgigAwIBAgITAwVCe2hLhq/vYoRbXhrgSp89+DAKBggqhkjOPQQDAjB5
MQswCQYDVQQGEwJYWDERMA8GA1UECBMITG9jYWxpdHkxDTALBgNVBAcTBENpdHkx
DzANBgNVBAoTBkNob3JpYTElMCMGA1UECxMcVW5pdCB0ZXN0aW5nIEludGVybWVk
aWF0ZSBDQTEQMA4GA1UEAxMHUm9vdCBDQTAeFw0xOTExMjIwMjQ0MDBaFw00OTEx
MTQwMjQ0MDBaMIGBMQswCQYDVQQGEwJYWDERMA8GA1UECBMITG9jYWxpdHkxDTAL
BgNVBAcTBENpdHkxDzANBgNVBAoTBkNob3JpYTElMCMGA1UECxMcVW5pdCB0ZXN0
aW5nIEludGVybWVkaWF0ZSBDQTEYMBYGA1UEAxMPSW50ZXJtZWRpYXRlIENBMFkw
EwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE+ukxzrygWncAXjyTuWtkLwvBIlmCeHHT
yhpKquxraY6HyIAwP9X0j3k10P77atDuPb/2lM9WHT69QIe3bQM6/6NmMGQwDgYD
VR0PAQH/BAQDAgGmMBIGA1UdEwEB/wQIMAYBAf8CAQAwHQYDVR0OBBYEFMAjAsAe
Q76awOB60Ve7c5cuYY/eMB8GA1UdIwQYMBaAFIfsrTSwYrPV4Gva97+jsItpHvCy
MAoGCCqGSM49BAMCA0gAMEUCIGmO/zNTlAx6/8sEHexr8pxnZi+iHeZw/MWzDw8l
Yvm3AiEAi8vBY7bxQlSDDsGYu2WPnz9RIj8DLI/rzrQZhH+MLss=
MIICZTCCAgugAwIBAgIUV6AjLb+O75EksepDkL4UHgb9x5wwCgYIKoZIzj0EAwIw
eTELMAkGA1UEBhMCWFgxETAPBgNVBAgTCExvY2FsaXR5MQ0wCwYDVQQHEwRDaXR5
MQ8wDQYDVQQKEwZDaG9yaWExJTAjBgNVBAsTHFVuaXQgdGVzdGluZyBJbnRlcm1l
ZGlhdGUgQ0ExEDAOBgNVBAMTB1Jvb3QgQ0EwIBcNMjAxMjE1MTkyNTAwWhgPMjA1
MDEyMDgxOTI1MDBaMIGBMQswCQYDVQQGEwJYWDERMA8GA1UECBMITG9jYWxpdHkx
DTALBgNVBAcTBENpdHkxDzANBgNVBAoTBkNob3JpYTElMCMGA1UECxMcVW5pdCB0
ZXN0aW5nIEludGVybWVkaWF0ZSBDQTEYMBYGA1UEAxMPSW50ZXJtZWRpYXRlIENB
MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEqFv3LcP7tPP0qmbqVOJrTmrWi0eA
uYPJmNbZTKzpkEOuwk87KDQ1U1utL72ghgnVQThOdiMVeCfo3/6e6I+Iw6NmMGQw
DgYDVR0PAQH/BAQDAgGmMBIGA1UdEwEB/wQIMAYBAf8CAQAwHQYDVR0OBBYEFJbi
DpDqHk7PI9QRr+5MAnetYxddMB8GA1UdIwQYMBaAFF1I0sZQto6OHo446wq82/Og
BP8mMAoGCCqGSM49BAMCA0gAMEUCIAIULPrjL99ZubkT7kF9CjELFtmObZS+ZVK1
IYGVUHcEAiEAul/8VpgbJt3fFHfi9KxfyAtcdkBaZOIaqf6ZHN6Sepo=
-----END CERTIFICATE-----
54 changes: 27 additions & 27 deletions spec/fixtures/intermediate/chain-rip.mcollective.pem
@@ -1,34 +1,34 @@
-----BEGIN CERTIFICATE-----
MIIDBTCCAqygAwIBAgIUVI0kU2/qW/L8xCn7oqPSjxm2fRgwCgYIKoZIzj0EAwIw
MIIDBTCCAqygAwIBAgIUYpJ6oJL9Wi/svje/ASA6bO760LcwCgYIKoZIzj0EAwIw
gYExCzAJBgNVBAYTAlhYMREwDwYDVQQIEwhMb2NhbGl0eTENMAsGA1UEBxMEQ2l0
eTEPMA0GA1UEChMGQ2hvcmlhMSUwIwYDVQQLExxVbml0IHRlc3RpbmcgSW50ZXJt
ZWRpYXRlIENBMRgwFgYDVQQDEw9JbnRlcm1lZGlhdGUgQ0EwHhcNMTkxMTIyMDI0
NDAwWhcNMjAxMTIxMDI0NDAwWjAaMRgwFgYDVQQDEw9yaXAubWNvbGxlY3RpdmUw
ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDbo3ht8Q/MGVOcBzkvY7sS
24zPy+ntn42je/LLGdG7DZ7o7+lfCkG1ZpyGirS/Dp7jRe2WF0jHufFbQW7Nl+VN
zE3/WbsPfmww5nQA8zEE7UvoISLwCFB+bOXs/wOIIkbEw8lTpcsH29s5iG98xcMT
IOD8jKtDWETlS3YNPC90RwB5qmB7PRIcQ0px7i12V+VdxgRrLT7Q1d6cl7NCThow
1z7dRTKH15rRTXN0VaJoBxKYtHmJsP1O7QFxCrziL3J7MXMtFBdHC62LQTS32WL4
4yWl1zBmG4/rQfFybZ7wHl6RalrXwPFaf7A2dasoS9WGqWbkpxUDFP+6aHBehtnZ
ZWRpYXRlIENBMRgwFgYDVQQDEw9JbnRlcm1lZGlhdGUgQ0EwHhcNMjAxMjE1MTky
NTAwWhcNMjExMjE1MTkyNTAwWjAaMRgwFgYDVQQDEw9yaXAubWNvbGxlY3RpdmUw
ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDHUyCDidoT5z9BD8FAmoXs
Sx0AvSc631pMJ4ieAOwG0X4HBTCgCcD1uzxDZQbV3BC9IIvc0qs6Hah//XluDiz7
ny9Icmeq3HeQKsTVn1XWW0+B3Swu0JYEN2DgR6LUfC3d/uV+zuTyfWXIxP6w2Rk8
0Spr2UzEViAGes9UMBU/SMqgzwhyW+pdi5VUk9RKiNTHma92ZokydIgddRF/vXru
HqODxNpkgWTTjMsFC+yvzGlJzJJcAOMUglKoFqaWIqcibsDRhgcApvsD1rlzPFLY
5vaiIi82h3+KrViWFxljy4OK/kccRh/zg1x5iplwVm4Oz/GrzjZTy6wzn/H00rvP
AgMBAAGjgZwwgZkwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMB
BggrBgEFBQcDAjAMBgNVHRMBAf8EAjAAMB0GA1UdDgQWBBSFd8EIGYIPKs4twxz7
Mn1/s/0dDzAfBgNVHSMEGDAWgBTAIwLAHkO+msDgetFXu3OXLmGP3jAaBgNVHREE
EzARgg9yaXAubWNvbGxlY3RpdmUwCgYIKoZIzj0EAwIDRwAwRAIgDvnXg/aOU6xm
8XKCwlCwINzHyywE/68rd6funxNLLb8CICp6si+Iyifnxrm7NL/nl7b+Vd6mVmJ2
9wrLUIksdqNy
BggrBgEFBQcDAjAMBgNVHRMBAf8EAjAAMB0GA1UdDgQWBBTbBslReh39sDdsnl1U
CFz56W4VZTAfBgNVHSMEGDAWgBSW4g6Q6h5OzyPUEa/uTAJ3rWMXXTAaBgNVHREE
EzARgg9yaXAubWNvbGxlY3RpdmUwCgYIKoZIzj0EAwIDRwAwRAIgNvuUVTNwdgPj
fQzlFiNBjLdEZjBeX4Hds7Y0oVLX6o8CIA9dfluhOT1aurF3R+hPL4VmPF2d1odb
PtTAM2puIbCT
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
MIICYjCCAgigAwIBAgITAwVCe2hLhq/vYoRbXhrgSp89+DAKBggqhkjOPQQDAjB5
MQswCQYDVQQGEwJYWDERMA8GA1UECBMITG9jYWxpdHkxDTALBgNVBAcTBENpdHkx
DzANBgNVBAoTBkNob3JpYTElMCMGA1UECxMcVW5pdCB0ZXN0aW5nIEludGVybWVk
aWF0ZSBDQTEQMA4GA1UEAxMHUm9vdCBDQTAeFw0xOTExMjIwMjQ0MDBaFw00OTEx
MTQwMjQ0MDBaMIGBMQswCQYDVQQGEwJYWDERMA8GA1UECBMITG9jYWxpdHkxDTAL
BgNVBAcTBENpdHkxDzANBgNVBAoTBkNob3JpYTElMCMGA1UECxMcVW5pdCB0ZXN0
aW5nIEludGVybWVkaWF0ZSBDQTEYMBYGA1UEAxMPSW50ZXJtZWRpYXRlIENBMFkw
EwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE+ukxzrygWncAXjyTuWtkLwvBIlmCeHHT
yhpKquxraY6HyIAwP9X0j3k10P77atDuPb/2lM9WHT69QIe3bQM6/6NmMGQwDgYD
VR0PAQH/BAQDAgGmMBIGA1UdEwEB/wQIMAYBAf8CAQAwHQYDVR0OBBYEFMAjAsAe
Q76awOB60Ve7c5cuYY/eMB8GA1UdIwQYMBaAFIfsrTSwYrPV4Gva97+jsItpHvCy
MAoGCCqGSM49BAMCA0gAMEUCIGmO/zNTlAx6/8sEHexr8pxnZi+iHeZw/MWzDw8l
Yvm3AiEAi8vBY7bxQlSDDsGYu2WPnz9RIj8DLI/rzrQZhH+MLss=
MIICZTCCAgugAwIBAgIUV6AjLb+O75EksepDkL4UHgb9x5wwCgYIKoZIzj0EAwIw
eTELMAkGA1UEBhMCWFgxETAPBgNVBAgTCExvY2FsaXR5MQ0wCwYDVQQHEwRDaXR5
MQ8wDQYDVQQKEwZDaG9yaWExJTAjBgNVBAsTHFVuaXQgdGVzdGluZyBJbnRlcm1l
ZGlhdGUgQ0ExEDAOBgNVBAMTB1Jvb3QgQ0EwIBcNMjAxMjE1MTkyNTAwWhgPMjA1
MDEyMDgxOTI1MDBaMIGBMQswCQYDVQQGEwJYWDERMA8GA1UECBMITG9jYWxpdHkx
DTALBgNVBAcTBENpdHkxDzANBgNVBAoTBkNob3JpYTElMCMGA1UECxMcVW5pdCB0
ZXN0aW5nIEludGVybWVkaWF0ZSBDQTEYMBYGA1UEAxMPSW50ZXJtZWRpYXRlIENB
MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEqFv3LcP7tPP0qmbqVOJrTmrWi0eA
uYPJmNbZTKzpkEOuwk87KDQ1U1utL72ghgnVQThOdiMVeCfo3/6e6I+Iw6NmMGQw
DgYDVR0PAQH/BAQDAgGmMBIGA1UdEwEB/wQIMAYBAf8CAQAwHQYDVR0OBBYEFJbi
DpDqHk7PI9QRr+5MAnetYxddMB8GA1UdIwQYMBaAFF1I0sZQto6OHo446wq82/Og
BP8mMAoGCCqGSM49BAMCA0gAMEUCIAIULPrjL99ZubkT7kF9CjELFtmObZS+ZVK1
IYGVUHcEAiEAul/8VpgbJt3fFHfi9KxfyAtcdkBaZOIaqf6ZHN6Sepo=
-----END CERTIFICATE-----
6 changes: 3 additions & 3 deletions spec/fixtures/intermediate/intermediate-key.pem
@@ -1,5 +1,5 @@
-----BEGIN EC PRIVATE KEY-----
MHcCAQEEIJK9vevoo4d54Wac9KKTGPn0npaQayPggLmx5wg+NtX6oAoGCCqGSM49
AwEHoUQDQgAE+ukxzrygWncAXjyTuWtkLwvBIlmCeHHTyhpKquxraY6HyIAwP9X0
j3k10P77atDuPb/2lM9WHT69QIe3bQM6/w==
MHcCAQEEIMUlAiSQ5z3D2iUgL5Z4unDRFAK2f0uFkV2ABGrTkKqvoAoGCCqGSM49
AwEHoUQDQgAEqFv3LcP7tPP0qmbqVOJrTmrWi0eAuYPJmNbZTKzpkEOuwk87KDQ1
U1utL72ghgnVQThOdiMVeCfo3/6e6I+Iww==
-----END EC PRIVATE KEY-----
12 changes: 6 additions & 6 deletions spec/fixtures/intermediate/intermediate.csr
@@ -1,10 +1,10 @@
-----BEGIN CERTIFICATE REQUEST-----
MIIBXjCCAQMCAQAwgYExCzAJBgNVBAYTAlhYMREwDwYDVQQIEwhMb2NhbGl0eTEN
MIIBYDCCAQYCAQAwgYExCzAJBgNVBAYTAlhYMREwDwYDVQQIEwhMb2NhbGl0eTEN
MAsGA1UEBxMEQ2l0eTEPMA0GA1UEChMGQ2hvcmlhMSUwIwYDVQQLExxVbml0IHRl
c3RpbmcgSW50ZXJtZWRpYXRlIENBMRgwFgYDVQQDEw9JbnRlcm1lZGlhdGUgQ0Ew
WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAT66THOvKBadwBePJO5a2QvC8EiWYJ4
cdPKGkqq7GtpjofIgDA/1fSPeTXQ/vtq0O49v/aUz1YdPr1Ah7dtAzr/oB8wHQYJ
KoZIhvcNAQkOMRAwDjAMBgNVHRMEBTADAQH/MAoGCCqGSM49BAMCA0kAMEYCIQDQ
ZHKWrsETDQfX19g+S/861A+svrOo1+sfi9lDRSKquwIhAK6THpxBsp6stQJfBBJD
oMstdTd6Q++pJjpld+C8q7l0
WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAASoW/ctw/u08/SqZupU4mtOataLR4C5
g8mY1tlMrOmQQ67CTzsoNDVTW60vvaCGCdVBOE52IxV4J+jf/p7oj4jDoCIwIAYJ
KoZIhvcNAQkOMRMwETAPBgNVHRMBAf8EBTADAQH/MAoGCCqGSM49BAMCA0gAMEUC
IQDTWiZzNAC3esd7qvXucl9V7QvgOXda6nZ+hgH/hybbRgIgQhVwRc0acP96AtyA
G7DlKATTznPWZzryCiD4vFcliyQ=
-----END CERTIFICATE REQUEST-----
26 changes: 13 additions & 13 deletions spec/fixtures/intermediate/intermediate.pem
@@ -1,15 +1,15 @@
-----BEGIN CERTIFICATE-----
MIICYjCCAgigAwIBAgITAwVCe2hLhq/vYoRbXhrgSp89+DAKBggqhkjOPQQDAjB5
MQswCQYDVQQGEwJYWDERMA8GA1UECBMITG9jYWxpdHkxDTALBgNVBAcTBENpdHkx
DzANBgNVBAoTBkNob3JpYTElMCMGA1UECxMcVW5pdCB0ZXN0aW5nIEludGVybWVk
aWF0ZSBDQTEQMA4GA1UEAxMHUm9vdCBDQTAeFw0xOTExMjIwMjQ0MDBaFw00OTEx
MTQwMjQ0MDBaMIGBMQswCQYDVQQGEwJYWDERMA8GA1UECBMITG9jYWxpdHkxDTAL
BgNVBAcTBENpdHkxDzANBgNVBAoTBkNob3JpYTElMCMGA1UECxMcVW5pdCB0ZXN0
aW5nIEludGVybWVkaWF0ZSBDQTEYMBYGA1UEAxMPSW50ZXJtZWRpYXRlIENBMFkw
EwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE+ukxzrygWncAXjyTuWtkLwvBIlmCeHHT
yhpKquxraY6HyIAwP9X0j3k10P77atDuPb/2lM9WHT69QIe3bQM6/6NmMGQwDgYD
VR0PAQH/BAQDAgGmMBIGA1UdEwEB/wQIMAYBAf8CAQAwHQYDVR0OBBYEFMAjAsAe
Q76awOB60Ve7c5cuYY/eMB8GA1UdIwQYMBaAFIfsrTSwYrPV4Gva97+jsItpHvCy
MAoGCCqGSM49BAMCA0gAMEUCIGmO/zNTlAx6/8sEHexr8pxnZi+iHeZw/MWzDw8l
Yvm3AiEAi8vBY7bxQlSDDsGYu2WPnz9RIj8DLI/rzrQZhH+MLss=
MIICZTCCAgugAwIBAgIUV6AjLb+O75EksepDkL4UHgb9x5wwCgYIKoZIzj0EAwIw
eTELMAkGA1UEBhMCWFgxETAPBgNVBAgTCExvY2FsaXR5MQ0wCwYDVQQHEwRDaXR5
MQ8wDQYDVQQKEwZDaG9yaWExJTAjBgNVBAsTHFVuaXQgdGVzdGluZyBJbnRlcm1l
ZGlhdGUgQ0ExEDAOBgNVBAMTB1Jvb3QgQ0EwIBcNMjAxMjE1MTkyNTAwWhgPMjA1
MDEyMDgxOTI1MDBaMIGBMQswCQYDVQQGEwJYWDERMA8GA1UECBMITG9jYWxpdHkx
DTALBgNVBAcTBENpdHkxDzANBgNVBAoTBkNob3JpYTElMCMGA1UECxMcVW5pdCB0
ZXN0aW5nIEludGVybWVkaWF0ZSBDQTEYMBYGA1UEAxMPSW50ZXJtZWRpYXRlIENB
MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEqFv3LcP7tPP0qmbqVOJrTmrWi0eA
uYPJmNbZTKzpkEOuwk87KDQ1U1utL72ghgnVQThOdiMVeCfo3/6e6I+Iw6NmMGQw
DgYDVR0PAQH/BAQDAgGmMBIGA1UdEwEB/wQIMAYBAf8CAQAwHQYDVR0OBBYEFJbi
DpDqHk7PI9QRr+5MAnetYxddMB8GA1UdIwQYMBaAFF1I0sZQto6OHo446wq82/Og
BP8mMAoGCCqGSM49BAMCA0gAMEUCIAIULPrjL99ZubkT7kF9CjELFtmObZS+ZVK1
IYGVUHcEAiEAul/8VpgbJt3fFHfi9KxfyAtcdkBaZOIaqf6ZHN6Sepo=
-----END CERTIFICATE-----
50 changes: 25 additions & 25 deletions spec/fixtures/intermediate/rip.mcollective-key.pem
@@ -1,27 +1,27 @@
-----BEGIN RSA PRIVATE KEY-----
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
-----END RSA PRIVATE KEY-----

0 comments on commit 969d7b7

Please sign in to comment.