replace bugs-master.d.o SSL certificate

Signed-off-by: Julien Cristau <jcristau@debian.org>

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 6f39975..4683023 100644 (file)
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -45,6 +45,7 @@ class roles {
        if has_role('bugs_master') {
                ssl::service { 'bugs-master.debian.org':
                        notify => Service['apache2'],
+                       key => true,
                }
        }
 

diff --git a/modules/ssl/files/servicecerts/bugs-master.debian.org.crt b/modules/ssl/files/servicecerts/bugs-master.debian.org.crt
deleted file mode 100644 (file)
index af3b7f9..0000000
--- a/modules/ssl/files/servicecerts/bugs-master.debian.org.crt
+++ /dev/null
@@ -1,118 +0,0 @@
-Certificate:
-    Data:
-        Version: 3 (0x2)
-        Serial Number:
-            62:17:4b:2b:df:af:af:a1:21:b6:4f:3a:6d:b6:e2:2e
-    Signature Algorithm: sha256WithRSAEncryption
-        Issuer: C=FR, ST=Paris, L=Paris, O=Gandi, CN=Gandi Standard SSL CA 2
-        Validity
-            Not Before: Dec 20 00:00:00 2014 GMT
-            Not After : Apr  2 23:59:59 2016 GMT
-        Subject: OU=Domain Control Validated, OU=Gandi Standard SSL, CN=bugs-master.debian.org
-        Subject Public Key Info:
-            Public Key Algorithm: rsaEncryption
-                Public-Key: (3072 bit)
-                Modulus:
-                    00:d8:01:a7:ff:eb:85:59:62:de:55:35:d4:f5:d9:
-                    d9:b4:b7:93:53:3f:76:b1:c5:b1:c6:c1:c5:e4:1b:
-                    4e:ab:41:03:98:09:72:08:66:c1:b7:ce:7a:da:2f:
-                    75:53:1e:da:db:d3:ad:1d:ff:28:a7:58:ad:57:f0:
-                    f7:90:a7:ff:a1:0d:ce:5e:23:ae:96:b5:8f:27:56:
-                    7b:72:67:2b:7c:ab:c2:39:14:9a:2c:42:c0:ab:7b:
-                    46:fb:f6:bf:7a:73:db:ba:7c:44:62:52:72:90:fd:
-                    d8:b6:ce:ea:e8:8c:b8:78:f7:e0:32:c5:b9:e1:1f:
-                    c5:84:eb:c3:3f:b5:39:ea:cb:7e:33:35:11:f8:b2:
-                    dc:59:4a:d3:d2:a4:78:c0:10:26:33:a4:f2:3b:e0:
-                    53:ca:ee:91:60:22:63:84:85:16:92:f3:91:3b:77:
-                    e7:c7:57:5d:b7:d7:61:f2:00:f9:66:53:92:80:d2:
-                    3f:cf:c4:c8:72:06:bf:60:1e:74:c2:de:21:ca:09:
-                    0a:42:7a:3c:44:d6:e7:6d:40:ba:f7:1c:1a:ce:53:
-                    5c:bf:ad:2c:d2:14:dc:61:aa:7e:46:30:ce:59:82:
-                    f2:f6:64:7a:a7:a9:4d:80:3d:5e:e9:c3:27:88:22:
-                    4d:81:58:af:76:35:1e:63:1d:e5:60:bf:e9:b1:d7:
-                    ea:86:6b:9a:ab:e6:1e:1f:38:f3:0c:ae:f1:1f:66:
-                    5a:fa:22:21:0a:1b:e1:c3:35:b1:9c:a6:2f:ba:5b:
-                    a7:f8:4b:fa:2e:0b:08:bf:0e:2f:ae:f7:b0:c5:6e:
-                    32:72:ee:66:60:9f:99:8e:1a:cd:dc:c2:ce:19:15:
-                    ab:94:b6:c2:b2:7b:b4:a9:12:3e:aa:a4:45:49:d2:
-                    f3:8c:3c:c8:d2:84:74:27:3e:c0:41:18:95:ef:b2:
-                    97:27:2e:d7:03:db:6c:fb:03:4a:8c:14:44:90:9a:
-                    9b:e4:ee:ac:4c:90:e7:9a:1f:b2:35:c7:59:18:c1:
-                    29:61:6e:b1:39:d2:bf:03:b7:b1
-                Exponent: 65537 (0x10001)
-        X509v3 extensions:
-            X509v3 Authority Key Identifier: 
-                keyid:B3:90:A7:D8:C9:AF:4E:CD:61:3C:9F:7C:AD:5D:7F:41:FD:69:30:EA
-
-            X509v3 Subject Key Identifier: 
-                09:1A:78:0C:6A:7D:BD:55:05:11:87:87:C8:13:2A:C2:76:E3:69:DC
-            X509v3 Key Usage: critical
-                Digital Signature, Key Encipherment
-            X509v3 Basic Constraints: critical
-                CA:FALSE
-            X509v3 Extended Key Usage: 
-                TLS Web Server Authentication, TLS Web Client Authentication
-            X509v3 Certificate Policies: 
-                Policy: 1.3.6.1.4.1.6449.1.2.2.26
-                  CPS: https://cps.usertrust.com
-                Policy: 2.23.140.1.2.1
-
-            X509v3 CRL Distribution Points: 
-
-                Full Name:
-                  URI:http://crl.usertrust.com/GandiStandardSSLCA2.crl
-
-            Authority Information Access: 
-                CA Issuers - URI:http://crt.usertrust.com/GandiStandardSSLCA2.crt
-                OCSP - URI:http://ocsp.usertrust.com
-
-            X509v3 Subject Alternative Name: 
-                DNS:bugs-master.debian.org, DNS:www.bugs-master.debian.org
-    Signature Algorithm: sha256WithRSAEncryption
-         6f:01:65:c8:2d:2d:eb:06:e2:5c:57:a2:b2:02:9c:9b:28:42:
-         ba:60:c5:10:69:58:79:1b:6d:11:62:59:c0:a1:99:0b:74:c8:
-         b0:e9:20:3c:b4:e5:1b:c6:0f:f0:c7:bf:23:8c:f7:52:9f:cd:
-         56:10:ab:09:b8:73:7e:0a:22:bb:b9:e3:8a:53:be:27:96:72:
-         4a:8c:6a:95:15:bb:46:37:b8:6d:ad:13:ab:e9:f0:e9:54:05:
-         f3:c3:14:51:e9:b4:f1:64:de:34:1f:33:b5:3f:8f:3d:32:fa:
-         33:d7:e6:2e:2f:ec:82:db:df:a7:02:41:ab:f8:cc:10:9c:75:
-         b0:1c:60:67:61:fa:cf:e3:43:8d:35:93:ed:26:cb:8a:15:b5:
-         5a:bc:1f:86:40:e4:1f:4b:c4:91:9d:2b:d1:fb:b0:1a:55:11:
-         e3:94:fd:4a:0d:83:08:02:84:49:17:3a:c5:af:63:14:19:82:
-         42:12:33:7e:3d:52:14:82:fd:62:ff:6e:0c:32:4d:31:d5:41:
-         b8:8f:03:c5:d1:2f:b2:4f:e9:4f:55:66:4b:9d:84:1f:5f:36:
-         d8:7a:6e:a9:50:09:9a:b6:67:60:d0:04:b7:9f:3b:37:69:6e:
-         19:ac:55:3c:bb:c9:64:ac:a5:4e:31:65:da:96:c4:85:e4:2b:
-         1e:0b:88:47
------BEGIN CERTIFICATE-----
-MIIFkTCCBHmgAwIBAgIQYhdLK9+vr6Ehtk86bbbiLjANBgkqhkiG9w0BAQsFADBf
-MQswCQYDVQQGEwJGUjEOMAwGA1UECBMFUGFyaXMxDjAMBgNVBAcTBVBhcmlzMQ4w
-DAYDVQQKEwVHYW5kaTEgMB4GA1UEAxMXR2FuZGkgU3RhbmRhcmQgU1NMIENBIDIw
-HhcNMTQxMjIwMDAwMDAwWhcNMTYwNDAyMjM1OTU5WjBhMSEwHwYDVQQLExhEb21h
-aW4gQ29udHJvbCBWYWxpZGF0ZWQxGzAZBgNVBAsTEkdhbmRpIFN0YW5kYXJkIFNT
-TDEfMB0GA1UEAxMWYnVncy1tYXN0ZXIuZGViaWFuLm9yZzCCAaIwDQYJKoZIhvcN
-AQEBBQADggGPADCCAYoCggGBANgBp//rhVli3lU11PXZ2bS3k1M/drHFscbBxeQb
-TqtBA5gJcghmwbfOetovdVMe2tvTrR3/KKdYrVfw95Cn/6ENzl4jrpa1jydWe3Jn
-K3yrwjkUmixCwKt7Rvv2v3pz27p8RGJScpD92LbO6uiMuHj34DLFueEfxYTrwz+1
-OerLfjM1Efiy3FlK09KkeMAQJjOk8jvgU8rukWAiY4SFFpLzkTt358dXXbfXYfIA
-+WZTkoDSP8/EyHIGv2AedMLeIcoJCkJ6PETW521AuvccGs5TXL+tLNIU3GGqfkYw
-zlmC8vZkeqepTYA9XunDJ4giTYFYr3Y1HmMd5WC/6bHX6oZrmqvmHh848wyu8R9m
-WvoiIQob4cM1sZymL7pbp/hL+i4LCL8OL673sMVuMnLuZmCfmY4azdzCzhkVq5S2
-wrJ7tKkSPqqkRUnS84w8yNKEdCc+wEEYle+ylycu1wPbbPsDSowURJCam+TurEyQ
-55ofsjXHWRjBKWFusTnSvwO3sQIDAQABo4IBxTCCAcEwHwYDVR0jBBgwFoAUs5Cn
-2MmvTs1hPJ98rV1/Qf1pMOowHQYDVR0OBBYEFAkaeAxqfb1VBRGHh8gTKsJ242nc
-MA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUF
-BwMBBggrBgEFBQcDAjBLBgNVHSAERDBCMDYGCysGAQQBsjEBAgIaMCcwJQYIKwYB
-BQUHAgEWGWh0dHBzOi8vY3BzLnVzZXJ0cnVzdC5jb20wCAYGZ4EMAQIBMEEGA1Ud
-HwQ6MDgwNqA0oDKGMGh0dHA6Ly9jcmwudXNlcnRydXN0LmNvbS9HYW5kaVN0YW5k
-YXJkU1NMQ0EyLmNybDBzBggrBgEFBQcBAQRnMGUwPAYIKwYBBQUHMAKGMGh0dHA6
-Ly9jcnQudXNlcnRydXN0LmNvbS9HYW5kaVN0YW5kYXJkU1NMQ0EyLmNydDAlBggr
-BgEFBQcwAYYZaHR0cDovL29jc3AudXNlcnRydXN0LmNvbTA9BgNVHREENjA0ghZi
-dWdzLW1hc3Rlci5kZWJpYW4ub3Jnghp3d3cuYnVncy1tYXN0ZXIuZGViaWFuLm9y
-ZzANBgkqhkiG9w0BAQsFAAOCAQEAbwFlyC0t6wbiXFeisgKcmyhCumDFEGlYeRtt
-EWJZwKGZC3TIsOkgPLTlG8YP8Me/I4z3Up/NVhCrCbhzfgoiu7njilO+J5ZySoxq
-lRW7Rje4ba0Tq+nw6VQF88MUUem08WTeNB8ztT+PPTL6M9fmLi/sgtvfpwJBq/jM
-EJx1sBxgZ2H6z+NDjTWT7SbLihW1WrwfhkDkH0vEkZ0r0fuwGlUR45T9Sg2DCAKE
-SRc6xa9jFBmCQhIzfj1SFIL9Yv9uDDJNMdVBuI8DxdEvsk/pT1VmS52EH1822Hpu
-qVAJmrZnYNAEt587N2luGaxVPLvJZKylTjFl2pbEheQrHguIRw==
------END CERTIFICATE-----