Use new experimental-platform deb repo

1 files changed, 8 insertions, 148 deletions

diff --git a/hiera/cat.yaml b/hiera/cat.yaml
index 735bbd1..42030dd 100644
--- a/hiera/cat.yaml
+++ b/hiera/cat.yaml
@@ -101,8 +101,8 @@ mynetworks:
   - "46.165.242.166"
 name: cat
 platform: 
-  major_version: "0.9"
-  version: "0.9"
+  major_version: "0.10"
+  version: "0.10"
 rbls: 
   - zen.spamhaus.org
 service_type: user_service
@@ -123,13 +123,13 @@ sources:
     type: git
   platform: 
     apt: 
-      basic: "http://deb.leap.se/experimental-0.9"
+      basic: "http://deb.leap.se/experimental-platform"
   soledad: 
     package: soledad-server
     revision: latest
     type: apt
   webapp: 
-    revision: origin/version/0.8
+    revision: origin/master
     source: "https://leap.se/git/leap_web"
     type: git
 ssh: 
@@ -354,149 +354,9 @@ x509:
       EKIJGN2AsueRKQCiPJcfo9exxoA2w0WWhwlM8kaVNeYrnMYzguOtagdc2ALqgVSy
       q7GLHLyfshfRK4jbBcR0FqAxIU1g0UyHYxx/sbg0xA6K/W0ViJVxZAfmmAQ=
       -----END RSA PRIVATE KEY-----
-  commercial_ca_cert: |
-      -----BEGIN CERTIFICATE-----
-      MIIEkjCCA3qgAwIBAgIQCgFBQgAAAVOFc2oLheynCDANBgkqhkiG9w0BAQsFADA/
-      MSQwIgYDVQQKExtEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdCBDby4xFzAVBgNVBAMT
-      DkRTVCBSb290IENBIFgzMB4XDTE2MDMxNzE2NDA0NloXDTIxMDMxNzE2NDA0Nlow
-      SjELMAkGA1UEBhMCVVMxFjAUBgNVBAoTDUxldCdzIEVuY3J5cHQxIzAhBgNVBAMT
-      GkxldCdzIEVuY3J5cHQgQXV0aG9yaXR5IFgzMIIBIjANBgkqhkiG9w0BAQEFAAOC
-      AQ8AMIIBCgKCAQEAnNMM8FrlLke3cl03g7NoYzDq1zUmGSXhvb418XCSL7e4S0EF
-      q6meNQhY7LEqxGiHC6PjdeTm86dicbp5gWAf15Gan/PQeGdxyGkOlZHP/uaZ6WA8
-      SMx+yk13EiSdRxta67nsHjcAHJyse6cF6s5K671B5TaYucv9bTyWaN8jKkKQDIZ0
-      Z8h/pZq4UmEUEz9l6YKHy9v6Dlb2honzhT+Xhq+w3Brvaw2VFn3EK6BlspkENnWA
-      a6xK8xuQSXgvopZPKiAlKQTGdMDQMc2PMTiVFrqoM7hD8bEfwzB/onkxEz0tNvjj
-      /PIzark5McWvxI0NHWQWM6r6hCm21AvA2H3DkwIDAQABo4IBfTCCAXkwEgYDVR0T
-      AQH/BAgwBgEB/wIBADAOBgNVHQ8BAf8EBAMCAYYwfwYIKwYBBQUHAQEEczBxMDIG
-      CCsGAQUFBzABhiZodHRwOi8vaXNyZy50cnVzdGlkLm9jc3AuaWRlbnRydXN0LmNv
-      bTA7BggrBgEFBQcwAoYvaHR0cDovL2FwcHMuaWRlbnRydXN0LmNvbS9yb290cy9k
-      c3Ryb290Y2F4My5wN2MwHwYDVR0jBBgwFoAUxKexpHsscfrb4UuQdf/EFWCFiRAw
-      VAYDVR0gBE0wSzAIBgZngQwBAgEwPwYLKwYBBAGC3xMBAQEwMDAuBggrBgEFBQcC
-      ARYiaHR0cDovL2Nwcy5yb290LXgxLmxldHNlbmNyeXB0Lm9yZzA8BgNVHR8ENTAz
-      MDGgL6AthitodHRwOi8vY3JsLmlkZW50cnVzdC5jb20vRFNUUk9PVENBWDNDUkwu
-      Y3JsMB0GA1UdDgQWBBSoSmpjBH3duubRObemRWXv86jsoTANBgkqhkiG9w0BAQsF
-      AAOCAQEA3TPXEfNjWDjdGBX7CVW+dla5cEilaUcne8IkCJLxWh9KEik3JHRRHGJo
-      uM2VcGfl96S8TihRzZvoroed6ti6WqEBmtzw3Wodatg+VyOeph4EYpr/1wXKtx8/
-      wApIvJSwtmVi4MFU5aMqrSDE6ea73Mj2tcMyo5jMd6jmeWUHK8so/joWUoHOUgwu
-      X4Po1QYz+3dszkDqMp4fklxBwXRsW10KXzPMTZ+sOPAveyxindmjkW8lGy+QsRlG
-      PfZ+G6Z6h7mjem0Y+iWlkYcV4PIWL1iwBi8saCbGS5jN2p8M+X+Q7UNKEkROb3N6
-      KOqkqm57TH2H3eDJAkSnh6/DNFu0Qg==
-      -----END CERTIFICATE-----
-  commercial_cert: |
-      -----BEGIN CERTIFICATE-----
-      MIIGDDCCBPSgAwIBAgISA0Bx308Dieu3QopitJm8N3QNMA0GCSqGSIb3DQEBCwUA
-      MEoxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MSMwIQYDVQQD
-      ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMzAeFw0xNjEyMTkwODM2MDBaFw0x
-      NzAzMTkwODM2MDBaMB8xHTAbBgNVBAMTFHVuc3RhYmxlLmJpdG1hc2submV0MIIC
-      IjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAx0u3IkbJ8qpGsFOWCm4K3QKk
-      /50vHLTq/gqU4xYeGCvpHQRw59wasVCLSZWEmemVjBQtQ7tjWUYaVbFHtqRX/KwG
-      IQIEZ4mkfneDczI71EVIsJMPn8sjzZrQHHyMSLFe3xIKCtsb25UlxmIL93h7KrvG
-      pVsS6MUfUUPVnjBMs+08Lgt0QDtlQLU75z5kplFJZtG/pv7lGkQhyZOO+Qttm5wd
-      T0J3DqFdCa3GP2cz1IY2Up1ICwTLWct4Hs4MCUCzdb04JjoiYUNxGW1iCu1bEIdC
-      x8FJpzpzWIHHeSbIpGNnB1om50JjrY/J/YeSDtz1WOT4wkKxHEqrKmmlL5KRGsP2
-      lln6t5dplpXVXCVRl3+E7kdl3H4kDY5VdjOYEcmofdMVhdeYG+Cmz5ZojRF0gxSa
-      bzu8Afed/ZKShVNicPx6qtmzfpyP3fP61n/TaC//6+IxY65hU7fpmlp+yw9OpK71
-      SMHJ1aiF7oNrzUzl5cITkPFtjsc1Kf8gAb4SRR0lN1Ty9YINH/c2YGFqfHyqdwZw
-      CGILXXp6ryiud50aPIMyGWKWedzyeKssk8eXMoHHFCa490Ux2QVlIn9QayNsJCXX
-      LJ8VpCxA2E3PWB14MoP0Qq7Hm9FFBncYSjEN6IH62TTOUZDqmzeWQvkxGSKQbZ7z
-      FQISXPFJ/aPQoHfYAGkCAwEAAaOCAhUwggIRMA4GA1UdDwEB/wQEAwIFoDAdBgNV
-      HSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwDAYDVR0TAQH/BAIwADAdBgNVHQ4E
-      FgQUl9o/MaPxASJRbiGJucZoNMTa3kswHwYDVR0jBBgwFoAUqEpqYwR93brm0Tm3
-      pkVl7/Oo7KEwcAYIKwYBBQUHAQEEZDBiMC8GCCsGAQUFBzABhiNodHRwOi8vb2Nz
-      cC5pbnQteDMubGV0c2VuY3J5cHQub3JnLzAvBggrBgEFBQcwAoYjaHR0cDovL2Nl
-      cnQuaW50LXgzLmxldHNlbmNyeXB0Lm9yZy8wHwYDVR0RBBgwFoIUdW5zdGFibGUu
-      Yml0bWFzay5uZXQwgf4GA1UdIASB9jCB8zAIBgZngQwBAgEwgeYGCysGAQQBgt8T
-      AQEBMIHWMCYGCCsGAQUFBwIBFhpodHRwOi8vY3BzLmxldHNlbmNyeXB0Lm9yZzCB
-      qwYIKwYBBQUHAgIwgZ4MgZtUaGlzIENlcnRpZmljYXRlIG1heSBvbmx5IGJlIHJl
-      bGllZCB1cG9uIGJ5IFJlbHlpbmcgUGFydGllcyBhbmQgb25seSBpbiBhY2NvcmRh
-      bmNlIHdpdGggdGhlIENlcnRpZmljYXRlIFBvbGljeSBmb3VuZCBhdCBodHRwczov
-      L2xldHNlbmNyeXB0Lm9yZy9yZXBvc2l0b3J5LzANBgkqhkiG9w0BAQsFAAOCAQEA
-      EKevXHgIMHV6f1bpo6qckNuiTV8DuinHU42tVtjWjgrvz3MRzXzUsFZgJI/LFx2q
-      NEeHBAgTyls5CAVI/fevu5cXILLbVoGYeQNghwTE0AzCWuflNur2mKg8MCNHyVAh
-      9AKZtzF7qRvw2H/hWbt8SfuNfxKpSiWyj6B4gzdJ0BrbxbmW92sV5H7yzasBQrIt
-      UAJ395WK0agIXS4ER80RHBCTyEysdyBozHijN5NeUDvYQnZJTY7R1271MUHoQKmd
-      tnFBKbUd04DopbtguCP8X0WNYT6YQTBcQZJl1muTNIFp9KKAgvf/tZZIM6cb+WXZ
-      uGuL7ez7NehjPVp40GscZg==
-      -----END CERTIFICATE-----
-      -----BEGIN CERTIFICATE-----
-      MIIEkjCCA3qgAwIBAgIQCgFBQgAAAVOFc2oLheynCDANBgkqhkiG9w0BAQsFADA/
-      MSQwIgYDVQQKExtEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdCBDby4xFzAVBgNVBAMT
-      DkRTVCBSb290IENBIFgzMB4XDTE2MDMxNzE2NDA0NloXDTIxMDMxNzE2NDA0Nlow
-      SjELMAkGA1UEBhMCVVMxFjAUBgNVBAoTDUxldCdzIEVuY3J5cHQxIzAhBgNVBAMT
-      GkxldCdzIEVuY3J5cHQgQXV0aG9yaXR5IFgzMIIBIjANBgkqhkiG9w0BAQEFAAOC
-      AQ8AMIIBCgKCAQEAnNMM8FrlLke3cl03g7NoYzDq1zUmGSXhvb418XCSL7e4S0EF
-      q6meNQhY7LEqxGiHC6PjdeTm86dicbp5gWAf15Gan/PQeGdxyGkOlZHP/uaZ6WA8
-      SMx+yk13EiSdRxta67nsHjcAHJyse6cF6s5K671B5TaYucv9bTyWaN8jKkKQDIZ0
-      Z8h/pZq4UmEUEz9l6YKHy9v6Dlb2honzhT+Xhq+w3Brvaw2VFn3EK6BlspkENnWA
-      a6xK8xuQSXgvopZPKiAlKQTGdMDQMc2PMTiVFrqoM7hD8bEfwzB/onkxEz0tNvjj
-      /PIzark5McWvxI0NHWQWM6r6hCm21AvA2H3DkwIDAQABo4IBfTCCAXkwEgYDVR0T
-      AQH/BAgwBgEB/wIBADAOBgNVHQ8BAf8EBAMCAYYwfwYIKwYBBQUHAQEEczBxMDIG
-      CCsGAQUFBzABhiZodHRwOi8vaXNyZy50cnVzdGlkLm9jc3AuaWRlbnRydXN0LmNv
-      bTA7BggrBgEFBQcwAoYvaHR0cDovL2FwcHMuaWRlbnRydXN0LmNvbS9yb290cy9k
-      c3Ryb290Y2F4My5wN2MwHwYDVR0jBBgwFoAUxKexpHsscfrb4UuQdf/EFWCFiRAw
-      VAYDVR0gBE0wSzAIBgZngQwBAgEwPwYLKwYBBAGC3xMBAQEwMDAuBggrBgEFBQcC
-      ARYiaHR0cDovL2Nwcy5yb290LXgxLmxldHNlbmNyeXB0Lm9yZzA8BgNVHR8ENTAz
-      MDGgL6AthitodHRwOi8vY3JsLmlkZW50cnVzdC5jb20vRFNUUk9PVENBWDNDUkwu
-      Y3JsMB0GA1UdDgQWBBSoSmpjBH3duubRObemRWXv86jsoTANBgkqhkiG9w0BAQsF
-      AAOCAQEA3TPXEfNjWDjdGBX7CVW+dla5cEilaUcne8IkCJLxWh9KEik3JHRRHGJo
-      uM2VcGfl96S8TihRzZvoroed6ti6WqEBmtzw3Wodatg+VyOeph4EYpr/1wXKtx8/
-      wApIvJSwtmVi4MFU5aMqrSDE6ea73Mj2tcMyo5jMd6jmeWUHK8so/joWUoHOUgwu
-      X4Po1QYz+3dszkDqMp4fklxBwXRsW10KXzPMTZ+sOPAveyxindmjkW8lGy+QsRlG
-      PfZ+G6Z6h7mjem0Y+iWlkYcV4PIWL1iwBi8saCbGS5jN2p8M+X+Q7UNKEkROb3N6
-      KOqkqm57TH2H3eDJAkSnh6/DNFu0Qg==
-      -----END CERTIFICATE-----
-  commercial_key: |
-      -----BEGIN RSA PRIVATE KEY-----
-      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
-      -----END RSA PRIVATE KEY-----
+  commercial_ca_cert: ~
+  commercial_cert: ~
+  commercial_key: ~
   key: |
       -----BEGIN RSA PRIVATE KEY-----
       MIIJKAIBAAKCAgEAvXmypjqMjBDcg3Djbhk1h4U2ild+jx65unl6rNLJ0nPoYKMF
@@ -550,4 +410,4 @@ x509:
       EE7uMNuHbC0kZJD0GMN/t+TqPcbClrGbjclgVFzdp2OxQmEvmsAVx6qSu/8=
       -----END RSA PRIVATE KEY-----
   use: true
-  use_commercial: true
+  use_commercial: false