summaryrefslogtreecommitdiff
path: root/hiera
diff options
context:
space:
mode:
authorkwadronaut <kwadronaut@leap.se>2017-07-27 15:11:01 +0200
committerkwadronaut <kwadronaut@leap.se>2017-07-27 15:11:01 +0200
commit3c1a398afccc33bda1af403d1e8aa87b4ca385bc (patch)
tree064fb91d2d1b0c8c3e92d717f93901cac11add4d /hiera
parentf48d7ec5037bf3373cad3486b82dcb8f52c5cfee (diff)
deploy newer leap_mx again to alpaca
https://0xacab.org/leap/leap_mx/issues/8660 https://0xacab.org/leap/leap_mx/issues/8665 Doesn't seem solved yet. Also updated certs for mail.demo
Diffstat (limited to 'hiera')
-rw-r--r--hiera/alpaca.yaml23
1 files changed, 13 insertions, 10 deletions
diff --git a/hiera/alpaca.yaml b/hiera/alpaca.yaml
index 76800e5..1fa94a9 100644
--- a/hiera/alpaca.yaml
+++ b/hiera/alpaca.yaml
@@ -306,6 +306,9 @@ ssh:
key: AAAAB3NzaC1yc2EAAAADAQABAAACAQDOrTTNY60n/eMKFG4twVfInoO54HEqK2wlETb+Pe91W4sOSPaBtsP4xvk1hj/7WVg1fUN7B2MhYHZRmppyS2eMQGlaBbziFzlm3+rqn997l4CZxxkFsCINFvik60vQjdWn1Qh5gtaTWPLp8igjF43+3FdZZk8arS2AQgHixQdZ0XfjpBvvxpP3DI/VEOgOaCEI8XkDj8WTAkeQxrFmX3/TxbvGARdfYvJwYEC2qE3WABbI+DVOJfLsFmv8RW62ax8ErA63Yy3RWsgnv2Nzxwi6o6MmWcr14f1gpPybPK8KrZNJoJkDVceDTVwdTxwUfjOrI8df8NiFLVR3/lEGX+Cnd0UeKzk5Tqy84g1+MDGWkRDVyplB24fFxi/ujInlasew3uTYS2waZkNrroU2B8VO36xj8C8bn2sf3818hvjS4XD+lvpwKrKaWwWFTM89Xvu/K9KHFn3+58EbcyE88MAzuqrgDarkeXCdVT9Re0OUchmul3JOz9OnV1Osv0yi9pRCaAGTKAivnbN8DwmALz8d9FBTMxbcBgEqqGvyNe7muYTQtvTvfcKHdtF/MlTibte8YIbj7UX+c19A1VxX1eFU7mbfSxW1zXok1D0o+cUfcyUFauq6YMNDK1+FrMID+Mrm86woKB5gOmQRLJ9BARcKl9GZY2YnQAat9hRHQR8O2Q==
type: ssh-rsa
kwadronaut:
+ key: AAAAC3NzaC1lZDI1NTE5AAAAIBGRfVmBUpsLdFPae/ni0NYMbb5QR87MevNggi/wHHjl
+ type: ssh-ed25519
+ kwadronaut2:
key: AAAAB3NzaC1yc2EAAAADAQABAAABAQDnqWoPwiIAylx7wncIz3dl1Pi14/vr9El2tCb3E/nVfbX5VoGyHP8jnGkbaxwWZoTbSXl+ZlUz1Tw0qwDOQleVHXaUVmKZc8ni5crW6G1wGGEfE4ncSn35JWjFcZJTKq7a8DmQuDZDpUdbmz/XFtO3bu8DjpyNW2+7Fn+wHZPWXoDnjQBNryCS0M13thlH8PoGvm9rfRKn9upaTYV7hmF2FmQfMIq68x40DBeKCXA2VomFqeBIjZ/kDQJBZDbTrlp8lIX5h+qqHjJ6cPJvKeMSAaR3mXB4yekFOFcKZJqfFaRiJ1qxpHCdAwxxsklI+8e+CBCh2pJB3TBrJliccwwv
type: ssh-rsa
meskio:
@@ -609,10 +612,10 @@ x509:
commercial_ca_cert: ~
commercial_cert: |
-----BEGIN CERTIFICATE-----
- MIIGAzCCBOugAwIBAgISA+HNODqToQygEuZyxshvugKoMA0GCSqGSIb3DQEBCwUA
+ MIIGAzCCBOugAwIBAgISAyzV76GxnPpv+dpLE9XQBn+qMA0GCSqGSIb3DQEBCwUA
MEoxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MSMwIQYDVQQD
- ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMzAeFw0xNzA2MjMwNjQ3MDBaFw0x
- NzA5MjEwNjQ3MDBaMBsxGTAXBgNVBAMTEG1haWwuYml0bWFzay5uZXQwggIiMA0G
+ ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMzAeFw0xNzA3MjcxMDUyMDBaFw0x
+ NzEwMjUxMDUyMDBaMBsxGTAXBgNVBAMTEG1haWwuYml0bWFzay5uZXQwggIiMA0G
CSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCyhT0kMzDz58rdxvhtMh194Ob1AkDw
vwvh5wglRJWRzCNT+HUolygX5lzae16qyygXBaiVu2NDo+LIwjxwLZF9BcGhUj5Z
UXuuKvkA1EZnBXxoAUhrwUSk8hgpgTfecCa96OTOs9XRxVv6Brf0IGy55s3E6ARg
@@ -635,13 +638,13 @@ x509:
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==
+ eXB0Lm9yZy9yZXBvc2l0b3J5LzANBgkqhkiG9w0BAQsFAAOCAQEAbrFJyUBB5JVl
+ KZzxh6UJwdRK1KuO1msvyBuFROgbz7yOn+Gr3yjAnPFQWQ4cbQv8ScpF+TjG4+rE
+ KHQT+uc8dLOR3v47swz3/w+/UHsHOI+HhEDMC3pIKKNSvo8HH+PqOFKN7xVkdoxq
+ Ou1zVB7kJK8iRNFX+2GFCHmZ5BLnsuFFQ0fprA7QzU5IoMKv8YzzHgeki2WLMa+M
+ F2qZ41dOmCbuRN8zJCNJIWHsWf6kjGOhnqMo05CV3LPbk8yfEkb2Hn/06BokiLTc
+ LXz3AxPdV/kKfz6Hl8ki4xSTU/wZY7NnOKKkD0CSiuEMFq9/TCcGbFYIs/gaAFkd
+ 7tPCvm+s0Q==
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
MIIEkjCCA3qgAwIBAgIQCgFBQgAAAVOFc2oLheynCDANBgkqhkiG9w0BAQsFADA/