From 3aab74edfcd4b09dfdc3dfc8ffdb1b1b1ae4a04d Mon Sep 17 00:00:00 2001 From: varac Date: Fri, 23 Dec 2016 14:27:22 +0100 Subject: Use new experimental-platform deb repo --- hiera/snail.yaml | 127 ++++--------------------------------------------------- 1 file changed, 9 insertions(+), 118 deletions(-) (limited to 'hiera/snail.yaml') diff --git a/hiera/snail.yaml b/hiera/snail.yaml index 94be5ba..6a024b0 100644 --- a/hiera/snail.yaml +++ b/hiera/snail.yaml @@ -136,8 +136,8 @@ openvpn: unlimited_prefix: UNLIMITED user_ips: false platform: - major_version: "0.9" - version: "0.9" + major_version: "0.10" + version: "0.10" rbls: - zen.spamhaus.org service_type: user_service @@ -154,18 +154,18 @@ sources: revision: latest type: apt nickserver: - revision: origin/version/0.9 + revision: master source: "https://leap.se/git/nickserver" type: git platform: apt: - basic: "http://deb.leap.se/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: @@ -390,118 +390,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----- - MIIFXTCCA0WgAwIBAgIQIB7e/f4HIW8H1ZXgeWWfETANBgkqhkiG9w0BAQsFADBK - MRgwFgYDVQQDDA9CaXRtYXNrIFJvb3QgQ0ExEDAOBgNVBAoMB0JpdG1hc2sxHDAa - BgNVBAsME2h0dHBzOi8vYml0bWFzay5uZXQwHhcNMTYwODE2MDAwMDAwWhcNMTcw - ODE2MDAwMDAwWjAaMRgwFgYDVQQDDA9kZXYuYml0bWFzay5uZXQwggIiMA0GCSqG - SIb3DQEBAQUAA4ICDwAwggIKAoICAQC4CmGllcF64Np/KI6X3+IpyBM1Orz+3TwI - WpfeVbaIkFiJ00COPzN/SBXddWheQVMWv67mR4HN9lpaE5DcfA6BrjwdatckB2Wx - KXcbBkH7wyAsECjS3SNCWEyoCAA3BuHbMVxvD+lcMHQaeVfmw/CaK4ad9IiS9yjd - CPzZx2x0mEJnaRsccMFcbCCpOXUTAtWPQudcEU/BJX9goYXBaCvV38P7k4R3zC0g - f7/0t26OiEZGBeObik8WV+5GCvlEejPw9jlDAykZp8Djper1/4vlxdXwcpzyM6ZB - gJ6GBNIPV4rD3sEWYGcknIgiJ40EOPY0bQYUAJQ8+T4x1WXNWjHt8g+9fDNbu+cF - HArnbIQEU8Zeg1WUvuILv7A3mcckqS0jzxbxrsLfRlBjOl66lUtU88ZQkUkynok8 - E+9+XaBTPwmU/3m/wbEd6lyj+o4tRItdL/9hBFj4pLfhc2Oexk0akQWmwtYThByG - 0X4Atn2g627Ou7oyCZdbcYGXA0+Qn3xX14g8djUFLi2B5o74d/bvn3QRsoTzH0dU - 8GXX8qVCJNaUjsqR3xepLSt7c5nbdotnIuP/Vm/OkjeGTb9GUz7243opL/1Gh1Al - RYFz+I6gzwDtFbvnzuFmZh67KLmJsB+tzIrjH+V2F21uUmeA6vUUglgAcWkUWweO - D+IqFkt3wwIDAQABo28wbTAdBgNVHQ4EFgQUy7DwSwKw53Lj6XXT+WeGLzYnSRYw - CwYDVR0PBAQDAgWgMBMGA1UdJQQMMAoGCCsGAQUFBwMBMAkGA1UdEwQCMAAwHwYD - VR0jBBgwFoAUuYGDLL2sswnYpHHvProt1JU+D48wDQYJKoZIhvcNAQELBQADggIB - AE4kTuo0ZsmH3Z9JmYqGLo/rh5gdG/rqpKGimPAY8w+0bZpRHldqn62J7I5/YZ08 - 6kqb1eeNCDrhERnnrTT8tmM9uyQHjIirU7503Tz8YIR4BQOXa7zralAoTr7SHT5b - Wltvvzu9PjBLu471/aIGeXJkeRWUi5W3JqBEtmmPPO/Vh9LI6hUSTuJFTSkQD3WR - jTBAqlBgqJDpBuEfQu0dRuQUXagBCKT8rDoYmnJxeS80vJ2z0j2LJsy+Rbd6vKXM - dn0h/Kq1IiRH13tX2LQfPhYgMlwG1HKnI1oBJdH9QmQlQ6P0VyX9oRCSQlir1sS4 - ET7QLuXP78xPBjPqpGhOq9eCquJBNMYHnfpH5EMzV0+/mv2Ml6qktabYlDXHAjaY - aXYbJjJ+C1ENufaQfDuVI94JHsEyoTUDxDrRUkDGepFNM7eXf2n6B9OSumQXA1dx - kWrL7GpwOYRBzMIjcpRn5abRTtJ64yy7LjBY2WfV/0CwOEo5Q0oDIG8E74hYs2Te - cmEW2l0UTF0zdbcc5dDEnVbAV1FWz0IOnTLv6H9+i5b9fflzt8zd79F66xritwjT - wauhBMuC4fVlZxY9v7J22McMbFtcjsvqtojhVMMF5j1pihfECp+VDhQLOQMv0xIm - 6vV8GyZjDGepqMqn/R1J3Tzpe4N+5nNjAAvSaLvtZl3J - -----END CERTIFICATE----- - commercial_key: | - -----BEGIN RSA PRIVATE KEY----- - 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 - -----END RSA PRIVATE KEY----- + commercial_ca_cert: ~ + commercial_cert: ~ + commercial_key: ~ dh: | -----BEGIN DH PARAMETERS----- MIIBngKCAZcAsTaQV6TwbN9PpD6dYdXz0lA0drrXLRvS8rNoMTaDnIv134RwKwsb @@ -567,4 +458,4 @@ x509: mI9hprJ3XwwY22nbWRcWnHc3t5GbBkqCI+seCYolljuh5RLc1XFyy8Obb703 -----END RSA PRIVATE KEY----- use: true - use_commercial: true + use_commercial: false -- cgit v1.2.3