Merge branch 'master' of code.leap.se:bitmask

4 files changed, 40 insertions, 40 deletions

diff --git a/files/cert/cdev.bitmask.net.crt b/files/cert/cdev.bitmask.net.crt
index 2cfb660..5f84c77 100644
--- a/files/cert/cdev.bitmask.net.crt
+++ b/files/cert/cdev.bitmask.net.crt
@@ -1,8 +1,8 @@
 -----BEGIN CERTIFICATE-----
-MIIGAzCCBOugAwIBAgISA7dP48A8+v7gqalkjFUxkc6PMA0GCSqGSIb3DQEBCwUA
+MIIGAzCCBOugAwIBAgISA/djPqoqFpoKaCNI9DYpNXaoMA0GCSqGSIb3DQEBCwUA
 MEoxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MSMwIQYDVQQD
-ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMzAeFw0xNzA2MjcwODE5MDBaFw0x
-NzA5MjUwODE5MDBaMBsxGTAXBgNVBAMTEGNkZXYuYml0bWFzay5uZXQwggIiMA0G
+ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMzAeFw0xNzA3MTgxNTAzMDBaFw0x
+NzEwMTYxNTAzMDBaMBsxGTAXBgNVBAMTEGNkZXYuYml0bWFzay5uZXQwggIiMA0G
 CSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDOSQHWGCuXnCz/MykBAugtPJUNu855
 SPLEmKkKjg7mIsAPKWh9hXXXBi8PsE8GTQcFsjdv86nzLnfDYr0f7+PV8Fs4WxE+
 hN8T8derrYM90Fbers9gmzIQORYE+iyXnuPSiGk5XBNTugDvr+fYMfvPf5b092SE
@@ -25,13 +25,13 @@ CCsGAQUFBwIBFhpodHRwOi8vY3BzLmxldHNlbmNyeXB0Lm9yZzCBqwYIKwYBBQUH
 AgIwgZ4MgZtUaGlzIENlcnRpZmljYXRlIG1heSBvbmx5IGJlIHJlbGllZCB1cG9u
 IGJ5IFJlbHlpbmcgUGFydGllcyBhbmQgb25seSBpbiBhY2NvcmRhbmNlIHdpdGgg
 dGhlIENlcnRpZmljYXRlIFBvbGljeSBmb3VuZCBhdCBodHRwczovL2xldHNlbmNy
-eXB0Lm9yZy9yZXBvc2l0b3J5LzANBgkqhkiG9w0BAQsFAAOCAQEAfYFqgHNvcrg3
-rBap+xTenkqlZl4WJNH2r4Zxy/JadjXpuRQL6gsa4qviJEkqOUYFwwCtFXhcfpwc
-7xXgXTvaSIuXjPPid4QyX8V1srEWO+onv9qKYGISYt8+4GPXbPuha7/4HW0cz2OX
-GDSWfgh0g30/29xmj/9YCcyBaTKBIg26SGfL7IbNtUeK5loM10KZafwnyWpcUeQD
-PTw01J/uq6OIg6OcITPjFSjY4LpDex9pHRjRJm9tZQf6oMybt1pB5DU5NxRhWQj7
-lvShx6jTkaHCAVQEtZ/lD9CsnNuyiHMewMeM51IgOtHxWeXhd3UbaeADx2ihRd1R
-iM2+7rfY1A==
+eXB0Lm9yZy9yZXBvc2l0b3J5LzANBgkqhkiG9w0BAQsFAAOCAQEAT2F7qSf81CqV
+9EOJGabCU/eAUbhJ0Lm97X+r9q9PRGgk3v0vTaUcUFFJhwW2F0v0KenVfHqWiios
+xkQXaeZY38lfcVWqffZSBKdG2xCWRT6lY+5QHLW4gC62qdcev3jmNOAiimMuChR6
+mDHbZZLeO6zhVZNFC2FZ2wWHN/6AjksCI350UtUq9xAiHcRzqTVUiLCuA4hMnueq
+Yuqaw0Iv46vTFREnTQcGQQibF9X6Kc6UsZe/GpqHmLKIEclSGb2ytf8i++dSsRxT
+Z0R9vTPCrWNYVvvLK8Z4WAojL6gl9T6vUz/n/oYAaVScDK3i+gAxilU3wDXSkdLw
+8JNUC/OaCQ==
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
 MIIEkjCCA3qgAwIBAgIQCgFBQgAAAVOFc2oLheynCDANBgkqhkiG9w0BAQsFADA/
diff --git a/files/cert/demo.bitmask.net.crt b/files/cert/demo.bitmask.net.crt
index df44fbc..d8ca3a1 100644
--- a/files/cert/demo.bitmask.net.crt
+++ b/files/cert/demo.bitmask.net.crt
@@ -1,8 +1,8 @@
 -----BEGIN CERTIFICATE-----
-MIIGAzCCBOugAwIBAgISA5apx4RyPpIkOe9UFSRp3cpzMA0GCSqGSIb3DQEBCwUA
+MIIGAzCCBOugAwIBAgISBHSsbKhqLSZMG1V0+GvByImiMA0GCSqGSIb3DQEBCwUA
 MEoxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MSMwIQYDVQQD
-ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMzAeFw0xNzA2MjcwODE5MDBaFw0x
-NzA5MjUwODE5MDBaMBsxGTAXBgNVBAMTEGRlbW8uYml0bWFzay5uZXQwggIiMA0G
+ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMzAeFw0xNzA3MjQxNjI1MDBaFw0x
+NzEwMjIxNjI1MDBaMBsxGTAXBgNVBAMTEGRlbW8uYml0bWFzay5uZXQwggIiMA0G
 CSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCtPNOYXF7Gse1oYyj7CKkEEO9Br/3a
 qpfxscTwzgDlufrfGOfLFVQrE6YlcZOJw2ADB1RE/b4vOYKvQ/HpbzdnfSZpJtAT
 ngEHQIwmvHIdHmpxFHChyUwbdVtxH4Zb539JF2CyYsw9kp81uocFpduLxANwMhfV
@@ -25,13 +25,13 @@ CCsGAQUFBwIBFhpodHRwOi8vY3BzLmxldHNlbmNyeXB0Lm9yZzCBqwYIKwYBBQUH
 AgIwgZ4MgZtUaGlzIENlcnRpZmljYXRlIG1heSBvbmx5IGJlIHJlbGllZCB1cG9u
 IGJ5IFJlbHlpbmcgUGFydGllcyBhbmQgb25seSBpbiBhY2NvcmRhbmNlIHdpdGgg
 dGhlIENlcnRpZmljYXRlIFBvbGljeSBmb3VuZCBhdCBodHRwczovL2xldHNlbmNy
-eXB0Lm9yZy9yZXBvc2l0b3J5LzANBgkqhkiG9w0BAQsFAAOCAQEAY5Y1UDTmtByI
-ETSr+5LxnrgLDmaQFX6QWHcomleHZo6gLn26Uu3t9OWE/bU/I17JQPxBUAlGZGyL
-iIXSEBC85uRyJbjvg2kpejYl387gxSi4loQGiVJfs4LxJhx3P9nY3/qo8spGB5BD
-e8wF7sti4klNQOvyke6PoXLoA4i9eFZnnz+IqtjDdOoMV/PqLNLi01F1jNx+MYJU
-1iBe096a/2xJZOX2CCOLRC28vZatXinTiE7+J2yqoTyBi6x9Z9DQi5RdHXUcthkE
-oR1wJSnmaWMKb4woNCH4mLDn7kMQDFNzQwORAIXEzLS8hOFbl3MYHYMXswp9Me9w
-VaTIrkjPhw==
+eXB0Lm9yZy9yZXBvc2l0b3J5LzANBgkqhkiG9w0BAQsFAAOCAQEAkiNI+l7FSKBa
+1kqY6yc3NEyUY5z4qTVB5Y0pv8NjWL59luoTeaaYPgW1vIQOPD27TQdUzrsbErw/
+BnZ+Wz8UnuG0DWfMsmamvYXss/6btPeZ+6Wmfhrw1Fj7YxqSbBpNrzXbYSLK/FpR
+U+0yItRHWMggGg9Hn8IW2sWOOfd2OWrqDib0w1i+SbpVfe3aWPxVON4Y/rJQ4RyW
+CBSo0hHBoUSu1Dm1zzLEmZw6uo9e76m9iUAx4/H13kg5zsvhGQmcOvGSXQ3x5XfO
+vHG7a3yiQD2+f9sq24hoMV/GGiCgdPZkkWqnQ+JE9aLKU/x737OnR51+vxJcuQS+
+3Qzko/fTtA==
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
 MIIEkjCCA3qgAwIBAgIQCgFBQgAAAVOFc2oLheynCDANBgkqhkiG9w0BAQsFADA/
diff --git a/hiera/leech.yaml b/hiera/leech.yaml
index 9809378..68e6d12 100644
--- a/hiera/leech.yaml
+++ b/hiera/leech.yaml
@@ -560,10 +560,10 @@ x509:
   commercial_ca_cert: ~
   commercial_cert: |
       -----BEGIN CERTIFICATE-----
-      MIIGAzCCBOugAwIBAgISA5apx4RyPpIkOe9UFSRp3cpzMA0GCSqGSIb3DQEBCwUA
+      MIIGAzCCBOugAwIBAgISBHSsbKhqLSZMG1V0+GvByImiMA0GCSqGSIb3DQEBCwUA
       MEoxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MSMwIQYDVQQD
-      ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMzAeFw0xNzA2MjcwODE5MDBaFw0x
-      NzA5MjUwODE5MDBaMBsxGTAXBgNVBAMTEGRlbW8uYml0bWFzay5uZXQwggIiMA0G
+      ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMzAeFw0xNzA3MjQxNjI1MDBaFw0x
+      NzEwMjIxNjI1MDBaMBsxGTAXBgNVBAMTEGRlbW8uYml0bWFzay5uZXQwggIiMA0G
       CSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCtPNOYXF7Gse1oYyj7CKkEEO9Br/3a
       qpfxscTwzgDlufrfGOfLFVQrE6YlcZOJw2ADB1RE/b4vOYKvQ/HpbzdnfSZpJtAT
       ngEHQIwmvHIdHmpxFHChyUwbdVtxH4Zb539JF2CyYsw9kp81uocFpduLxANwMhfV
@@ -586,13 +586,13 @@ x509:
       AgIwgZ4MgZtUaGlzIENlcnRpZmljYXRlIG1heSBvbmx5IGJlIHJlbGllZCB1cG9u
       IGJ5IFJlbHlpbmcgUGFydGllcyBhbmQgb25seSBpbiBhY2NvcmRhbmNlIHdpdGgg
       dGhlIENlcnRpZmljYXRlIFBvbGljeSBmb3VuZCBhdCBodHRwczovL2xldHNlbmNy
-      eXB0Lm9yZy9yZXBvc2l0b3J5LzANBgkqhkiG9w0BAQsFAAOCAQEAY5Y1UDTmtByI
-      ETSr+5LxnrgLDmaQFX6QWHcomleHZo6gLn26Uu3t9OWE/bU/I17JQPxBUAlGZGyL
-      iIXSEBC85uRyJbjvg2kpejYl387gxSi4loQGiVJfs4LxJhx3P9nY3/qo8spGB5BD
-      e8wF7sti4klNQOvyke6PoXLoA4i9eFZnnz+IqtjDdOoMV/PqLNLi01F1jNx+MYJU
-      1iBe096a/2xJZOX2CCOLRC28vZatXinTiE7+J2yqoTyBi6x9Z9DQi5RdHXUcthkE
-      oR1wJSnmaWMKb4woNCH4mLDn7kMQDFNzQwORAIXEzLS8hOFbl3MYHYMXswp9Me9w
-      VaTIrkjPhw==
+      eXB0Lm9yZy9yZXBvc2l0b3J5LzANBgkqhkiG9w0BAQsFAAOCAQEAkiNI+l7FSKBa
+      1kqY6yc3NEyUY5z4qTVB5Y0pv8NjWL59luoTeaaYPgW1vIQOPD27TQdUzrsbErw/
+      BnZ+Wz8UnuG0DWfMsmamvYXss/6btPeZ+6Wmfhrw1Fj7YxqSbBpNrzXbYSLK/FpR
+      U+0yItRHWMggGg9Hn8IW2sWOOfd2OWrqDib0w1i+SbpVfe3aWPxVON4Y/rJQ4RyW
+      CBSo0hHBoUSu1Dm1zzLEmZw6uo9e76m9iUAx4/H13kg5zsvhGQmcOvGSXQ3x5XfO
+      vHG7a3yiQD2+f9sq24hoMV/GGiCgdPZkkWqnQ+JE9aLKU/x737OnR51+vxJcuQS+
+      3Qzko/fTtA==
       -----END CERTIFICATE-----
       -----BEGIN CERTIFICATE-----
       MIIEkjCCA3qgAwIBAgIQCgFBQgAAAVOFc2oLheynCDANBgkqhkiG9w0BAQsFADA/
diff --git a/hiera/lynx.yaml b/hiera/lynx.yaml
index db6a491..34de089 100644
--- a/hiera/lynx.yaml
+++ b/hiera/lynx.yaml
@@ -575,10 +575,10 @@ x509:
   commercial_ca_cert: ~
   commercial_cert: |
       -----BEGIN CERTIFICATE-----
-      MIIGAzCCBOugAwIBAgISA7dP48A8+v7gqalkjFUxkc6PMA0GCSqGSIb3DQEBCwUA
+      MIIGAzCCBOugAwIBAgISA/djPqoqFpoKaCNI9DYpNXaoMA0GCSqGSIb3DQEBCwUA
       MEoxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MSMwIQYDVQQD
-      ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMzAeFw0xNzA2MjcwODE5MDBaFw0x
-      NzA5MjUwODE5MDBaMBsxGTAXBgNVBAMTEGNkZXYuYml0bWFzay5uZXQwggIiMA0G
+      ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMzAeFw0xNzA3MTgxNTAzMDBaFw0x
+      NzEwMTYxNTAzMDBaMBsxGTAXBgNVBAMTEGNkZXYuYml0bWFzay5uZXQwggIiMA0G
       CSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDOSQHWGCuXnCz/MykBAugtPJUNu855
       SPLEmKkKjg7mIsAPKWh9hXXXBi8PsE8GTQcFsjdv86nzLnfDYr0f7+PV8Fs4WxE+
       hN8T8derrYM90Fbers9gmzIQORYE+iyXnuPSiGk5XBNTugDvr+fYMfvPf5b092SE
@@ -601,13 +601,13 @@ x509:
       AgIwgZ4MgZtUaGlzIENlcnRpZmljYXRlIG1heSBvbmx5IGJlIHJlbGllZCB1cG9u
       IGJ5IFJlbHlpbmcgUGFydGllcyBhbmQgb25seSBpbiBhY2NvcmRhbmNlIHdpdGgg
       dGhlIENlcnRpZmljYXRlIFBvbGljeSBmb3VuZCBhdCBodHRwczovL2xldHNlbmNy
-      eXB0Lm9yZy9yZXBvc2l0b3J5LzANBgkqhkiG9w0BAQsFAAOCAQEAfYFqgHNvcrg3
-      rBap+xTenkqlZl4WJNH2r4Zxy/JadjXpuRQL6gsa4qviJEkqOUYFwwCtFXhcfpwc
-      7xXgXTvaSIuXjPPid4QyX8V1srEWO+onv9qKYGISYt8+4GPXbPuha7/4HW0cz2OX
-      GDSWfgh0g30/29xmj/9YCcyBaTKBIg26SGfL7IbNtUeK5loM10KZafwnyWpcUeQD
-      PTw01J/uq6OIg6OcITPjFSjY4LpDex9pHRjRJm9tZQf6oMybt1pB5DU5NxRhWQj7
-      lvShx6jTkaHCAVQEtZ/lD9CsnNuyiHMewMeM51IgOtHxWeXhd3UbaeADx2ihRd1R
-      iM2+7rfY1A==
+      eXB0Lm9yZy9yZXBvc2l0b3J5LzANBgkqhkiG9w0BAQsFAAOCAQEAT2F7qSf81CqV
+      9EOJGabCU/eAUbhJ0Lm97X+r9q9PRGgk3v0vTaUcUFFJhwW2F0v0KenVfHqWiios
+      xkQXaeZY38lfcVWqffZSBKdG2xCWRT6lY+5QHLW4gC62qdcev3jmNOAiimMuChR6
+      mDHbZZLeO6zhVZNFC2FZ2wWHN/6AjksCI350UtUq9xAiHcRzqTVUiLCuA4hMnueq
+      Yuqaw0Iv46vTFREnTQcGQQibF9X6Kc6UsZe/GpqHmLKIEclSGb2ytf8i++dSsRxT
+      Z0R9vTPCrWNYVvvLK8Z4WAojL6gl9T6vUz/n/oYAaVScDK3i+gAxilU3wDXSkdLw
+      8JNUC/OaCQ==
       -----END CERTIFICATE-----
       -----BEGIN CERTIFICATE-----
       MIIEkjCCA3qgAwIBAgIQCgFBQgAAAVOFc2oLheynCDANBgkqhkiG9w0BAQsFADA/