From da54f9a4c02908cd694c5b2dff7bf2a2b3987578 Mon Sep 17 00:00:00 2001
From: kwadronaut <kwadronaut@leap.se>
Date: Fri, 23 Jun 2017 12:07:23 +0200
Subject: update x509 bitmask.net

---
 hiera/diplocaulus.yaml | 41 ++++++++++++++++++++++-------------------
 1 file changed, 22 insertions(+), 19 deletions(-)

(limited to 'hiera/diplocaulus.yaml')

diff --git a/hiera/diplocaulus.yaml b/hiera/diplocaulus.yaml
index ce58d3e..07fafff 100644
--- a/hiera/diplocaulus.yaml
+++ b/hiera/diplocaulus.yaml
@@ -61,7 +61,7 @@ sources:
   platform: 
     apt: 
       basic: "http://deb.leap.se/platform"
-      component: snapshots
+      component: master
   soledad: 
     package: soledad-server
     revision: latest
@@ -106,6 +106,9 @@ ssh:
       key: AAAAB3NzaC1yc2EAAAADAQABAAABAQDU6cVvh+1LYRYNff17s06E2ZBN5M5VEMYP15JNvM05ARNF7UuLuq0o9CrVRxFIknGBHOB2mtf0Tnc2opbJiq3fOJ/YKv2DBLcm+mrJvJC8gqi1JP76bUEETfuwkB2RHbzvJtDRo991IQcLaKpPjXQ4DBSdKgo4cldQVcpRFGmy3S7IsUjUmvfY/StyHc8bux2yjBDyzUdEA7MiXl7Vu6HA6xD5B+QYO71QVyfl2cYaJ10cxrVE1lJaqLjku8UoaKP1FU4PiLY2or2J1sQEvuhkxoIvYUPpIqEmH43ZeFLxTBMUv2leJs8BmKygzcW35jzZcsK5t23hp40gU7DOX8A1
       type: ssh-rsa
     micah: 
+      key: AAAAC3NzaC1lZDI1NTE5AAAAIFWPWdMWtDKPbcQBQnOytGcOX0Qt97yJuObDY9gI/22W
+      type: ssh-ed25519
+    micah2: 
       key: AAAAB3NzaC1yc2EAAAADAQABAAACAQC5xvAs8c8KmJ/Lt2TiYthxOVEgUkprbLWVOwK1Hmc+3h6rV4iyT//8dv8Ov79ZMOAuqQhQ5fz7RckOTqoexW/kzbFhXw5NEt+eqHonayiAh8LVt2K79GbMtWmS2ss81ivDyQkaW3+PK5IDibsoOfNeuAZ17Hgudatjc4v7WEjVliYBwPLAA5DUZt8wf7nNQX3moHGE8A+d3S0UDQyEmT657D1p8jmrpg9qTL7nuvjZTq7v/mVErnIDUY83FGdrT1F+gPlCLetzSDeaNkYFm+RjVixF2pZKT+BsHkj/8nTJw7NBh/BTG34pSyuCmepwBBwPEISkfMAEA9Ag+TXq+Oe53GmmBa92asusM7XzyPTxUcvnUAp4kxn5i+65dDx4F2//cVe7+CNCdl8N5p88Xe3jmsTeEdEXnmXPFOBbvAE0kikDE30FqU06u/pLDy7ZG3JTZZtvvFuKrYokgQysDMLaxlMVMANs9WugJkOlexzOeDDgptPf8f2fQs2Q9Xo0xq1wrtD4kdopgtF1LLEFcUDKp7+nev+czzNWbv6ccZotlicZIqauYnBjjGPYz0sC4OCvZjz7bK7nDsdHoaZBSl1YUhTyLUDH2XH8V1lbEOJhfJSp+vZMJETIe8oP+uByEt01FIt8JsRhijXoKCPfXp59P9d3KS8vuaUsCEVrpkkalQ==
       type: ssh-rsa
     monitor: 
@@ -163,10 +166,10 @@ static:
           -----END CERTIFICATE-----
       cert: |
           -----BEGIN CERTIFICATE-----
-          MIIF+jCCBOKgAwIBAgISA6ztS25e4M1FLJqqHObyohSpMA0GCSqGSIb3DQEBCwUA
+          MIIF+TCCBOGgAwIBAgISAwLBcwHsif3UkIDwU7QoczGvMA0GCSqGSIb3DQEBCwUA
           MEoxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MSMwIQYDVQQD
-          ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMzAeFw0xNzA0MjcxOTM0MDBaFw0x
-          NzA3MjYxOTM0MDBaMBYxFDASBgNVBAMTC2JpdG1hc2submV0MIICIjANBgkqhkiG
+          ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMzAeFw0xNzA2MjMwOTA0MDBaFw0x
+          NzA5MjEwOTA0MDBaMBYxFDASBgNVBAMTC2JpdG1hc2submV0MIICIjANBgkqhkiG
           9w0BAQEFAAOCAg8AMIICCgKCAgEAp7bmYyi5KdLAcnEndZUCVoJw19cZgaDwJb/I
           R1fuHhHkp98J9VPM+vke/8TElLHvdgfNWN1SpCM3uMFtdX6FS2Z4E2MchKp0o7H/
           0CkmEF/ybcNP3MdubTGtutRKkIm8MIqyOZIPNomh9Apwx+HfLi9S+/3hx1UTbelp
@@ -178,23 +181,23 @@ static:
           y1w5Vnlq3mgMY1JrdQB7Y2793v9HbFmp1y5XEsSvVHQ5qth4SrqreAdliGm7vq3+
           fuLfofwcOBr/WzEANRS88S71+hZND9ovRHkQe/IbxuEiE9O8arZfaIUmYB6d7Bq+
           l3Gf26ZIc0Ry9FuD41qXpEpbJzOOmLgq1dtFDWINTw5wddsMfybu/kCQCzK/vNHK
-          fgQNYbkCAwEAAaOCAgwwggIIMA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggr
+          fgQNYbkCAwEAAaOCAgswggIHMA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggr
           BgEFBQcDAQYIKwYBBQUHAwIwDAYDVR0TAQH/BAIwADAdBgNVHQ4EFgQUpEePWFxF
           6YjQYtz5LxqX31AJ/18wHwYDVR0jBBgwFoAUqEpqYwR93brm0Tm3pkVl7/Oo7KEw
-          cAYIKwYBBQUHAQEEZDBiMC8GCCsGAQUFBzABhiNodHRwOi8vb2NzcC5pbnQteDMu
-          bGV0c2VuY3J5cHQub3JnLzAvBggrBgEFBQcwAoYjaHR0cDovL2NlcnQuaW50LXgz
-          LmxldHNlbmNyeXB0Lm9yZy8wFgYDVR0RBA8wDYILYml0bWFzay5uZXQwgf4GA1Ud
-          IASB9jCB8zAIBgZngQwBAgEwgeYGCysGAQQBgt8TAQEBMIHWMCYGCCsGAQUFBwIB
-          FhpodHRwOi8vY3BzLmxldHNlbmNyeXB0Lm9yZzCBqwYIKwYBBQUHAgIwgZ4MgZtU
-          aGlzIENlcnRpZmljYXRlIG1heSBvbmx5IGJlIHJlbGllZCB1cG9uIGJ5IFJlbHlp
-          bmcgUGFydGllcyBhbmQgb25seSBpbiBhY2NvcmRhbmNlIHdpdGggdGhlIENlcnRp
-          ZmljYXRlIFBvbGljeSBmb3VuZCBhdCBodHRwczovL2xldHNlbmNyeXB0Lm9yZy9y
-          ZXBvc2l0b3J5LzANBgkqhkiG9w0BAQsFAAOCAQEAUbF7GeZrf4HASEECSuIZ6odl
-          y9noGuvAsRYIUwavN/aUxYD4iHhfmxE2OFiEl9eYnPrHKNh4h9EnJ7ewVL2Xx8YW
-          vI06E/5GO82NrS1G251xW1ZebkBPKVoSHNzRhlCDgjvqza0y23ik3NCibh6OX+tv
-          uozHfkbLfvZ6m88gZ3J82UrtIAEEr4t3/RCatMY7b0mW17HPJwWogRepF1zyfwZs
-          eVBRrngAcjqQGO8Ytx/RIo771lDjAmQSJF03jHadj/w1vbTB/h/Bm/M2EyRB/fpm
-          RyiXawmrxwvz2ZV+Rpt0pXP3XoT188jREbtn832EfTw6pMcWJuDJL+qk1ZWN2A==
+          bwYIKwYBBQUHAQEEYzBhMC4GCCsGAQUFBzABhiJodHRwOi8vb2NzcC5pbnQteDMu
+          bGV0c2VuY3J5cHQub3JnMC8GCCsGAQUFBzAChiNodHRwOi8vY2VydC5pbnQteDMu
+          bGV0c2VuY3J5cHQub3JnLzAWBgNVHREEDzANggtiaXRtYXNrLm5ldDCB/gYDVR0g
+          BIH2MIHzMAgGBmeBDAECATCB5gYLKwYBBAGC3xMBAQEwgdYwJgYIKwYBBQUHAgEW
+          Gmh0dHA6Ly9jcHMubGV0c2VuY3J5cHQub3JnMIGrBggrBgEFBQcCAjCBngyBm1Ro
+          aXMgQ2VydGlmaWNhdGUgbWF5IG9ubHkgYmUgcmVsaWVkIHVwb24gYnkgUmVseWlu
+          ZyBQYXJ0aWVzIGFuZCBvbmx5IGluIGFjY29yZGFuY2Ugd2l0aCB0aGUgQ2VydGlm
+          aWNhdGUgUG9saWN5IGZvdW5kIGF0IGh0dHBzOi8vbGV0c2VuY3J5cHQub3JnL3Jl
+          cG9zaXRvcnkvMA0GCSqGSIb3DQEBCwUAA4IBAQBqWEPgulqP+zDfaP1BBGsWINl0
+          Zy0nyu8M5H9mGw2NDqnXcjyXNFTzuatlAKH2Ign5egmbIcVQ0J3UrMhB89tISxdu
+          lTKe86dWOOxAZaPFiqCbsMk8o2EPCgPVy24osLl3cQYgb2fgT0nsAHROwt4uf4Ue
+          sOHdCghXSpxU/WxIT/lRJx7Jo+njPPrsDLmdO23xtYeg096HafuSTzc20CwzAdRX
+          0MvzFBYMvbWkqDGa4hRvAxcMxHhsOs6NJNZ2ITDzNbCK0o1ykhcf2T2K6zqzF8Kv
+          sAxdlkuYp92VSvsP3PWDtVd/AvfmiVzj3uw2hfUleDEDAJaXpBaoZBU12xIc
           -----END CERTIFICATE-----
           -----BEGIN CERTIFICATE-----
           MIIEkjCCA3qgAwIBAgIQCgFBQgAAAVOFc2oLheynCDANBgkqhkiG9w0BAQsFADA/
-- 
cgit v1.2.3