diff options
| -rw-r--r-- | files/cert/mail.bitmask.net.crt | 38 | ||||
| -rw-r--r-- | hiera/alpaca.yaml | 41 |
2 files changed, 40 insertions, 39 deletions
diff --git a/files/cert/mail.bitmask.net.crt b/files/cert/mail.bitmask.net.crt index 29d2514..f3569a2 100644 --- a/files/cert/mail.bitmask.net.crt +++ b/files/cert/mail.bitmask.net.crt @@ -1,8 +1,8 @@ -----BEGIN CERTIFICATE----- -MIIGBDCCBOygAwIBAgISA2jV0em8V7f1Bm0bvw1GeoQdMA0GCSqGSIb3DQEBCwUA +MIIGAzCCBOugAwIBAgISA+HNODqToQygEuZyxshvugKoMA0GCSqGSIb3DQEBCwUA MEoxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MSMwIQYDVQQD -ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMzAeFw0xNzA0MjcxOTM0MDBaFw0x -NzA3MjYxOTM0MDBaMBsxGTAXBgNVBAMTEG1haWwuYml0bWFzay5uZXQwggIiMA0G +ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMzAeFw0xNzA2MjMwNjQ3MDBaFw0x +NzA5MjEwNjQ3MDBaMBsxGTAXBgNVBAMTEG1haWwuYml0bWFzay5uZXQwggIiMA0G CSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCyhT0kMzDz58rdxvhtMh194Ob1AkDw vwvh5wglRJWRzCNT+HUolygX5lzae16qyygXBaiVu2NDo+LIwjxwLZF9BcGhUj5Z UXuuKvkA1EZnBXxoAUhrwUSk8hgpgTfecCa96OTOs9XRxVv6Brf0IGy55s3E6ARg @@ -14,24 +14,24 @@ z+yTeUgDW06IK4AeJblpVcYWvCCpxSRw1w2A8ioORrYPZLD2g7Vy7w6mn5kqsd6t chrJYNbivOAW4kBPxZXJwDmLSX8CA1W6Tj1AUB02yb+EDfuqSCNJ9lAe9hkCoDIP c5Ei7PJqy9UwJvrFCE2zYms98RFq0b4morFsH7jqfV1vtB1UgqhwZC5e8UoTIrO/ 74PLKdjx+48/JaXCZTqLEhCcvcwGQXHaunV98yd4xS0v3+5UjWxtPzqwDPBryq8A -tZVm/kfUH9MhzwIDAQABo4ICETCCAg0wDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQW +tZVm/kfUH9MhzwIDAQABo4ICEDCCAgwwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQW MBQGCCsGAQUFBwMBBggrBgEFBQcDAjAMBgNVHRMBAf8EAjAAMB0GA1UdDgQWBBQs JD85ZNdyW6CMP/fI0IRmMhHtWjAfBgNVHSMEGDAWgBSoSmpjBH3duubRObemRWXv -86jsoTBwBggrBgEFBQcBAQRkMGIwLwYIKwYBBQUHMAGGI2h0dHA6Ly9vY3NwLmlu -dC14My5sZXRzZW5jcnlwdC5vcmcvMC8GCCsGAQUFBzAChiNodHRwOi8vY2VydC5p -bnQteDMubGV0c2VuY3J5cHQub3JnLzAbBgNVHREEFDASghBtYWlsLmJpdG1hc2su -bmV0MIH+BgNVHSAEgfYwgfMwCAYGZ4EMAQIBMIHmBgsrBgEEAYLfEwEBATCB1jAm -BggrBgEFBQcCARYaaHR0cDovL2Nwcy5sZXRzZW5jcnlwdC5vcmcwgasGCCsGAQUF -BwICMIGeDIGbVGhpcyBDZXJ0aWZpY2F0ZSBtYXkgb25seSBiZSByZWxpZWQgdXBv -biBieSBSZWx5aW5nIFBhcnRpZXMgYW5kIG9ubHkgaW4gYWNjb3JkYW5jZSB3aXRo -IHRoZSBDZXJ0aWZpY2F0ZSBQb2xpY3kgZm91bmQgYXQgaHR0cHM6Ly9sZXRzZW5j -cnlwdC5vcmcvcmVwb3NpdG9yeS8wDQYJKoZIhvcNAQELBQADggEBAJT6QTaabR4u -UgBsKhUYwshrDRaYmvVzBRJ9ICaN257Vhu2LW34EUxoBdjhxqsTe7yNbhJ2ql/w8 -KWWZeamntEqr0ySR9Eqtem8Mwk7H2Vfll0A8G2z2G+HOeTFXF4nPPTIGCEszpADo -tS8QxiQ2GM/0J7HRMXFzhcwIzPjPp3Aj+B5u+4i+pX1jBRgpZaHbwIu9yWBg3J/m -XRffzuWOxb19EnXrLVbR46j1GFOa8VfqHUSnUE8EpNk6v4BLfGiaBzCzO7ke9D+Y -haZuuleKBTU7iKIK1DHRp7fEYaaSjL2LcHzk1IIUS1FbbjYILtMJNrZvwwGmjost -sul+NBr5itY= +86jsoTBvBggrBgEFBQcBAQRjMGEwLgYIKwYBBQUHMAGGImh0dHA6Ly9vY3NwLmlu +dC14My5sZXRzZW5jcnlwdC5vcmcwLwYIKwYBBQUHMAKGI2h0dHA6Ly9jZXJ0Lmlu +dC14My5sZXRzZW5jcnlwdC5vcmcvMBsGA1UdEQQUMBKCEG1haWwuYml0bWFzay5u +ZXQwgf4GA1UdIASB9jCB8zAIBgZngQwBAgEwgeYGCysGAQQBgt8TAQEBMIHWMCYG +CCsGAQUFBwIBFhpodHRwOi8vY3BzLmxldHNlbmNyeXB0Lm9yZzCBqwYIKwYBBQUH +AgIwgZ4MgZtUaGlzIENlcnRpZmljYXRlIG1heSBvbmx5IGJlIHJlbGllZCB1cG9u +IGJ5IFJlbHlpbmcgUGFydGllcyBhbmQgb25seSBpbiBhY2NvcmRhbmNlIHdpdGgg +dGhlIENlcnRpZmljYXRlIFBvbGljeSBmb3VuZCBhdCBodHRwczovL2xldHNlbmNy +eXB0Lm9yZy9yZXBvc2l0b3J5LzANBgkqhkiG9w0BAQsFAAOCAQEAdeEYkVtrb/0U +PtgecC6sPrmK7YPh6zl1lEy2pymRmZpw/Jk2K8J2Yr+F8OrM8amJwJ1g7wAHNmEf +5lxrCsEPV+6AKPd4+WJNqNTql26m+2jY3N4xnpBW96NAaRtJFue6I96gXb4wetFu +jDQ8fbLbYsFCxOwnE1f+ZiCuJsc0d+A51PyzT4r4OhDxVYUSQrlMziZXVt8gGI3L +y/hMdmTI6EIyOf1JiYNzRcTAuTQ/2+EF1yqjX+UX9C0TEeiC9EOocghmS9slTw+m +OuLlrQ921sPt00xWFK9z6SRjxRKJp5mHHA9kCZHHDAdrUDfHfB5hMODmo99D+6oG +A0/5QcbnZA== -----END CERTIFICATE----- -----BEGIN CERTIFICATE----- MIIEkjCCA3qgAwIBAgIQCgFBQgAAAVOFc2oLheynCDANBgkqhkiG9w0BAQsFADA/ diff --git a/hiera/alpaca.yaml b/hiera/alpaca.yaml index ce5ba12..d2308c8 100644 --- a/hiera/alpaca.yaml +++ b/hiera/alpaca.yaml @@ -229,6 +229,7 @@ nickserver: password: bLzbnE92Jw8U7LFrVmMJp3nNn4hx3Knn salt: 2ae7eb5c935d25aea5ac82b87d2e6298 username: nickserver + couchdb_port: 5984 domain: nicknym.mail.bitmask.net port: 6425 platform: @@ -266,7 +267,7 @@ sources: platform: apt: basic: "http://deb.leap.se/platform" - component: snapshots + component: master soledad: package: soledad-server revision: latest @@ -605,10 +606,10 @@ x509: commercial_ca_cert: ~ commercial_cert: | -----BEGIN CERTIFICATE----- - MIIGBDCCBOygAwIBAgISA2jV0em8V7f1Bm0bvw1GeoQdMA0GCSqGSIb3DQEBCwUA + MIIGAzCCBOugAwIBAgISA+HNODqToQygEuZyxshvugKoMA0GCSqGSIb3DQEBCwUA MEoxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MSMwIQYDVQQD - ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMzAeFw0xNzA0MjcxOTM0MDBaFw0x - NzA3MjYxOTM0MDBaMBsxGTAXBgNVBAMTEG1haWwuYml0bWFzay5uZXQwggIiMA0G + ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMzAeFw0xNzA2MjMwNjQ3MDBaFw0x + NzA5MjEwNjQ3MDBaMBsxGTAXBgNVBAMTEG1haWwuYml0bWFzay5uZXQwggIiMA0G CSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCyhT0kMzDz58rdxvhtMh194Ob1AkDw vwvh5wglRJWRzCNT+HUolygX5lzae16qyygXBaiVu2NDo+LIwjxwLZF9BcGhUj5Z UXuuKvkA1EZnBXxoAUhrwUSk8hgpgTfecCa96OTOs9XRxVv6Brf0IGy55s3E6ARg @@ -620,24 +621,24 @@ x509: chrJYNbivOAW4kBPxZXJwDmLSX8CA1W6Tj1AUB02yb+EDfuqSCNJ9lAe9hkCoDIP c5Ei7PJqy9UwJvrFCE2zYms98RFq0b4morFsH7jqfV1vtB1UgqhwZC5e8UoTIrO/ 74PLKdjx+48/JaXCZTqLEhCcvcwGQXHaunV98yd4xS0v3+5UjWxtPzqwDPBryq8A - tZVm/kfUH9MhzwIDAQABo4ICETCCAg0wDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQW + tZVm/kfUH9MhzwIDAQABo4ICEDCCAgwwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQW MBQGCCsGAQUFBwMBBggrBgEFBQcDAjAMBgNVHRMBAf8EAjAAMB0GA1UdDgQWBBQs JD85ZNdyW6CMP/fI0IRmMhHtWjAfBgNVHSMEGDAWgBSoSmpjBH3duubRObemRWXv - 86jsoTBwBggrBgEFBQcBAQRkMGIwLwYIKwYBBQUHMAGGI2h0dHA6Ly9vY3NwLmlu - dC14My5sZXRzZW5jcnlwdC5vcmcvMC8GCCsGAQUFBzAChiNodHRwOi8vY2VydC5p - bnQteDMubGV0c2VuY3J5cHQub3JnLzAbBgNVHREEFDASghBtYWlsLmJpdG1hc2su - bmV0MIH+BgNVHSAEgfYwgfMwCAYGZ4EMAQIBMIHmBgsrBgEEAYLfEwEBATCB1jAm - BggrBgEFBQcCARYaaHR0cDovL2Nwcy5sZXRzZW5jcnlwdC5vcmcwgasGCCsGAQUF - BwICMIGeDIGbVGhpcyBDZXJ0aWZpY2F0ZSBtYXkgb25seSBiZSByZWxpZWQgdXBv - biBieSBSZWx5aW5nIFBhcnRpZXMgYW5kIG9ubHkgaW4gYWNjb3JkYW5jZSB3aXRo - IHRoZSBDZXJ0aWZpY2F0ZSBQb2xpY3kgZm91bmQgYXQgaHR0cHM6Ly9sZXRzZW5j - cnlwdC5vcmcvcmVwb3NpdG9yeS8wDQYJKoZIhvcNAQELBQADggEBAJT6QTaabR4u - UgBsKhUYwshrDRaYmvVzBRJ9ICaN257Vhu2LW34EUxoBdjhxqsTe7yNbhJ2ql/w8 - KWWZeamntEqr0ySR9Eqtem8Mwk7H2Vfll0A8G2z2G+HOeTFXF4nPPTIGCEszpADo - tS8QxiQ2GM/0J7HRMXFzhcwIzPjPp3Aj+B5u+4i+pX1jBRgpZaHbwIu9yWBg3J/m - XRffzuWOxb19EnXrLVbR46j1GFOa8VfqHUSnUE8EpNk6v4BLfGiaBzCzO7ke9D+Y - haZuuleKBTU7iKIK1DHRp7fEYaaSjL2LcHzk1IIUS1FbbjYILtMJNrZvwwGmjost - sul+NBr5itY= + 86jsoTBvBggrBgEFBQcBAQRjMGEwLgYIKwYBBQUHMAGGImh0dHA6Ly9vY3NwLmlu + dC14My5sZXRzZW5jcnlwdC5vcmcwLwYIKwYBBQUHMAKGI2h0dHA6Ly9jZXJ0Lmlu + dC14My5sZXRzZW5jcnlwdC5vcmcvMBsGA1UdEQQUMBKCEG1haWwuYml0bWFzay5u + ZXQwgf4GA1UdIASB9jCB8zAIBgZngQwBAgEwgeYGCysGAQQBgt8TAQEBMIHWMCYG + CCsGAQUFBwIBFhpodHRwOi8vY3BzLmxldHNlbmNyeXB0Lm9yZzCBqwYIKwYBBQUH + AgIwgZ4MgZtUaGlzIENlcnRpZmljYXRlIG1heSBvbmx5IGJlIHJlbGllZCB1cG9u + IGJ5IFJlbHlpbmcgUGFydGllcyBhbmQgb25seSBpbiBhY2NvcmRhbmNlIHdpdGgg + dGhlIENlcnRpZmljYXRlIFBvbGljeSBmb3VuZCBhdCBodHRwczovL2xldHNlbmNy + eXB0Lm9yZy9yZXBvc2l0b3J5LzANBgkqhkiG9w0BAQsFAAOCAQEAdeEYkVtrb/0U + PtgecC6sPrmK7YPh6zl1lEy2pymRmZpw/Jk2K8J2Yr+F8OrM8amJwJ1g7wAHNmEf + 5lxrCsEPV+6AKPd4+WJNqNTql26m+2jY3N4xnpBW96NAaRtJFue6I96gXb4wetFu + jDQ8fbLbYsFCxOwnE1f+ZiCuJsc0d+A51PyzT4r4OhDxVYUSQrlMziZXVt8gGI3L + y/hMdmTI6EIyOf1JiYNzRcTAuTQ/2+EF1yqjX+UX9C0TEeiC9EOocghmS9slTw+m + OuLlrQ921sPt00xWFK9z6SRjxRKJp5mHHA9kCZHHDAdrUDfHfB5hMODmo99D+6oG + A0/5QcbnZA== -----END CERTIFICATE----- -----BEGIN CERTIFICATE----- MIIEkjCCA3qgAwIBAgIQCgFBQgAAAVOFc2oLheynCDANBgkqhkiG9w0BAQsFADA/ |