summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--files/cert/cdev.bitmask.net.crt38
-rw-r--r--files/cert/demo.bitmask.net.crt38
-rw-r--r--hiera/aardwolf.yaml3
-rw-r--r--hiera/alpaca.yaml3
-rw-r--r--hiera/ant.yaml15
-rw-r--r--hiera/cat.yaml3
-rw-r--r--hiera/clam.yaml3
-rw-r--r--hiera/demodex.yaml3
-rw-r--r--hiera/donkey.yaml3
-rw-r--r--hiera/dotterel.yaml3
-rw-r--r--hiera/elephant.yaml3
-rw-r--r--hiera/giraffe.yaml6
-rw-r--r--hiera/leech.yaml65
-rw-r--r--hiera/lynx.yaml44
-rw-r--r--hiera/millipede.yaml15
-rw-r--r--hiera/newt.yaml3
-rw-r--r--hiera/orangutan.yaml3
-rw-r--r--hiera/otter.yaml16
-rw-r--r--hiera/snail.yaml3
-rw-r--r--hiera/tuatara.yaml3
-rw-r--r--secrets.json19
21 files changed, 165 insertions, 127 deletions
diff --git a/files/cert/cdev.bitmask.net.crt b/files/cert/cdev.bitmask.net.crt
index 18d82ad..2cfb660 100644
--- a/files/cert/cdev.bitmask.net.crt
+++ b/files/cert/cdev.bitmask.net.crt
@@ -1,8 +1,8 @@
-----BEGIN CERTIFICATE-----
-MIIGBDCCBOygAwIBAgISA0peJ4wsDu9Ix9uCQOvFcmQmMA0GCSqGSIb3DQEBCwUA
+MIIGAzCCBOugAwIBAgISA7dP48A8+v7gqalkjFUxkc6PMA0GCSqGSIb3DQEBCwUA
MEoxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MSMwIQYDVQQD
-ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMzAeFw0xNzA0MjcxOTM0MDBaFw0x
-NzA3MjYxOTM0MDBaMBsxGTAXBgNVBAMTEGNkZXYuYml0bWFzay5uZXQwggIiMA0G
+ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMzAeFw0xNzA2MjcwODE5MDBaFw0x
+NzA5MjUwODE5MDBaMBsxGTAXBgNVBAMTEGNkZXYuYml0bWFzay5uZXQwggIiMA0G
CSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDOSQHWGCuXnCz/MykBAugtPJUNu855
SPLEmKkKjg7mIsAPKWh9hXXXBi8PsE8GTQcFsjdv86nzLnfDYr0f7+PV8Fs4WxE+
hN8T8derrYM90Fbers9gmzIQORYE+iyXnuPSiGk5XBNTugDvr+fYMfvPf5b092SE
@@ -14,24 +14,24 @@ IAKme+dNkwQt8T55mEJ3KS0yAu/wu41xoz89FN+9pZlEF6dKs/NyaGuq9DR991qG
gpCeQOASYKO7OAptFNbLdS0QROJSK4tuQmbMLgGDHV69iXHdnupWzaCSYVZLHOLB
yMnLUz7YUHnONe5F8AnIEDSlDF9WqXSIJSY9zZsAZKI0vVdQTwNk6IDBzdQGHkuJ
2f1JSD7JVcVGtjyyxD8+yHB/BkBqsudFSyt4hVtZVbEcn9soKsHYjuVX3ItaJ1Zn
-WYfZkr+5L2O0bQIDAQABo4ICETCCAg0wDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQW
+WYfZkr+5L2O0bQIDAQABo4ICEDCCAgwwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQW
MBQGCCsGAQUFBwMBBggrBgEFBQcDAjAMBgNVHRMBAf8EAjAAMB0GA1UdDgQWBBS0
4pvDNSzeeFpBBjvRTQC/4Sl2CjAfBgNVHSMEGDAWgBSoSmpjBH3duubRObemRWXv
-86jsoTBwBggrBgEFBQcBAQRkMGIwLwYIKwYBBQUHMAGGI2h0dHA6Ly9vY3NwLmlu
-dC14My5sZXRzZW5jcnlwdC5vcmcvMC8GCCsGAQUFBzAChiNodHRwOi8vY2VydC5p
-bnQteDMubGV0c2VuY3J5cHQub3JnLzAbBgNVHREEFDASghBjZGV2LmJpdG1hc2su
-bmV0MIH+BgNVHSAEgfYwgfMwCAYGZ4EMAQIBMIHmBgsrBgEEAYLfEwEBATCB1jAm
-BggrBgEFBQcCARYaaHR0cDovL2Nwcy5sZXRzZW5jcnlwdC5vcmcwgasGCCsGAQUF
-BwICMIGeDIGbVGhpcyBDZXJ0aWZpY2F0ZSBtYXkgb25seSBiZSByZWxpZWQgdXBv
-biBieSBSZWx5aW5nIFBhcnRpZXMgYW5kIG9ubHkgaW4gYWNjb3JkYW5jZSB3aXRo
-IHRoZSBDZXJ0aWZpY2F0ZSBQb2xpY3kgZm91bmQgYXQgaHR0cHM6Ly9sZXRzZW5j
-cnlwdC5vcmcvcmVwb3NpdG9yeS8wDQYJKoZIhvcNAQELBQADggEBAGvQxptwz5wT
-0FkHRkmZRQ45E3De/wv7p3a8wSkiDBR1Ohkk5j5dzzDLlGe4VGkVljp0YggsoGry
-713Nu4EcTkrgm4pO4ZOYXoosQ9SOcFVYTHg9ji9IYx8hhHUogg3jPchcWAXdKFUS
-vEi2T42efqiOpnndc9qGgYnabLpa4xmeW4Bb2+WEHBSCmr0ogWeZ/2MMZWAMRY6/
-ahkTJYkvyZKQruZJled45EzIfPduZBh0eUP8RiqVhXpfuDvNxQougGlQctwXX3nf
-HQ4v109oL7Nqg0OuuQj70fqgRd2zjvKP9YkoY2vPTnrXH+pc8Xt3eJhtqlssogxh
-bhI0QAPaHoA=
+86jsoTBvBggrBgEFBQcBAQRjMGEwLgYIKwYBBQUHMAGGImh0dHA6Ly9vY3NwLmlu
+dC14My5sZXRzZW5jcnlwdC5vcmcwLwYIKwYBBQUHMAKGI2h0dHA6Ly9jZXJ0Lmlu
+dC14My5sZXRzZW5jcnlwdC5vcmcvMBsGA1UdEQQUMBKCEGNkZXYuYml0bWFzay5u
+ZXQwgf4GA1UdIASB9jCB8zAIBgZngQwBAgEwgeYGCysGAQQBgt8TAQEBMIHWMCYG
+CCsGAQUFBwIBFhpodHRwOi8vY3BzLmxldHNlbmNyeXB0Lm9yZzCBqwYIKwYBBQUH
+AgIwgZ4MgZtUaGlzIENlcnRpZmljYXRlIG1heSBvbmx5IGJlIHJlbGllZCB1cG9u
+IGJ5IFJlbHlpbmcgUGFydGllcyBhbmQgb25seSBpbiBhY2NvcmRhbmNlIHdpdGgg
+dGhlIENlcnRpZmljYXRlIFBvbGljeSBmb3VuZCBhdCBodHRwczovL2xldHNlbmNy
+eXB0Lm9yZy9yZXBvc2l0b3J5LzANBgkqhkiG9w0BAQsFAAOCAQEAfYFqgHNvcrg3
+rBap+xTenkqlZl4WJNH2r4Zxy/JadjXpuRQL6gsa4qviJEkqOUYFwwCtFXhcfpwc
+7xXgXTvaSIuXjPPid4QyX8V1srEWO+onv9qKYGISYt8+4GPXbPuha7/4HW0cz2OX
+GDSWfgh0g30/29xmj/9YCcyBaTKBIg26SGfL7IbNtUeK5loM10KZafwnyWpcUeQD
+PTw01J/uq6OIg6OcITPjFSjY4LpDex9pHRjRJm9tZQf6oMybt1pB5DU5NxRhWQj7
+lvShx6jTkaHCAVQEtZ/lD9CsnNuyiHMewMeM51IgOtHxWeXhd3UbaeADx2ihRd1R
+iM2+7rfY1A==
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
MIIEkjCCA3qgAwIBAgIQCgFBQgAAAVOFc2oLheynCDANBgkqhkiG9w0BAQsFADA/
diff --git a/files/cert/demo.bitmask.net.crt b/files/cert/demo.bitmask.net.crt
index a237126..df44fbc 100644
--- a/files/cert/demo.bitmask.net.crt
+++ b/files/cert/demo.bitmask.net.crt
@@ -1,8 +1,8 @@
-----BEGIN CERTIFICATE-----
-MIIGBDCCBOygAwIBAgISBNlwJWcEpuRPR4P6f/sGz6psMA0GCSqGSIb3DQEBCwUA
+MIIGAzCCBOugAwIBAgISA5apx4RyPpIkOe9UFSRp3cpzMA0GCSqGSIb3DQEBCwUA
MEoxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MSMwIQYDVQQD
-ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMzAeFw0xNzA1MjQxMDAzMDBaFw0x
-NzA4MjIxMDAzMDBaMBsxGTAXBgNVBAMTEGRlbW8uYml0bWFzay5uZXQwggIiMA0G
+ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMzAeFw0xNzA2MjcwODE5MDBaFw0x
+NzA5MjUwODE5MDBaMBsxGTAXBgNVBAMTEGRlbW8uYml0bWFzay5uZXQwggIiMA0G
CSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCtPNOYXF7Gse1oYyj7CKkEEO9Br/3a
qpfxscTwzgDlufrfGOfLFVQrE6YlcZOJw2ADB1RE/b4vOYKvQ/HpbzdnfSZpJtAT
ngEHQIwmvHIdHmpxFHChyUwbdVtxH4Zb539JF2CyYsw9kp81uocFpduLxANwMhfV
@@ -14,24 +14,24 @@ mdARcsSX0Mxw4WlS68nx8ZfcAcg+uE3mcR0kEvQ6EuKiB84EdgFqZm75RJZd9tAD
0Sp8cvEDtZ1Y/3M048WTFn7J3F/xkl8fmz+b+RgYbEAxb3DCKPjbAQV1c11NYMdj
fxi0kJIbbjZzqqT6AZijcfEinxoVh9eaYVlnKefTXXumO8+G9HmgET+pTPOhg0xT
utqfP46QNd89gLQaNQik/xvtRxujGkvhm5TPF0YWtD8pr6JZK7V9ENBFqjy+1fID
-5cQwb5sJzzbfYQIDAQABo4ICETCCAg0wDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQW
+5cQwb5sJzzbfYQIDAQABo4ICEDCCAgwwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQW
MBQGCCsGAQUFBwMBBggrBgEFBQcDAjAMBgNVHRMBAf8EAjAAMB0GA1UdDgQWBBQ5
AmOl5jUq83up0czS1eGi1ArFtTAfBgNVHSMEGDAWgBSoSmpjBH3duubRObemRWXv
-86jsoTBwBggrBgEFBQcBAQRkMGIwLwYIKwYBBQUHMAGGI2h0dHA6Ly9vY3NwLmlu
-dC14My5sZXRzZW5jcnlwdC5vcmcvMC8GCCsGAQUFBzAChiNodHRwOi8vY2VydC5p
-bnQteDMubGV0c2VuY3J5cHQub3JnLzAbBgNVHREEFDASghBkZW1vLmJpdG1hc2su
-bmV0MIH+BgNVHSAEgfYwgfMwCAYGZ4EMAQIBMIHmBgsrBgEEAYLfEwEBATCB1jAm
-BggrBgEFBQcCARYaaHR0cDovL2Nwcy5sZXRzZW5jcnlwdC5vcmcwgasGCCsGAQUF
-BwICMIGeDIGbVGhpcyBDZXJ0aWZpY2F0ZSBtYXkgb25seSBiZSByZWxpZWQgdXBv
-biBieSBSZWx5aW5nIFBhcnRpZXMgYW5kIG9ubHkgaW4gYWNjb3JkYW5jZSB3aXRo
-IHRoZSBDZXJ0aWZpY2F0ZSBQb2xpY3kgZm91bmQgYXQgaHR0cHM6Ly9sZXRzZW5j
-cnlwdC5vcmcvcmVwb3NpdG9yeS8wDQYJKoZIhvcNAQELBQADggEBAEJKdEknJtiF
-f1sDcSvsmkhpOEMLw+GELTFQ7+3oJpYEPZsgKUX4+9dUNivJwy1j1cui3q1hm77B
-5Tq5RShcOZalmRVCgCHZwiq/BBvCsWNuXyMRyvEq/9SElaeEUuQL76SCNL4R4qvw
-Q/AX61uWE/oBwRrXMXGipsiMGlmGcd4xBNuhXT+Ky4BgqlnlSJKh+tC1sW40DBQN
-gC/JsY2s41i9zpXTWqH3W2AacEbeyjUYitCzW2FzGqLlRX8fQxN4g97IOYg15eEg
-ANB0g3G17KDyJqo1ElXSpTAuQWuZf7hkfP/hAoHppr21gM3FXEMPfgsO5hSBrJwM
-kx/ADq9125Y=
+86jsoTBvBggrBgEFBQcBAQRjMGEwLgYIKwYBBQUHMAGGImh0dHA6Ly9vY3NwLmlu
+dC14My5sZXRzZW5jcnlwdC5vcmcwLwYIKwYBBQUHMAKGI2h0dHA6Ly9jZXJ0Lmlu
+dC14My5sZXRzZW5jcnlwdC5vcmcvMBsGA1UdEQQUMBKCEGRlbW8uYml0bWFzay5u
+ZXQwgf4GA1UdIASB9jCB8zAIBgZngQwBAgEwgeYGCysGAQQBgt8TAQEBMIHWMCYG
+CCsGAQUFBwIBFhpodHRwOi8vY3BzLmxldHNlbmNyeXB0Lm9yZzCBqwYIKwYBBQUH
+AgIwgZ4MgZtUaGlzIENlcnRpZmljYXRlIG1heSBvbmx5IGJlIHJlbGllZCB1cG9u
+IGJ5IFJlbHlpbmcgUGFydGllcyBhbmQgb25seSBpbiBhY2NvcmRhbmNlIHdpdGgg
+dGhlIENlcnRpZmljYXRlIFBvbGljeSBmb3VuZCBhdCBodHRwczovL2xldHNlbmNy
+eXB0Lm9yZy9yZXBvc2l0b3J5LzANBgkqhkiG9w0BAQsFAAOCAQEAY5Y1UDTmtByI
+ETSr+5LxnrgLDmaQFX6QWHcomleHZo6gLn26Uu3t9OWE/bU/I17JQPxBUAlGZGyL
+iIXSEBC85uRyJbjvg2kpejYl387gxSi4loQGiVJfs4LxJhx3P9nY3/qo8spGB5BD
+e8wF7sti4klNQOvyke6PoXLoA4i9eFZnnz+IqtjDdOoMV/PqLNLi01F1jNx+MYJU
+1iBe096a/2xJZOX2CCOLRC28vZatXinTiE7+J2yqoTyBi6x9Z9DQi5RdHXUcthkE
+oR1wJSnmaWMKb4woNCH4mLDn7kMQDFNzQwORAIXEzLS8hOFbl3MYHYMXswp9Me9w
+VaTIrkjPhw==
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
MIIEkjCCA3qgAwIBAgIQCgFBQgAAAVOFc2oLheynCDANBgkqhkiG9w0BAQsFADA/
diff --git a/hiera/aardwolf.yaml b/hiera/aardwolf.yaml
index c2a4105..d9cc9cd 100644
--- a/hiera/aardwolf.yaml
+++ b/hiera/aardwolf.yaml
@@ -158,6 +158,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:
diff --git a/hiera/alpaca.yaml b/hiera/alpaca.yaml
index d2308c8..76800e5 100644
--- a/hiera/alpaca.yaml
+++ b/hiera/alpaca.yaml
@@ -312,6 +312,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:
diff --git a/hiera/ant.yaml b/hiera/ant.yaml
index 1803d38..606976b 100644
--- a/hiera/ant.yaml
+++ b/hiera/ant.yaml
@@ -35,6 +35,7 @@ couch:
development:
site_config: true
dns:
+ aliases: []
public: false
domain:
full: ant.demo.bitmask.net
@@ -71,8 +72,8 @@ mail:
smarthost: []
name: ant
platform:
- major_version: "0.9"
- version: "0.9"
+ major_version: "0.10"
+ version: "0.10"
service_type: internal_service
services:
- couchdb
@@ -86,18 +87,19 @@ sources:
revision: latest
type: apt
nickserver:
- revision: origin/version/0.9
+ revision: origin/master
source: "https://leap.se/git/nickserver"
type: git
platform:
apt:
- basic: "http://deb.leap.se/0.9"
+ basic: "http://deb.leap.se/platform"
+ component: master
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:
@@ -136,6 +138,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:
diff --git a/hiera/cat.yaml b/hiera/cat.yaml
index 2982903..dd9d491 100644
--- a/hiera/cat.yaml
+++ b/hiera/cat.yaml
@@ -162,6 +162,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:
diff --git a/hiera/clam.yaml b/hiera/clam.yaml
index d8f5855..765afe0 100644
--- a/hiera/clam.yaml
+++ b/hiera/clam.yaml
@@ -158,6 +158,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:
diff --git a/hiera/demodex.yaml b/hiera/demodex.yaml
index efb7673..8bc4863 100644
--- a/hiera/demodex.yaml
+++ b/hiera/demodex.yaml
@@ -99,6 +99,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:
diff --git a/hiera/donkey.yaml b/hiera/donkey.yaml
index e594443..1ca4f67 100644
--- a/hiera/donkey.yaml
+++ b/hiera/donkey.yaml
@@ -625,6 +625,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:
diff --git a/hiera/dotterel.yaml b/hiera/dotterel.yaml
index 2716a5f..c67196d 100644
--- a/hiera/dotterel.yaml
+++ b/hiera/dotterel.yaml
@@ -99,6 +99,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:
diff --git a/hiera/elephant.yaml b/hiera/elephant.yaml
index 6ec3883..8f9ae79 100644
--- a/hiera/elephant.yaml
+++ b/hiera/elephant.yaml
@@ -263,6 +263,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:
diff --git a/hiera/giraffe.yaml b/hiera/giraffe.yaml
index 8768bd8..cbad144 100644
--- a/hiera/giraffe.yaml
+++ b/hiera/giraffe.yaml
@@ -35,6 +35,7 @@ couch:
development:
site_config: true
dns:
+ aliases: []
public: true
domain:
full: giraffe.cdev.bitmask.net
@@ -106,7 +107,7 @@ sources:
platform:
apt:
basic: "http://deb.leap.se/experimental-platform"
- component: snapshots
+ component: master
soledad:
package: soledad-server
revision: latest
@@ -151,6 +152,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:
diff --git a/hiera/leech.yaml b/hiera/leech.yaml
index 3f9d269..90d6dcd 100644
--- a/hiera/leech.yaml
+++ b/hiera/leech.yaml
@@ -173,16 +173,6 @@ firewall:
- 6425
- 80
to: "198.252.153.85"
-haproxy:
- couch:
- listen_port: 4096
- servers:
- ant:
- backup: false
- host: localhost
- port: 4000
- weight: 100
- writable: true
hosts:
ant:
domain_full: ant.demo.bitmask.net
@@ -204,11 +194,12 @@ nickserver:
password: RakzTLdLzUerZc5ZqJNNjgUe9pLEVAaa
salt: 503757ff7b6528afba49d3a625a82729
username: nickserver
+ couchdb_port: 4000
domain: nicknym.demo.bitmask.net
port: 6425
platform:
- major_version: "0.9"
- version: "0.9"
+ major_version: "0.10"
+ version: "0.10"
service_type: public_service
services:
- webapp
@@ -222,18 +213,19 @@ sources:
revision: latest
type: apt
nickserver:
- revision: origin/version/0.9
+ revision: origin/master
source: "https://leap.se/git/nickserver"
type: git
platform:
apt:
- basic: "http://deb.leap.se/0.9"
+ basic: "http://deb.leap.se/platform"
+ component: master
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:
@@ -272,6 +264,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:
@@ -337,6 +332,7 @@ webapp:
password: PPWxBEwVQTvruUKKwWsdnuwxWrYD2uDP
salt: 85b233308446aaf350893a26731c3af4
username: admin
+ couchdb_port: 4000
couchdb_webapp_user:
password: EuxvQQJpHdKNzugx9qR9QCsRgZnYfJE2
salt: 296e9cb713018afb02273d68213ec8f5
@@ -398,6 +394,7 @@ webapp:
nagios_test_user:
password: asDCV5RKzagaU2SHjXV8FtMbSwbYWxDe
username: nagios_test
+ secret_key_base: qsBHRsyny8jNv7j4Kq8cEQP75H85H4Dk
secret_token: EIzVM3Y5K4bzeKRf75ebeR7q9ndRKWVD
secure: true
service_levels:
@@ -564,10 +561,10 @@ x509:
commercial_ca_cert: ~
commercial_cert: |
-----BEGIN CERTIFICATE-----
- MIIGBDCCBOygAwIBAgISBNlwJWcEpuRPR4P6f/sGz6psMA0GCSqGSIb3DQEBCwUA
+ MIIGAzCCBOugAwIBAgISA5apx4RyPpIkOe9UFSRp3cpzMA0GCSqGSIb3DQEBCwUA
MEoxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MSMwIQYDVQQD
- ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMzAeFw0xNzA1MjQxMDAzMDBaFw0x
- NzA4MjIxMDAzMDBaMBsxGTAXBgNVBAMTEGRlbW8uYml0bWFzay5uZXQwggIiMA0G
+ ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMzAeFw0xNzA2MjcwODE5MDBaFw0x
+ NzA5MjUwODE5MDBaMBsxGTAXBgNVBAMTEGRlbW8uYml0bWFzay5uZXQwggIiMA0G
CSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCtPNOYXF7Gse1oYyj7CKkEEO9Br/3a
qpfxscTwzgDlufrfGOfLFVQrE6YlcZOJw2ADB1RE/b4vOYKvQ/HpbzdnfSZpJtAT
ngEHQIwmvHIdHmpxFHChyUwbdVtxH4Zb539JF2CyYsw9kp81uocFpduLxANwMhfV
@@ -579,24 +576,24 @@ x509:
0Sp8cvEDtZ1Y/3M048WTFn7J3F/xkl8fmz+b+RgYbEAxb3DCKPjbAQV1c11NYMdj
fxi0kJIbbjZzqqT6AZijcfEinxoVh9eaYVlnKefTXXumO8+G9HmgET+pTPOhg0xT
utqfP46QNd89gLQaNQik/xvtRxujGkvhm5TPF0YWtD8pr6JZK7V9ENBFqjy+1fID
- 5cQwb5sJzzbfYQIDAQABo4ICETCCAg0wDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQW
+ 5cQwb5sJzzbfYQIDAQABo4ICEDCCAgwwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQW
MBQGCCsGAQUFBwMBBggrBgEFBQcDAjAMBgNVHRMBAf8EAjAAMB0GA1UdDgQWBBQ5
AmOl5jUq83up0czS1eGi1ArFtTAfBgNVHSMEGDAWgBSoSmpjBH3duubRObemRWXv
- 86jsoTBwBggrBgEFBQcBAQRkMGIwLwYIKwYBBQUHMAGGI2h0dHA6Ly9vY3NwLmlu
- dC14My5sZXRzZW5jcnlwdC5vcmcvMC8GCCsGAQUFBzAChiNodHRwOi8vY2VydC5p
- bnQteDMubGV0c2VuY3J5cHQub3JnLzAbBgNVHREEFDASghBkZW1vLmJpdG1hc2su
- bmV0MIH+BgNVHSAEgfYwgfMwCAYGZ4EMAQIBMIHmBgsrBgEEAYLfEwEBATCB1jAm
- BggrBgEFBQcCARYaaHR0cDovL2Nwcy5sZXRzZW5jcnlwdC5vcmcwgasGCCsGAQUF
- BwICMIGeDIGbVGhpcyBDZXJ0aWZpY2F0ZSBtYXkgb25seSBiZSByZWxpZWQgdXBv
- biBieSBSZWx5aW5nIFBhcnRpZXMgYW5kIG9ubHkgaW4gYWNjb3JkYW5jZSB3aXRo
- IHRoZSBDZXJ0aWZpY2F0ZSBQb2xpY3kgZm91bmQgYXQgaHR0cHM6Ly9sZXRzZW5j
- cnlwdC5vcmcvcmVwb3NpdG9yeS8wDQYJKoZIhvcNAQELBQADggEBAEJKdEknJtiF
- f1sDcSvsmkhpOEMLw+GELTFQ7+3oJpYEPZsgKUX4+9dUNivJwy1j1cui3q1hm77B
- 5Tq5RShcOZalmRVCgCHZwiq/BBvCsWNuXyMRyvEq/9SElaeEUuQL76SCNL4R4qvw
- Q/AX61uWE/oBwRrXMXGipsiMGlmGcd4xBNuhXT+Ky4BgqlnlSJKh+tC1sW40DBQN
- gC/JsY2s41i9zpXTWqH3W2AacEbeyjUYitCzW2FzGqLlRX8fQxN4g97IOYg15eEg
- ANB0g3G17KDyJqo1ElXSpTAuQWuZf7hkfP/hAoHppr21gM3FXEMPfgsO5hSBrJwM
- kx/ADq9125Y=
+ 86jsoTBvBggrBgEFBQcBAQRjMGEwLgYIKwYBBQUHMAGGImh0dHA6Ly9vY3NwLmlu
+ dC14My5sZXRzZW5jcnlwdC5vcmcwLwYIKwYBBQUHMAKGI2h0dHA6Ly9jZXJ0Lmlu
+ dC14My5sZXRzZW5jcnlwdC5vcmcvMBsGA1UdEQQUMBKCEGRlbW8uYml0bWFzay5u
+ ZXQwgf4GA1UdIASB9jCB8zAIBgZngQwBAgEwgeYGCysGAQQBgt8TAQEBMIHWMCYG
+ CCsGAQUFBwIBFhpodHRwOi8vY3BzLmxldHNlbmNyeXB0Lm9yZzCBqwYIKwYBBQUH
+ AgIwgZ4MgZtUaGlzIENlcnRpZmljYXRlIG1heSBvbmx5IGJlIHJlbGllZCB1cG9u
+ IGJ5IFJlbHlpbmcgUGFydGllcyBhbmQgb25seSBpbiBhY2NvcmRhbmNlIHdpdGgg
+ dGhlIENlcnRpZmljYXRlIFBvbGljeSBmb3VuZCBhdCBodHRwczovL2xldHNlbmNy
+ eXB0Lm9yZy9yZXBvc2l0b3J5LzANBgkqhkiG9w0BAQsFAAOCAQEAY5Y1UDTmtByI
+ ETSr+5LxnrgLDmaQFX6QWHcomleHZo6gLn26Uu3t9OWE/bU/I17JQPxBUAlGZGyL
+ iIXSEBC85uRyJbjvg2kpejYl387gxSi4loQGiVJfs4LxJhx3P9nY3/qo8spGB5BD
+ e8wF7sti4klNQOvyke6PoXLoA4i9eFZnnz+IqtjDdOoMV/PqLNLi01F1jNx+MYJU
+ 1iBe096a/2xJZOX2CCOLRC28vZatXinTiE7+J2yqoTyBi6x9Z9DQi5RdHXUcthkE
+ oR1wJSnmaWMKb4woNCH4mLDn7kMQDFNzQwORAIXEzLS8hOFbl3MYHYMXswp9Me9w
+ VaTIrkjPhw==
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
MIIEkjCCA3qgAwIBAgIQCgFBQgAAAVOFc2oLheynCDANBgkqhkiG9w0BAQsFADA/
diff --git a/hiera/lynx.yaml b/hiera/lynx.yaml
index 1b52831..25332c6 100644
--- a/hiera/lynx.yaml
+++ b/hiera/lynx.yaml
@@ -202,6 +202,7 @@ nickserver:
password: vjJAZqxPL4BeGKAEUVuBVK5MIba_aIY5
salt: eab38a050b5eb2569549f8e50cab9034
username: nickserver
+ couchdb_port: 4000
domain: nicknym.cdev.bitmask.net
port: 6425
platform:
@@ -229,7 +230,7 @@ sources:
platform:
apt:
basic: "http://deb.leap.se/experimental-platform"
- component: snapshots
+ component: master
soledad:
package: soledad-server
revision: latest
@@ -274,6 +275,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:
@@ -571,10 +575,10 @@ x509:
commercial_ca_cert: ~
commercial_cert: |
-----BEGIN CERTIFICATE-----
- MIIGBDCCBOygAwIBAgISA0peJ4wsDu9Ix9uCQOvFcmQmMA0GCSqGSIb3DQEBCwUA
+ MIIGAzCCBOugAwIBAgISA7dP48A8+v7gqalkjFUxkc6PMA0GCSqGSIb3DQEBCwUA
MEoxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MSMwIQYDVQQD
- ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMzAeFw0xNzA0MjcxOTM0MDBaFw0x
- NzA3MjYxOTM0MDBaMBsxGTAXBgNVBAMTEGNkZXYuYml0bWFzay5uZXQwggIiMA0G
+ ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMzAeFw0xNzA2MjcwODE5MDBaFw0x
+ NzA5MjUwODE5MDBaMBsxGTAXBgNVBAMTEGNkZXYuYml0bWFzay5uZXQwggIiMA0G
CSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDOSQHWGCuXnCz/MykBAugtPJUNu855
SPLEmKkKjg7mIsAPKWh9hXXXBi8PsE8GTQcFsjdv86nzLnfDYr0f7+PV8Fs4WxE+
hN8T8derrYM90Fbers9gmzIQORYE+iyXnuPSiGk5XBNTugDvr+fYMfvPf5b092SE
@@ -586,24 +590,24 @@ x509:
gpCeQOASYKO7OAptFNbLdS0QROJSK4tuQmbMLgGDHV69iXHdnupWzaCSYVZLHOLB
yMnLUz7YUHnONe5F8AnIEDSlDF9WqXSIJSY9zZsAZKI0vVdQTwNk6IDBzdQGHkuJ
2f1JSD7JVcVGtjyyxD8+yHB/BkBqsudFSyt4hVtZVbEcn9soKsHYjuVX3ItaJ1Zn
- WYfZkr+5L2O0bQIDAQABo4ICETCCAg0wDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQW
+ WYfZkr+5L2O0bQIDAQABo4ICEDCCAgwwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQW
MBQGCCsGAQUFBwMBBggrBgEFBQcDAjAMBgNVHRMBAf8EAjAAMB0GA1UdDgQWBBS0
4pvDNSzeeFpBBjvRTQC/4Sl2CjAfBgNVHSMEGDAWgBSoSmpjBH3duubRObemRWXv
- 86jsoTBwBggrBgEFBQcBAQRkMGIwLwYIKwYBBQUHMAGGI2h0dHA6Ly9vY3NwLmlu
- dC14My5sZXRzZW5jcnlwdC5vcmcvMC8GCCsGAQUFBzAChiNodHRwOi8vY2VydC5p
- bnQteDMubGV0c2VuY3J5cHQub3JnLzAbBgNVHREEFDASghBjZGV2LmJpdG1hc2su
- bmV0MIH+BgNVHSAEgfYwgfMwCAYGZ4EMAQIBMIHmBgsrBgEEAYLfEwEBATCB1jAm
- BggrBgEFBQcCARYaaHR0cDovL2Nwcy5sZXRzZW5jcnlwdC5vcmcwgasGCCsGAQUF
- BwICMIGeDIGbVGhpcyBDZXJ0aWZpY2F0ZSBtYXkgb25seSBiZSByZWxpZWQgdXBv
- biBieSBSZWx5aW5nIFBhcnRpZXMgYW5kIG9ubHkgaW4gYWNjb3JkYW5jZSB3aXRo
- IHRoZSBDZXJ0aWZpY2F0ZSBQb2xpY3kgZm91bmQgYXQgaHR0cHM6Ly9sZXRzZW5j
- cnlwdC5vcmcvcmVwb3NpdG9yeS8wDQYJKoZIhvcNAQELBQADggEBAGvQxptwz5wT
- 0FkHRkmZRQ45E3De/wv7p3a8wSkiDBR1Ohkk5j5dzzDLlGe4VGkVljp0YggsoGry
- 713Nu4EcTkrgm4pO4ZOYXoosQ9SOcFVYTHg9ji9IYx8hhHUogg3jPchcWAXdKFUS
- vEi2T42efqiOpnndc9qGgYnabLpa4xmeW4Bb2+WEHBSCmr0ogWeZ/2MMZWAMRY6/
- ahkTJYkvyZKQruZJled45EzIfPduZBh0eUP8RiqVhXpfuDvNxQougGlQctwXX3nf
- HQ4v109oL7Nqg0OuuQj70fqgRd2zjvKP9YkoY2vPTnrXH+pc8Xt3eJhtqlssogxh
- bhI0QAPaHoA=
+ 86jsoTBvBggrBgEFBQcBAQRjMGEwLgYIKwYBBQUHMAGGImh0dHA6Ly9vY3NwLmlu
+ dC14My5sZXRzZW5jcnlwdC5vcmcwLwYIKwYBBQUHMAKGI2h0dHA6Ly9jZXJ0Lmlu
+ dC14My5sZXRzZW5jcnlwdC5vcmcvMBsGA1UdEQQUMBKCEGNkZXYuYml0bWFzay5u
+ ZXQwgf4GA1UdIASB9jCB8zAIBgZngQwBAgEwgeYGCysGAQQBgt8TAQEBMIHWMCYG
+ CCsGAQUFBwIBFhpodHRwOi8vY3BzLmxldHNlbmNyeXB0Lm9yZzCBqwYIKwYBBQUH
+ AgIwgZ4MgZtUaGlzIENlcnRpZmljYXRlIG1heSBvbmx5IGJlIHJlbGllZCB1cG9u
+ IGJ5IFJlbHlpbmcgUGFydGllcyBhbmQgb25seSBpbiBhY2NvcmRhbmNlIHdpdGgg
+ dGhlIENlcnRpZmljYXRlIFBvbGljeSBmb3VuZCBhdCBodHRwczovL2xldHNlbmNy
+ eXB0Lm9yZy9yZXBvc2l0b3J5LzANBgkqhkiG9w0BAQsFAAOCAQEAfYFqgHNvcrg3
+ rBap+xTenkqlZl4WJNH2r4Zxy/JadjXpuRQL6gsa4qviJEkqOUYFwwCtFXhcfpwc
+ 7xXgXTvaSIuXjPPid4QyX8V1srEWO+onv9qKYGISYt8+4GPXbPuha7/4HW0cz2OX
+ GDSWfgh0g30/29xmj/9YCcyBaTKBIg26SGfL7IbNtUeK5loM10KZafwnyWpcUeQD
+ PTw01J/uq6OIg6OcITPjFSjY4LpDex9pHRjRJm9tZQf6oMybt1pB5DU5NxRhWQj7
+ lvShx6jTkaHCAVQEtZ/lD9CsnNuyiHMewMeM51IgOtHxWeXhd3UbaeADx2ihRd1R
+ iM2+7rfY1A==
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
MIIEkjCCA3qgAwIBAgIQCgFBQgAAAVOFc2oLheynCDANBgkqhkiG9w0BAQsFADA/
diff --git a/hiera/millipede.yaml b/hiera/millipede.yaml
index 528ccb8..5ddb35d 100644
--- a/hiera/millipede.yaml
+++ b/hiera/millipede.yaml
@@ -5,6 +5,7 @@ contacts:
development:
site_config: true
dns:
+ aliases: []
public: true
domain:
full: millipede.demo.bitmask.net
@@ -64,8 +65,8 @@ openvpn:
unlimited_prefix: UNLIMITED
user_ips: false
platform:
- major_version: "0.9"
- version: "0.9"
+ major_version: "0.10"
+ version: "0.10"
service_type: user_service
services:
- openvpn
@@ -79,18 +80,19 @@ sources:
revision: latest
type: apt
nickserver:
- revision: origin/version/0.9
+ revision: origin/master
source: "https://leap.se/git/nickserver"
type: git
platform:
apt:
- basic: "http://deb.leap.se/0.9"
+ basic: "http://deb.leap.se/platform"
+ component: master
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:
@@ -129,6 +131,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:
diff --git a/hiera/newt.yaml b/hiera/newt.yaml
index ce2a933..10a0bd5 100644
--- a/hiera/newt.yaml
+++ b/hiera/newt.yaml
@@ -99,6 +99,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:
diff --git a/hiera/orangutan.yaml b/hiera/orangutan.yaml
index 2cd7e4d..4100747 100644
--- a/hiera/orangutan.yaml
+++ b/hiera/orangutan.yaml
@@ -312,6 +312,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:
diff --git a/hiera/otter.yaml b/hiera/otter.yaml
index 9c150dc..9410959 100644
--- a/hiera/otter.yaml
+++ b/hiera/otter.yaml
@@ -5,6 +5,7 @@ contacts:
development:
site_config: true
dns:
+ aliases: []
public: true
domain:
full: otter.demo.bitmask.net
@@ -64,8 +65,8 @@ openvpn:
unlimited_prefix: UNLIMITED
user_ips: false
platform:
- major_version: "0.9"
- version: "0.9"
+ major_version: "0.10"
+ version: "0.10"
service_type: user_service
services:
- openvpn
@@ -80,18 +81,19 @@ sources:
revision: latest
type: apt
nickserver:
- revision: origin/version/0.9
+ revision: origin/master
source: "https://leap.se/git/nickserver"
type: git
platform:
apt:
- basic: "http://deb.leap.se/0.9"
+ basic: "http://deb.leap.se/platform"
+ component: master
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:
@@ -130,6 +132,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:
@@ -165,6 +170,7 @@ tor:
key_type: RSA
private_key: ~
public_key: ~
+ single_hop: false
nickname: otterdVuPt9yFz8SpKm
x509:
ca_cert: |
diff --git a/hiera/snail.yaml b/hiera/snail.yaml
index c95c651..fcd283b 100644
--- a/hiera/snail.yaml
+++ b/hiera/snail.yaml
@@ -198,6 +198,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:
diff --git a/hiera/tuatara.yaml b/hiera/tuatara.yaml
index 773a91f..2eef59f 100644
--- a/hiera/tuatara.yaml
+++ b/hiera/tuatara.yaml
@@ -131,6 +131,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:
diff --git a/secrets.json b/secrets.json
index 980188d..b7b8baa 100644
--- a/secrets.json
+++ b/secrets.json
@@ -79,25 +79,6 @@
"webapp_secret_key_base": "tJJRRyunKhskkdMP3MIJI4JBf5uByCs7",
"webapp_secret_token": "_DLZ7e9YhU_d3HDCWFzCMd3WnC4QaP__"
},
- "local": {
- "api_monitor_auth_token": "XcQ7zgwasRyDRMsqtAHqryyQhAJvkCkJ",
- "couch_admin_password": "DYteahy7AsW2D5WIz4X5q3rsfReeeWxa",
- "couch_admin_password_salt": "eadbc632626afd7cff088a94c3707aba",
- "couch_leap_mx_password": "bxMst74hQWy5qxExcqzauKBk5pB39mH5",
- "couch_leap_mx_password_salt": "4b8648301242da72c83633f97cab7891",
- "couch_nickserver_password": "XEPsTAhk7fUk2qPPppXJwcRtUvFnkwBd",
- "couch_nickserver_password_salt": "175f1f60caadeb6089f36a652ff0095f",
- "couch_replication_password": "FDrHVZdvkRBNZEjvgUIhAJvJvaVrKvpU",
- "couch_replication_password_salt": "74fb5c115eb1e2af664bf5041c6a0f7e",
- "couch_soledad_password": "sLEfLMmKkKVUKa5FU3CIytsVvBm2wuMU",
- "couch_soledad_password_salt": "b1f015a1559a570f5bea820e978be32b",
- "couch_webapp_password": "a87UpfHPAzffPKNYUteqPmNAqNAyqF3I",
- "couch_webapp_password_salt": "5bd67d150b855798f0b3400d2b6e9946",
- "nagios_admin_password": "ZfcYp3B3Ur2KSMdvtndRqmbUwphnpbSf",
- "nagios_test_password": "PvHF4XgdFkPHYd3vg7tdXcf8Lq7PzYPw",
- "webapp_secret_key_base": "DF5qQehebmYHbb83SP4x9fvJHm8Ueb78",
- "webapp_secret_token": "YFncSBPmT9We8mxHXSHcXTwf2NLj53zX"
- },
"singlenode": {
"api_monitor_auth_token": "B5H7F4taKMIcT7LkFQWmETKYDrdFI5TK",
"couch_admin_password": "MhLY9UXRZEqgIJpXAWUBMumHWVkJnzqr",
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-30 12:32:24 +0000