summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2017-04-18 22:41:00 +0200
committervarac <varacanero@zeromail.org>2017-04-18 22:41:00 +0200
commitd46074423179768632f8f786281c4870b6fb4e0e (patch)
tree869fd9f821f13941349578032aa159baeaf12096
parent3a87a13fa49684b6cdc12d6f1819caaf1487e530 (diff)
New certs for dev.bm
-rw-r--r--files/cert/dev.bitmask.net.crt89
-rw-r--r--files/nodes/demodex/demodex.crt56
-rw-r--r--files/nodes/demodex/demodex.key98
-rw-r--r--files/nodes/dotterel/dotterel.crt62
-rw-r--r--files/nodes/dotterel/dotterel.key98
-rw-r--r--hiera/clam.yaml3
-rw-r--r--hiera/demodex.yaml157
-rw-r--r--hiera/dotterel.yaml163
-rw-r--r--hiera/elephant.yaml103
-rw-r--r--hiera/newt.yaml3
-rw-r--r--hiera/snail.yaml14
11 files changed, 448 insertions, 398 deletions
diff --git a/files/cert/dev.bitmask.net.crt b/files/cert/dev.bitmask.net.crt
index eb74af5..f2e7a8d 100644
--- a/files/cert/dev.bitmask.net.crt
+++ b/files/cert/dev.bitmask.net.crt
@@ -1,31 +1,62 @@
-----BEGIN CERTIFICATE-----
-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
+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
+pkGAnoYE0g9XisPewRZgZySciCInjQQ49jRtBhQAlDz5PjHVZc1aMe3yD718M1u7
+5wUcCudshARTxl6DVZS+4gu/sDeZxySpLSPPFvGuwt9GUGM6XrqVS1TzxlCRSTKe
+iTwT735doFM/CZT/eb/BsR3qXKP6ji1Ei10v/2EEWPikt+FzY57GTRqRBabC1hOE
+HIbRfgC2faDrbs67ujIJl1txgZcDT5CffFfXiDx2NQUuLYHmjvh39u+fdBGyhPMf
+R1TwZdfypUIk1pSOypHfF6ktK3tzmdt2i2ci4/9Wb86SN4ZNv0ZTPvbjeikv/UaH
+UCVFgXP4jqDPAO0Vu+fO4WZmHrsouYmwH63MiuMf5XYXbW5SZ4Dq9RSCWABxaRRb
+B44P4ioWS3fDAgMBAAGjggIQMIICDDAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYw
+FAYIKwYBBQUHAwEGCCsGAQUFBwMCMAwGA1UdEwEB/wQCMAAwHQYDVR0OBBYEFMuw
+8EsCsOdy4+l10/lnhi82J0kWMB8GA1UdIwQYMBaAFKhKamMEfd265tE5t6ZFZe/z
+qOyhMHAGCCsGAQUFBwEBBGQwYjAvBggrBgEFBQcwAYYjaHR0cDovL29jc3AuaW50
+LXgzLmxldHNlbmNyeXB0Lm9yZy8wLwYIKwYBBQUHMAKGI2h0dHA6Ly9jZXJ0Lmlu
+dC14My5sZXRzZW5jcnlwdC5vcmcvMBoGA1UdEQQTMBGCD2Rldi5iaXRtYXNrLm5l
+dDCB/gYDVR0gBIH2MIHzMAgGBmeBDAECATCB5gYLKwYBBAGC3xMBAQEwgdYwJgYI
+KwYBBQUHAgEWGmh0dHA6Ly9jcHMubGV0c2VuY3J5cHQub3JnMIGrBggrBgEFBQcC
+AjCBngyBm1RoaXMgQ2VydGlmaWNhdGUgbWF5IG9ubHkgYmUgcmVsaWVkIHVwb24g
+YnkgUmVseWluZyBQYXJ0aWVzIGFuZCBvbmx5IGluIGFjY29yZGFuY2Ugd2l0aCB0
+aGUgQ2VydGlmaWNhdGUgUG9saWN5IGZvdW5kIGF0IGh0dHBzOi8vbGV0c2VuY3J5
+cHQub3JnL3JlcG9zaXRvcnkvMA0GCSqGSIb3DQEBCwUAA4IBAQAdUO34H/r+DBY9
+HXXGtMVP0Hc3DcyGu4pvyBNCpW3MZk2+bvN37oYtw1MDE16crpawx6RxovtnQcQk
+dnr33oe1z5Rn70Fe/VF5bWYEtizUR6YxeEhgP6S7sUdL1Rp1fBI0M4OhObJ+9fQj
+W5OJDq3Hn2/gbucVUWendEz5pikKkMlj0TTJdy/e3q5ZOMh8zYnSxabTstzfrQJ6
+1wnlxnJRc4hOnWEafeOBSkcrYkywoUsdhvsmRlQAmh4IRNmloWBy9FN6IXwQ+clH
+EHBxs/AHViMpkw6GfYk5Lp0acbfxii9ayYAPWtl+rtjKRXrJUTHjdDV5vYDSE2u8
+mPx2EanW
+-----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-----
diff --git a/files/nodes/demodex/demodex.crt b/files/nodes/demodex/demodex.crt
index e3fb54c..84963a0 100644
--- a/files/nodes/demodex/demodex.crt
+++ b/files/nodes/demodex/demodex.crt
@@ -1,33 +1,33 @@
-----BEGIN CERTIFICATE-----
-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
+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
-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
+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
-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
-aCSIDd9uvD+tDfPMG7OfdocArfybvA==
+gyy9rLMJ2KRx7z66LdSVPg+PMA0GCSqGSIb3DQEBCwUAA4ICAQCyRpYWml+/C/aJ
+sUU5dUbDc1KB1SGnAlACNOfhLMhPUCa/gtTZ4Z78isN/muU3NKg1ZjD/zTQX6aL2
+GKZ47yC7hZa3QyCWXpo9cYiaR0yCENKzG7w1S1Mcmz7soZqaFwajseEn3LRBGUr+
+TMcK9Dw2MZKm2sdkwMjoJGmR3a1yekiAxkjocVu+TjA/Jtrw6u8XfsDJBIfZV42O
+QvLRSDK/TLlQ5Sd30QFGfGco03VZjMhssaPnuW52IiqA6O1g5dk5p0tOpQbiLDnq
+ZAJy8fcIUl/0SzOag05ilQ9yrYe7Q9Ain8zpcW2Z8F/mCR+Xo6uqVaciICCq/AVF
+h93RG152BzvW81tMoH80hn/mf79pGNlzBk0c0/BBFAkhxOmIY95dM5qt/9Uh03cy
+4kdMUD4/mMXvkVldrm3eh5X8Z0mCYipaZvUsAvc3hE/Msm8aVGXK7iklTXPbsKk3
+PJvfTzqxPvTZrKN7wcdgaMUmhdcDmuoE76epwaDkuuDEJ5wNOd+O6jgkJemjkXvU
+InqEejP3ljVs3YjooL6CC5jbOPLTbLLAu7SSahWkrtK/8ExPS5wZHoGtn/XImgn6
+db+3Rg8W0vQEa7BENVuVHY6BdxMII7Mg7XuknsLpZsVql4SE27yQY1OkNSEm9+EX
+bW3NPdu1c6vgQBN7Zxr7Da0Y831AhQ==
-----END CERTIFICATE-----
diff --git a/files/nodes/demodex/demodex.key b/files/nodes/demodex/demodex.key
index bbf4a70..df127e2 100644
--- a/files/nodes/demodex/demodex.key
+++ b/files/nodes/demodex/demodex.key
@@ -1,51 +1,51 @@
-----BEGIN RSA PRIVATE KEY-----
-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
+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
-----END RSA PRIVATE KEY-----
diff --git a/files/nodes/dotterel/dotterel.crt b/files/nodes/dotterel/dotterel.crt
index 7927210..876e82a 100644
--- a/files/nodes/dotterel/dotterel.crt
+++ b/files/nodes/dotterel/dotterel.crt
@@ -1,33 +1,33 @@
-----BEGIN CERTIFICATE-----
-MIIFtTCCA52gAwIBAgIQfQGyiy5B5DSdI4UJEMKS6jANBgkqhkiG9w0BAQsFADBK
-MRgwFgYDVQQDDA9CaXRtYXNrIFJvb3QgQ0ExEDAOBgNVBAoMB0JpdG1hc2sxHDAa
-BgNVBAsME2h0dHBzOi8vYml0bWFzay5uZXQwHhcNMTYwNTI2MDAwMDAwWhcNMTcw
-NTI2MDAwMDAwWjAjMSEwHwYDVQQDDBhkb3R0ZXJlbC5kZXYuYml0bWFzay5uZXQw
-ggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDT6dRJ8E0aWse+eRk/zxZN
-z25EcDxa7jAwFVJSzbgRc/qUYyK9Or6K1TFY3f7lSHCihprqx8GLrHOhfzxKPdTT
-RWvgQpeOobmSehhTkOaGs3010wmtmmcp4QF2dyx2psifZOJ/uWdAdFTUwpddvnIQ
-bgklSU/DY49ofnxOu08oJrwmuTITMlr5R1LUJmutJhwiOyvUoj/hfUxp1uxYTSBs
-xKgJdGvWsRlbLcC8VeJZGWPjs/j+WskhbCXD4iB14wh1tqRrkvozOjeaxma/rmUA
-pb+nJoBU7whvHsHAIEr06rDGHp2LhU1snsQzlm9+bb5d9zrdX0R+rZFMLkWRKOnc
-p36ALOsyefDOaeAubctWEdWkU4mRFIU8EWzzdBTVmBjq4WlatOZaTiJ4t7fvDYEO
-7cvU0dYhw9O2htbmb4x5+UhtUOd4q+bIhUqRI5qsC5pYLuTz6IdRu9oJ2Hkn8tHK
-B5XsANI51fbR3q8PpbSMDVdTIwbzlkS3PVZTnWKByxfT6MLeoGAuwOMf9wH0fmaQ
-sB7f4iZIsbMfZd+rblcgkjW7QXbjb7vUuivKNcsK5+VxvZkPnY7Qjac+l9I47Nlb
-jakri0EQU2HFVOu4132+cs3GWgMlYYM5Nl7/nb7qU1ZoO88iJqI3st99e3kLT397
-Wy7uVnKpPPv2YRaCpMBklwIDAQABo4G9MIG6MB0GA1UdDgQWBBT2QI08eSDZXpHL
-NefKkbW7VTKrgTBBBgNVHREEOjA4ghZkb3R0ZXJlbC5kZXYuYml0bWFzay5pghhk
-b3R0ZXJlbC5kZXYuYml0bWFzay5uZXSHBCXa8DIwCwYDVR0PBAQDAgWgMB0GA1Ud
-JQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAJBgNVHRMEAjAAMB8GA1UdIwQYMBaA
-FLmBgyy9rLMJ2KRx7z66LdSVPg+PMA0GCSqGSIb3DQEBCwUAA4ICAQB73Moh6h5r
-yzBkiLF/RqesvzIMARn9oy8VI4x0oL7KN7t1gMfih9vgWpqLKEmvCKSGJXLQ+BFN
-HDvY/PBsynxwbSOUSKxB8P6E5OJ4dIiZoyaLPH8V33c16UeC5Ld8KRXs+nu3Yf5W
-vEKlHP1OIdn2eO6MDZ4Hk1hq8+INwVsmTaUQe0yh5SJPiOKPexcwAj25ZkVAb756
-UuGej0N10CrITVrRgGGgUozU/Uphro+xhzKu1ICY7p4k5KWpsTTe5GG8TvqlUX3/
-8ZM79oQbPiFFOjMN/xNFMJfQvogvftZqjDezKiXGuY+xLZchR0qJUDIYIIcYs1Eb
-HvMFoehn+gaGnOiEDranxrBMNpZoiueBqpwZ1Ge7ExshyTG6DbuxO29+Wc9InAp1
-zt864tHZY/1+0GVoDzLjdxRjYd56K8+HxRjv7EY2SF74D9/f1iDPo7UETnx71/m7
-Fs6XdNNzNXf24zNl/XIbjRbKUO8842SO9rwRyi9BZ6FSZUNGPjedrvVsham3XKVP
-+yaFbBBYvJX378Upg/BAZDWnbQ846ilB2fqc54e7evEtzhGS3PM6U/cUTM29nATf
-0dItf3PXpetj7Qt7+Oyvm7+VK1YGAMIlBwL3y+yKn114YPvq2vZsNnMfFzdvuA7Z
-bfhCBqAyZtQIuMaUcqfADc8bXuwVUa/Sdg==
+MIIFtjCCA56gAwIBAgIRAKfGq6zJoaw50uE45WEa3D8wDQYJKoZIhvcNAQELBQAw
+SjEYMBYGA1UEAwwPQml0bWFzayBSb290IENBMRAwDgYDVQQKDAdCaXRtYXNrMRww
+GgYDVQQLDBNodHRwczovL2JpdG1hc2submV0MB4XDTE3MDQxODAwMDAwMFoXDTE4
+MDQxODAwMDAwMFowIzEhMB8GA1UEAwwYZG90dGVyZWwuZGV2LmJpdG1hc2submV0
+MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA8TG3g0qf59br+a8WrFQq
+NICe5ekvifK5ocq6XRrXTsJ6op4/AKHQc8oBA3IlFiM8zBeed//rlCeRTGAc01QC
+mzKRi8DcXvXR78fqxzz1TcVwoDHSCQ4tmO8BEek83cKMvAISBL1bxS+cZ/vbppuq
+oiatvZu+DzPh3C9h2FEp5pz7IR2JReKmf3BEN5YP35bQCNtmiV3ER6JRmETB11kn
+qL+XX6cMlT8QErFlvrQxDMhELgyJ3kFYrS1ZC5lmm5qKF76j+YFHhtjH2wrQtHYS
+nAm2P7voW1s+R/3y0W2iy/44M9BKsO3qcqkvMuOUU+j8OUVrpLAnTup6cfQvFfQ9
+w6J3aHfRNje3tDKLb9sPO2LKzHiYZmqVQoYlcM0fJgQJIXvZXSfkXVibHlUxi8lP
+du9BYBIUC/xcWfvwxRk3HkaLPcdkcgvjTHTdiJU++fBi5BN+WduqXuCYYBmIjSXu
+D6PE0Orc6jDDxooBXYQy56nfNx6UQMIwz8sr+6qwKC6gHsDAaHj2yEFr6WBy7Tis
+/ZIMB9fsJ18wS6F2ozawE/KK4ip2RKIeLmDuAl8X/yZ6qlg+aIdE7RW7cv1h3DO6
+qGLFCQ31d6ltdO/gN0guTeWmaPyWnWudwEpvUSygx8i3WY2aWtY7PdcqSDl5F2HV
+Ho9oxRQsDXo+hX9D9riQ/h8CAwEAAaOBvTCBujAdBgNVHQ4EFgQUryoa2wmM1Pq3
+mvB4v3NQWvGkI2UwQQYDVR0RBDowOIIWZG90dGVyZWwuZGV2LmJpdG1hc2suaYIY
+ZG90dGVyZWwuZGV2LmJpdG1hc2submV0hwQl2vAyMAsGA1UdDwQEAwIFoDAdBgNV
+HSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwCQYDVR0TBAIwADAfBgNVHSMEGDAW
+gBS5gYMsvayzCdikce8+ui3UlT4PjzANBgkqhkiG9w0BAQsFAAOCAgEAdNn2O6D4
+x1A+kvL1PhJvV5fIuwKcFjf08H0Vhz/cMl1QQP3QkihAstJfqGsIZESRUSi/s7CZ
+lj98t2k/7Gzs1XGJfiZosarwNxjvyWsonaNLV3aDTuJtMbEbCBRaMIRal4VjTp7D
+iGve5Hlr5O2HoCT42waFl81b7RIOovZX2Sa0LJhLGuQuDser8Dw2liLpI1qNLdXo
+jgiRavYQSmcSIn2K7tou1mE/81att4Esab5VMZdElrzyc99UPSfG5JfwoYlhzMIf
+CyuW+ov/XB+Y1A4FJHcL47tHRcU0jeYjN634Rz2aHtSsnL61vf/HW/HVbgjEEOxd
+H8x2eh13j9Og6uSeNzwTN1NaIK5rsaP4zcQ5cXI1vsmFCOVH5kD6PvP+na5A8G85
+HP2/gqjjlgRT7Rr73bM1OzqeGIMK3YaTh4zPVDUWqsjsIZyqO6ToBnHRJ5uK/tud
+56DzB1t3Qg8H+SFink260QhIgfH2DJYWPIAopnLOAvu+c3lPPVH915AcqmK0YEZ6
+cF+RZmJVVmNuaZBCP4ogailTZf5JdLyLUrcguieA+iWVjbF6wb6xf5aByG5M/yh5
+rgDzLaMoumuTUUKjBHimDpTJZWSWTvtlXJx37Dl+aJVMkJLLJ3dEHg5FT/46LNs1
+08vfeV2LQFpui2rIeIwkqcQNPhna8HgH34M=
-----END CERTIFICATE-----
diff --git a/files/nodes/dotterel/dotterel.key b/files/nodes/dotterel/dotterel.key
index 0afdda7..a7e9036 100644
--- a/files/nodes/dotterel/dotterel.key
+++ b/files/nodes/dotterel/dotterel.key
@@ -1,51 +1,51 @@
-----BEGIN RSA PRIVATE KEY-----
-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
+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
-----END RSA PRIVATE KEY-----
diff --git a/hiera/clam.yaml b/hiera/clam.yaml
index 0aa9c8c..424c5a7 100644
--- a/hiera/clam.yaml
+++ b/hiera/clam.yaml
@@ -111,7 +111,8 @@ sources:
type: git
platform:
apt:
- basic: "http://deb.leap.se/experimental-platform"
+ basic: "http://deb.leap.se/platform"
+ component: snapshots
soledad:
package: soledad-server
revision: latest
diff --git a/hiera/demodex.yaml b/hiera/demodex.yaml
index 21d7f18..4c8af66 100644
--- a/hiera/demodex.yaml
+++ b/hiera/demodex.yaml
@@ -52,7 +52,8 @@ sources:
type: git
platform:
apt:
- basic: "http://deb.leap.se/experimental-platform"
+ basic: "http://deb.leap.se/platform"
+ component: snapshots
soledad:
package: soledad-server
revision: latest
@@ -154,92 +155,92 @@ x509:
-----END CERTIFICATE-----
cert: |
-----BEGIN CERTIFICATE-----
- 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
+ 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
- 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
+ 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
- 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
- aCSIDd9uvD+tDfPMG7OfdocArfybvA==
+ gyy9rLMJ2KRx7z66LdSVPg+PMA0GCSqGSIb3DQEBCwUAA4ICAQCyRpYWml+/C/aJ
+ sUU5dUbDc1KB1SGnAlACNOfhLMhPUCa/gtTZ4Z78isN/muU3NKg1ZjD/zTQX6aL2
+ GKZ47yC7hZa3QyCWXpo9cYiaR0yCENKzG7w1S1Mcmz7soZqaFwajseEn3LRBGUr+
+ TMcK9Dw2MZKm2sdkwMjoJGmR3a1yekiAxkjocVu+TjA/Jtrw6u8XfsDJBIfZV42O
+ QvLRSDK/TLlQ5Sd30QFGfGco03VZjMhssaPnuW52IiqA6O1g5dk5p0tOpQbiLDnq
+ ZAJy8fcIUl/0SzOag05ilQ9yrYe7Q9Ain8zpcW2Z8F/mCR+Xo6uqVaciICCq/AVF
+ h93RG152BzvW81tMoH80hn/mf79pGNlzBk0c0/BBFAkhxOmIY95dM5qt/9Uh03cy
+ 4kdMUD4/mMXvkVldrm3eh5X8Z0mCYipaZvUsAvc3hE/Msm8aVGXK7iklTXPbsKk3
+ PJvfTzqxPvTZrKN7wcdgaMUmhdcDmuoE76epwaDkuuDEJ5wNOd+O6jgkJemjkXvU
+ InqEejP3ljVs3YjooL6CC5jbOPLTbLLAu7SSahWkrtK/8ExPS5wZHoGtn/XImgn6
+ db+3Rg8W0vQEa7BENVuVHY6BdxMII7Mg7XuknsLpZsVql4SE27yQY1OkNSEm9+EX
+ bW3NPdu1c6vgQBN7Zxr7Da0Y831AhQ==
-----END CERTIFICATE-----
commercial_ca_cert: ~
commercial_cert: ~
commercial_key: ~
key: |
-----BEGIN RSA PRIVATE KEY-----
- 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
+ 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
-----END RSA PRIVATE KEY-----
use: true
use_commercial: false
diff --git a/hiera/dotterel.yaml b/hiera/dotterel.yaml
index a42d6bb..47ce6ad 100644
--- a/hiera/dotterel.yaml
+++ b/hiera/dotterel.yaml
@@ -52,7 +52,8 @@ sources:
type: git
platform:
apt:
- basic: "http://deb.leap.se/experimental-platform"
+ basic: "http://deb.leap.se/platform"
+ component: snapshots
soledad:
package: soledad-server
revision: latest
@@ -167,92 +168,92 @@ x509:
-----END CERTIFICATE-----
cert: |
-----BEGIN CERTIFICATE-----
- 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
- bfhCBqAyZtQIuMaUcqfADc8bXuwVUa/Sdg==
+ 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
+ 08vfeV2LQFpui2rIeIwkqcQNPhna8HgH34M=
-----END CERTIFICATE-----
commercial_ca_cert: ~
commercial_cert: ~
commercial_key: ~
key: |
-----BEGIN RSA PRIVATE KEY-----
- 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
+ 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
-----END RSA PRIVATE KEY-----
use: true
use_commercial: false
diff --git a/hiera/elephant.yaml b/hiera/elephant.yaml
index dea0ad8..9e29ca0 100644
--- a/hiera/elephant.yaml
+++ b/hiera/elephant.yaml
@@ -165,16 +165,6 @@ firewall:
- 6425
- 80
to: "37.218.242.214"
-haproxy:
- couch:
- listen_port: 4096
- servers:
- clam:
- backup: false
- host: localhost
- port: 4000
- weight: 100
- writable: true
hosts:
clam:
domain_full: clam.dev.bitmask.net
@@ -226,7 +216,8 @@ sources:
type: git
platform:
apt:
- basic: "http://deb.leap.se/experimental-platform"
+ basic: "http://deb.leap.se/platform"
+ component: snapshots
soledad:
package: soledad-server
revision: latest
@@ -343,6 +334,7 @@ webapp:
password: PkyRLKGfQAnmk64EXqHWBVsxJfksKXNH
salt: 51d3c78980b9cf319cadbc73896f7128
username: admin
+ couchdb_port: 4000
couchdb_webapp_user:
password: PvRAdP9JrjS8qRsNCpyQ_KVDBTgTNGkY
salt: 86497f034c8ef09b097f5c757ab038b7
@@ -595,35 +587,66 @@ x509:
-----END CERTIFICATE-----
commercial_cert: |
-----BEGIN CERTIFICATE-----
- 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
+ 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
+ LSB/v/S3bo6IRkYF45uKTxZX7kYK+UR6M/D2OUMDKRmnwOOl6vX/i+XF1fBynPIz
+ pkGAnoYE0g9XisPewRZgZySciCInjQQ49jRtBhQAlDz5PjHVZc1aMe3yD718M1u7
+ 5wUcCudshARTxl6DVZS+4gu/sDeZxySpLSPPFvGuwt9GUGM6XrqVS1TzxlCRSTKe
+ iTwT735doFM/CZT/eb/BsR3qXKP6ji1Ei10v/2EEWPikt+FzY57GTRqRBabC1hOE
+ HIbRfgC2faDrbs67ujIJl1txgZcDT5CffFfXiDx2NQUuLYHmjvh39u+fdBGyhPMf
+ R1TwZdfypUIk1pSOypHfF6ktK3tzmdt2i2ci4/9Wb86SN4ZNv0ZTPvbjeikv/UaH
+ UCVFgXP4jqDPAO0Vu+fO4WZmHrsouYmwH63MiuMf5XYXbW5SZ4Dq9RSCWABxaRRb
+ B44P4ioWS3fDAgMBAAGjggIQMIICDDAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYw
+ FAYIKwYBBQUHAwEGCCsGAQUFBwMCMAwGA1UdEwEB/wQCMAAwHQYDVR0OBBYEFMuw
+ 8EsCsOdy4+l10/lnhi82J0kWMB8GA1UdIwQYMBaAFKhKamMEfd265tE5t6ZFZe/z
+ qOyhMHAGCCsGAQUFBwEBBGQwYjAvBggrBgEFBQcwAYYjaHR0cDovL29jc3AuaW50
+ LXgzLmxldHNlbmNyeXB0Lm9yZy8wLwYIKwYBBQUHMAKGI2h0dHA6Ly9jZXJ0Lmlu
+ dC14My5sZXRzZW5jcnlwdC5vcmcvMBoGA1UdEQQTMBGCD2Rldi5iaXRtYXNrLm5l
+ dDCB/gYDVR0gBIH2MIHzMAgGBmeBDAECATCB5gYLKwYBBAGC3xMBAQEwgdYwJgYI
+ KwYBBQUHAgEWGmh0dHA6Ly9jcHMubGV0c2VuY3J5cHQub3JnMIGrBggrBgEFBQcC
+ AjCBngyBm1RoaXMgQ2VydGlmaWNhdGUgbWF5IG9ubHkgYmUgcmVsaWVkIHVwb24g
+ YnkgUmVseWluZyBQYXJ0aWVzIGFuZCBvbmx5IGluIGFjY29yZGFuY2Ugd2l0aCB0
+ aGUgQ2VydGlmaWNhdGUgUG9saWN5IGZvdW5kIGF0IGh0dHBzOi8vbGV0c2VuY3J5
+ cHQub3JnL3JlcG9zaXRvcnkvMA0GCSqGSIb3DQEBCwUAA4IBAQAdUO34H/r+DBY9
+ HXXGtMVP0Hc3DcyGu4pvyBNCpW3MZk2+bvN37oYtw1MDE16crpawx6RxovtnQcQk
+ dnr33oe1z5Rn70Fe/VF5bWYEtizUR6YxeEhgP6S7sUdL1Rp1fBI0M4OhObJ+9fQj
+ W5OJDq3Hn2/gbucVUWendEz5pikKkMlj0TTJdy/e3q5ZOMh8zYnSxabTstzfrQJ6
+ 1wnlxnJRc4hOnWEafeOBSkcrYkywoUsdhvsmRlQAmh4IRNmloWBy9FN6IXwQ+clH
+ EHBxs/AHViMpkw6GfYk5Lp0acbfxii9ayYAPWtl+rtjKRXrJUTHjdDV5vYDSE2u8
+ mPx2EanW
+ -----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-----
diff --git a/hiera/newt.yaml b/hiera/newt.yaml
index daf6d9f..5617bd7 100644
--- a/hiera/newt.yaml
+++ b/hiera/newt.yaml
@@ -52,7 +52,8 @@ sources:
type: git
platform:
apt:
- basic: "http://deb.leap.se/experimental-platform"
+ basic: "http://deb.leap.se/platform"
+ component: snapshots
soledad:
package: soledad-server
revision: latest
diff --git a/hiera/snail.yaml b/hiera/snail.yaml
index 12a98a0..62dae5c 100644
--- a/hiera/snail.yaml
+++ b/hiera/snail.yaml
@@ -8,6 +8,7 @@ couchdb_leap_mx_user:
password: TISmwrYwSBmwbdDyQvJYu3_VkZmfZITc
salt: 79fd6d71c94a1aaf44cefc84a5a748dc
username: leap_mx
+couchdb_port: 4000
development:
site_config: true
dns:
@@ -38,16 +39,6 @@ firewall:
- 27889
- "443"
to: "37.218.242.216"
-haproxy:
- couch:
- listen_port: 4096
- servers:
- clam:
- backup: false
- host: localhost
- port: 4000
- weight: 100
- writable: true
hosts:
clam:
domain_full: clam.dev.bitmask.net
@@ -160,7 +151,8 @@ sources:
type: git
platform:
apt:
- basic: "http://deb.leap.se/experimental-platform"
+ basic: "http://deb.leap.se/platform"
+ component: snapshots
soledad:
package: soledad-server
revision: latest