From dc9d440a207abacc7f54ee0065574cb27004c2eb Mon Sep 17 00:00:00 2001 From: elijah Date: Fri, 7 Oct 2016 15:42:30 -0700 Subject: renew certs and recompile --- files/cert/demo.bitmask.net.crt | 20 ++++++++++---------- files/cert/mail.bitmask.net.crt | 20 ++++++++++---------- hiera/alpaca.yaml | 22 ++++++++++------------ hiera/cat.yaml | 2 -- hiera/leech.yaml | 20 ++++++++++---------- hiera/snail.yaml | 2 -- 6 files changed, 40 insertions(+), 46 deletions(-) diff --git a/files/cert/demo.bitmask.net.crt b/files/cert/demo.bitmask.net.crt index 7efab84..3075f8a 100644 --- a/files/cert/demo.bitmask.net.crt +++ b/files/cert/demo.bitmask.net.crt @@ -1,8 +1,8 @@ -----BEGIN CERTIFICATE----- -MIIGBDCCBOygAwIBAgISA4c52n7fEOGJjswDqZD7ZryFMA0GCSqGSIb3DQEBCwUA +MIIGBDCCBOygAwIBAgISAyzXn7KKXWbHCKr2Dc0y7QjfMA0GCSqGSIb3DQEBCwUA MEoxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MSMwIQYDVQQD -ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMzAeFw0xNjA4MzEyMDE2MDBaFw0x -NjExMjkyMDE2MDBaMBsxGTAXBgNVBAMTEGRlbW8uYml0bWFzay5uZXQwggIiMA0G +ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMzAeFw0xNjEwMDQxNzI5MDBaFw0x +NzAxMDIxNzI5MDBaMBsxGTAXBgNVBAMTEGRlbW8uYml0bWFzay5uZXQwggIiMA0G CSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCtPNOYXF7Gse1oYyj7CKkEEO9Br/3a qpfxscTwzgDlufrfGOfLFVQrE6YlcZOJw2ADB1RE/b4vOYKvQ/HpbzdnfSZpJtAT ngEHQIwmvHIdHmpxFHChyUwbdVtxH4Zb539JF2CyYsw9kp81uocFpduLxANwMhfV @@ -25,13 +25,13 @@ BggrBgEFBQcCARYaaHR0cDovL2Nwcy5sZXRzZW5jcnlwdC5vcmcwgasGCCsGAQUF BwICMIGeDIGbVGhpcyBDZXJ0aWZpY2F0ZSBtYXkgb25seSBiZSByZWxpZWQgdXBv biBieSBSZWx5aW5nIFBhcnRpZXMgYW5kIG9ubHkgaW4gYWNjb3JkYW5jZSB3aXRo IHRoZSBDZXJ0aWZpY2F0ZSBQb2xpY3kgZm91bmQgYXQgaHR0cHM6Ly9sZXRzZW5j -cnlwdC5vcmcvcmVwb3NpdG9yeS8wDQYJKoZIhvcNAQELBQADggEBAHtHGId40wTs -4jX/DibaasJVQ7f89QZWzFH/+9oXYJGW7fFRtxkyD5yUpQR13Z95JYEXe3Grs4Gq -Jt1QY5SBDui8uYI3h940d/VDw66W6A87NEZam4Vhdcx6m92LzSdQySxY2/9zZqzr -ZXs65CiNnDtjk44H5/io4hogsL2p/ZnRZrS/hrXywwa/01V9I5NhQUF30n6Ch426 -gLbvIlFdzdO92kKvNsU/vh+JnHFxDh16TQMJbyC7LKraqM0wy8DhkUKEaWMjM65K -0PrjQmPCEL9CbgcSNEAehs00asnEidVqVJqJwYeYvT+oi+H+1SY7RT7/rl5y5K+d -5FoZS43x9VA= +cnlwdC5vcmcvcmVwb3NpdG9yeS8wDQYJKoZIhvcNAQELBQADggEBAEpxGHLGeTe+ +3f8nAis4koH8kcG1InN5PytuTl8zG2U14eyyleOrtbP0M9IxXl7RNtUQ4ZVBw56u +9B6vM1CvzDqnYWoFsaJgwIwpDa9BPgoe7Lf0N5mZsnqruAkcMQprCSlYVfa08T0a +J9bSxKdMq+QRqOOGh46rfmN/fEWwIIP0chS/Ty3D9vf77/XbhTEbBPauU+yPwK0J +5a0eYY56E3j8rI+kLZkVcBlvgTouJqiYe6F+vhWZwQVkUCpnQ7wZTlxhp5z3Jn2v +GFY8VKBGUvJW9Oi+2glDYgpvbZZdsmKlTOzU9+yNOndqMR73yGP8CcXd5GXAKADb +HAFVpwKHYXI= -----END CERTIFICATE----- -----BEGIN CERTIFICATE----- MIIEkjCCA3qgAwIBAgIQCgFBQgAAAVOFc2oLheynCDANBgkqhkiG9w0BAQsFADA/ diff --git a/files/cert/mail.bitmask.net.crt b/files/cert/mail.bitmask.net.crt index 19d148d..732d2da 100644 --- a/files/cert/mail.bitmask.net.crt +++ b/files/cert/mail.bitmask.net.crt @@ -1,8 +1,8 @@ -----BEGIN CERTIFICATE----- -MIIGBDCCBOygAwIBAgISA66aMA4D2afiNBUBhFOpKVt+MA0GCSqGSIb3DQEBCwUA +MIIGBDCCBOygAwIBAgISAwfiqotPQrmC36ueT+dyrClKMA0GCSqGSIb3DQEBCwUA MEoxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MSMwIQYDVQQD -ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMzAeFw0xNjA5MDExNzQ5MDBaFw0x -NjExMzAxNzQ5MDBaMBsxGTAXBgNVBAMTEG1haWwuYml0bWFzay5uZXQwggIiMA0G +ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMzAeFw0xNjEwMDQxNzMwMDBaFw0x +NzAxMDIxNzMwMDBaMBsxGTAXBgNVBAMTEG1haWwuYml0bWFzay5uZXQwggIiMA0G CSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCyhT0kMzDz58rdxvhtMh194Ob1AkDw vwvh5wglRJWRzCNT+HUolygX5lzae16qyygXBaiVu2NDo+LIwjxwLZF9BcGhUj5Z UXuuKvkA1EZnBXxoAUhrwUSk8hgpgTfecCa96OTOs9XRxVv6Brf0IGy55s3E6ARg @@ -25,13 +25,13 @@ BggrBgEFBQcCARYaaHR0cDovL2Nwcy5sZXRzZW5jcnlwdC5vcmcwgasGCCsGAQUF BwICMIGeDIGbVGhpcyBDZXJ0aWZpY2F0ZSBtYXkgb25seSBiZSByZWxpZWQgdXBv biBieSBSZWx5aW5nIFBhcnRpZXMgYW5kIG9ubHkgaW4gYWNjb3JkYW5jZSB3aXRo IHRoZSBDZXJ0aWZpY2F0ZSBQb2xpY3kgZm91bmQgYXQgaHR0cHM6Ly9sZXRzZW5j -cnlwdC5vcmcvcmVwb3NpdG9yeS8wDQYJKoZIhvcNAQELBQADggEBACf98VHSibrK -RUGy6K6uE5QkoQb7OL2beHiHlGNmNVSEib6epbrI+ETGdz0XTuz/RCHJs3XEHgXW -SzfwJPRcD46TVPZDs6e+T9YDW4Z3eVevrXp0QWWGxASj1ZhvquMdpzwfT+TFd78q -nb4PR3uKsIaChwOHSEmd/jcN6A0Ca/GdgWDjp7j2ID/yHvgEhfchMDZYylgsCFpW -wn7Qvzq2dQwOUpKQ8umlfjbc1b6JUGtixxy077cocB1Kbc9OADJ43sRD54yKX6CS -Aobq7ktjxUBLw8XIkH2PufNaJl1Xrqh1dOWK1o7FJ59oT/+WsWAu4rjflJzI8ih9 -odX5GN4b34w= +cnlwdC5vcmcvcmVwb3NpdG9yeS8wDQYJKoZIhvcNAQELBQADggEBACtp8JUhWwj9 +/VYiHiXVEpk/4JWHEVFzMPwDvsstlSNHuwX4ZawRDvrKWEL5d66R2R6X0GZbk8IL +wBFN/1OTfGZ7Ykthd+jEIJwC+9xazTdWBt4PXtCS37K/6i2EgUgiOcxw/odD/R/5 +uZs/oLSwqI5snMWlwvEXZaM7JzAc+2O1UPFkf238ta0J2hRTjKGNkTVjtlwXyb/d +0uICbQHbx46ewBAkKQxz5Oguf16GTeTHD8yL6fE2ce5ArnvOMq3PnYyVGe4amKy4 +1pXTu391kuXRba3lrV5gez2YUDP4xbWsHzs5uKDpIUHm7bWCmrIhAaJRpnhMNVtE +/pdP8PNVarc= -----END CERTIFICATE----- -----BEGIN CERTIFICATE----- MIIEkjCCA3qgAwIBAgIQCgFBQgAAAVOFc2oLheynCDANBgkqhkiG9w0BAQsFADA/ diff --git a/hiera/alpaca.yaml b/hiera/alpaca.yaml index e98475a..660c5ea 100644 --- a/hiera/alpaca.yaml +++ b/hiera/alpaca.yaml @@ -227,8 +227,6 @@ mynetworks: - "199.119.112.223" - "204.13.164.171" - "37.218.240.50" - - "37.218.240.86" - - "37.218.240.87" - "37.218.242.145" - "37.218.242.146" - "37.218.242.147" @@ -609,10 +607,10 @@ x509: commercial_ca_cert: ~ commercial_cert: | -----BEGIN CERTIFICATE----- - MIIGBDCCBOygAwIBAgISA66aMA4D2afiNBUBhFOpKVt+MA0GCSqGSIb3DQEBCwUA + MIIGBDCCBOygAwIBAgISAwfiqotPQrmC36ueT+dyrClKMA0GCSqGSIb3DQEBCwUA MEoxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MSMwIQYDVQQD - ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMzAeFw0xNjA5MDExNzQ5MDBaFw0x - NjExMzAxNzQ5MDBaMBsxGTAXBgNVBAMTEG1haWwuYml0bWFzay5uZXQwggIiMA0G + ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMzAeFw0xNjEwMDQxNzMwMDBaFw0x + NzAxMDIxNzMwMDBaMBsxGTAXBgNVBAMTEG1haWwuYml0bWFzay5uZXQwggIiMA0G CSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCyhT0kMzDz58rdxvhtMh194Ob1AkDw vwvh5wglRJWRzCNT+HUolygX5lzae16qyygXBaiVu2NDo+LIwjxwLZF9BcGhUj5Z UXuuKvkA1EZnBXxoAUhrwUSk8hgpgTfecCa96OTOs9XRxVv6Brf0IGy55s3E6ARg @@ -635,13 +633,13 @@ x509: BwICMIGeDIGbVGhpcyBDZXJ0aWZpY2F0ZSBtYXkgb25seSBiZSByZWxpZWQgdXBv biBieSBSZWx5aW5nIFBhcnRpZXMgYW5kIG9ubHkgaW4gYWNjb3JkYW5jZSB3aXRo IHRoZSBDZXJ0aWZpY2F0ZSBQb2xpY3kgZm91bmQgYXQgaHR0cHM6Ly9sZXRzZW5j - cnlwdC5vcmcvcmVwb3NpdG9yeS8wDQYJKoZIhvcNAQELBQADggEBACf98VHSibrK - RUGy6K6uE5QkoQb7OL2beHiHlGNmNVSEib6epbrI+ETGdz0XTuz/RCHJs3XEHgXW - SzfwJPRcD46TVPZDs6e+T9YDW4Z3eVevrXp0QWWGxASj1ZhvquMdpzwfT+TFd78q - nb4PR3uKsIaChwOHSEmd/jcN6A0Ca/GdgWDjp7j2ID/yHvgEhfchMDZYylgsCFpW - wn7Qvzq2dQwOUpKQ8umlfjbc1b6JUGtixxy077cocB1Kbc9OADJ43sRD54yKX6CS - Aobq7ktjxUBLw8XIkH2PufNaJl1Xrqh1dOWK1o7FJ59oT/+WsWAu4rjflJzI8ih9 - odX5GN4b34w= + cnlwdC5vcmcvcmVwb3NpdG9yeS8wDQYJKoZIhvcNAQELBQADggEBACtp8JUhWwj9 + /VYiHiXVEpk/4JWHEVFzMPwDvsstlSNHuwX4ZawRDvrKWEL5d66R2R6X0GZbk8IL + wBFN/1OTfGZ7Ykthd+jEIJwC+9xazTdWBt4PXtCS37K/6i2EgUgiOcxw/odD/R/5 + uZs/oLSwqI5snMWlwvEXZaM7JzAc+2O1UPFkf238ta0J2hRTjKGNkTVjtlwXyb/d + 0uICbQHbx46ewBAkKQxz5Oguf16GTeTHD8yL6fE2ce5ArnvOMq3PnYyVGe4amKy4 + 1pXTu391kuXRba3lrV5gez2YUDP4xbWsHzs5uKDpIUHm7bWCmrIhAaJRpnhMNVtE + /pdP8PNVarc= -----END CERTIFICATE----- -----BEGIN CERTIFICATE----- MIIEkjCCA3qgAwIBAgIQCgFBQgAAAVOFc2oLheynCDANBgkqhkiG9w0BAQsFADA/ diff --git a/hiera/cat.yaml b/hiera/cat.yaml index a7def58..06de7f1 100644 --- a/hiera/cat.yaml +++ b/hiera/cat.yaml @@ -95,8 +95,6 @@ mynetworks: - "199.119.112.223" - "204.13.164.171" - "37.218.240.50" - - "37.218.240.86" - - "37.218.240.87" - "37.218.242.145" - "37.218.242.146" - "37.218.242.147" diff --git a/hiera/leech.yaml b/hiera/leech.yaml index 83a0491..869fa17 100644 --- a/hiera/leech.yaml +++ b/hiera/leech.yaml @@ -570,10 +570,10 @@ x509: commercial_ca_cert: ~ commercial_cert: | -----BEGIN CERTIFICATE----- - MIIGBDCCBOygAwIBAgISA4c52n7fEOGJjswDqZD7ZryFMA0GCSqGSIb3DQEBCwUA + MIIGBDCCBOygAwIBAgISAyzXn7KKXWbHCKr2Dc0y7QjfMA0GCSqGSIb3DQEBCwUA MEoxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MSMwIQYDVQQD - ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMzAeFw0xNjA4MzEyMDE2MDBaFw0x - NjExMjkyMDE2MDBaMBsxGTAXBgNVBAMTEGRlbW8uYml0bWFzay5uZXQwggIiMA0G + ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMzAeFw0xNjEwMDQxNzI5MDBaFw0x + NzAxMDIxNzI5MDBaMBsxGTAXBgNVBAMTEGRlbW8uYml0bWFzay5uZXQwggIiMA0G CSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCtPNOYXF7Gse1oYyj7CKkEEO9Br/3a qpfxscTwzgDlufrfGOfLFVQrE6YlcZOJw2ADB1RE/b4vOYKvQ/HpbzdnfSZpJtAT ngEHQIwmvHIdHmpxFHChyUwbdVtxH4Zb539JF2CyYsw9kp81uocFpduLxANwMhfV @@ -596,13 +596,13 @@ x509: BwICMIGeDIGbVGhpcyBDZXJ0aWZpY2F0ZSBtYXkgb25seSBiZSByZWxpZWQgdXBv biBieSBSZWx5aW5nIFBhcnRpZXMgYW5kIG9ubHkgaW4gYWNjb3JkYW5jZSB3aXRo IHRoZSBDZXJ0aWZpY2F0ZSBQb2xpY3kgZm91bmQgYXQgaHR0cHM6Ly9sZXRzZW5j - cnlwdC5vcmcvcmVwb3NpdG9yeS8wDQYJKoZIhvcNAQELBQADggEBAHtHGId40wTs - 4jX/DibaasJVQ7f89QZWzFH/+9oXYJGW7fFRtxkyD5yUpQR13Z95JYEXe3Grs4Gq - Jt1QY5SBDui8uYI3h940d/VDw66W6A87NEZam4Vhdcx6m92LzSdQySxY2/9zZqzr - ZXs65CiNnDtjk44H5/io4hogsL2p/ZnRZrS/hrXywwa/01V9I5NhQUF30n6Ch426 - gLbvIlFdzdO92kKvNsU/vh+JnHFxDh16TQMJbyC7LKraqM0wy8DhkUKEaWMjM65K - 0PrjQmPCEL9CbgcSNEAehs00asnEidVqVJqJwYeYvT+oi+H+1SY7RT7/rl5y5K+d - 5FoZS43x9VA= + cnlwdC5vcmcvcmVwb3NpdG9yeS8wDQYJKoZIhvcNAQELBQADggEBAEpxGHLGeTe+ + 3f8nAis4koH8kcG1InN5PytuTl8zG2U14eyyleOrtbP0M9IxXl7RNtUQ4ZVBw56u + 9B6vM1CvzDqnYWoFsaJgwIwpDa9BPgoe7Lf0N5mZsnqruAkcMQprCSlYVfa08T0a + J9bSxKdMq+QRqOOGh46rfmN/fEWwIIP0chS/Ty3D9vf77/XbhTEbBPauU+yPwK0J + 5a0eYY56E3j8rI+kLZkVcBlvgTouJqiYe6F+vhWZwQVkUCpnQ7wZTlxhp5z3Jn2v + GFY8VKBGUvJW9Oi+2glDYgpvbZZdsmKlTOzU9+yNOndqMR73yGP8CcXd5GXAKADb + HAFVpwKHYXI= -----END CERTIFICATE----- -----BEGIN CERTIFICATE----- MIIEkjCCA3qgAwIBAgIQCgFBQgAAAVOFc2oLheynCDANBgkqhkiG9w0BAQsFADA/ diff --git a/hiera/snail.yaml b/hiera/snail.yaml index 733cb4f..339e503 100644 --- a/hiera/snail.yaml +++ b/hiera/snail.yaml @@ -102,8 +102,6 @@ mynetworks: - "199.119.112.223" - "204.13.164.171" - "37.218.240.50" - - "37.218.240.86" - - "37.218.240.87" - "37.218.242.145" - "37.218.242.146" - "37.218.242.147" -- cgit v1.2.3