diff options
| author | elijah <elijah@riseup.net> | 2016-12-21 10:05:23 -0800 |
|---|---|---|
| committer | elijah <elijah@riseup.net> | 2016-12-21 10:05:23 -0800 |
| commit | c8491856e746d2cf6a00b42ab6de065eb1be6da4 (patch) | |
| tree | ccfaac5e5fa86bf18f03fd540381d431ca54b773 /hiera/alpaca.yaml | |
| parent | ef88a9601ef4870440cd17fa26b58d732b5ff0eb (diff) | |
renew certs and recompile
Diffstat (limited to 'hiera/alpaca.yaml')
| -rw-r--r-- | hiera/alpaca.yaml | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/hiera/alpaca.yaml b/hiera/alpaca.yaml index 660c5ea..e585b66 100644 --- a/hiera/alpaca.yaml +++ b/hiera/alpaca.yaml @@ -213,9 +213,6 @@ mx: selector: babcfe98e4 key_lookup_domain: mail.bitmask.net mynetworks: - - "176.53.69.13" - - "176.53.69.14" - - "176.53.69.22" - "198.252.153.82" - "198.252.153.83" - "198.252.153.85" @@ -230,6 +227,9 @@ mynetworks: - "37.218.242.145" - "37.218.242.146" - "37.218.242.147" + - "37.218.242.213" + - "37.218.242.214" + - "37.218.242.215" - "46.165.242.166" - "85.17.92.143" name: alpaca @@ -269,7 +269,7 @@ sources: revision: latest type: apt nickserver: - revision: origin/version/0.8 + revision: origin/version/0.9 source: "https://leap.se/git/nickserver" type: git platform: @@ -429,6 +429,7 @@ webapp: - tickets - vmail - www-data + invite_required: false locales: - de - en @@ -607,10 +608,10 @@ x509: commercial_ca_cert: ~ commercial_cert: | -----BEGIN CERTIFICATE----- - MIIGBDCCBOygAwIBAgISAwfiqotPQrmC36ueT+dyrClKMA0GCSqGSIb3DQEBCwUA + MIIGBDCCBOygAwIBAgISA7SdPRMt6bZMxW6kml1g5C/zMA0GCSqGSIb3DQEBCwUA MEoxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MSMwIQYDVQQD - ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMzAeFw0xNjEwMDQxNzMwMDBaFw0x - NzAxMDIxNzMwMDBaMBsxGTAXBgNVBAMTEG1haWwuYml0bWFzay5uZXQwggIiMA0G + ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMzAeFw0xNjEyMjExNjE1MDBaFw0x + NzAzMjExNjE1MDBaMBsxGTAXBgNVBAMTEG1haWwuYml0bWFzay5uZXQwggIiMA0G CSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCyhT0kMzDz58rdxvhtMh194Ob1AkDw vwvh5wglRJWRzCNT+HUolygX5lzae16qyygXBaiVu2NDo+LIwjxwLZF9BcGhUj5Z UXuuKvkA1EZnBXxoAUhrwUSk8hgpgTfecCa96OTOs9XRxVv6Brf0IGy55s3E6ARg @@ -633,13 +634,13 @@ x509: BwICMIGeDIGbVGhpcyBDZXJ0aWZpY2F0ZSBtYXkgb25seSBiZSByZWxpZWQgdXBv biBieSBSZWx5aW5nIFBhcnRpZXMgYW5kIG9ubHkgaW4gYWNjb3JkYW5jZSB3aXRo IHRoZSBDZXJ0aWZpY2F0ZSBQb2xpY3kgZm91bmQgYXQgaHR0cHM6Ly9sZXRzZW5j - cnlwdC5vcmcvcmVwb3NpdG9yeS8wDQYJKoZIhvcNAQELBQADggEBACtp8JUhWwj9 - /VYiHiXVEpk/4JWHEVFzMPwDvsstlSNHuwX4ZawRDvrKWEL5d66R2R6X0GZbk8IL - wBFN/1OTfGZ7Ykthd+jEIJwC+9xazTdWBt4PXtCS37K/6i2EgUgiOcxw/odD/R/5 - uZs/oLSwqI5snMWlwvEXZaM7JzAc+2O1UPFkf238ta0J2hRTjKGNkTVjtlwXyb/d - 0uICbQHbx46ewBAkKQxz5Oguf16GTeTHD8yL6fE2ce5ArnvOMq3PnYyVGe4amKy4 - 1pXTu391kuXRba3lrV5gez2YUDP4xbWsHzs5uKDpIUHm7bWCmrIhAaJRpnhMNVtE - /pdP8PNVarc= + cnlwdC5vcmcvcmVwb3NpdG9yeS8wDQYJKoZIhvcNAQELBQADggEBADrXkPpe20wb + Siu+PXDn4JoHUNv3eHyEVje8/pf0KBPKbIecPC/s0R+md15mww9Wxw/WGMBZqaG6 + d3DX207YVAxEOzchSOgrewyZ2GKVGJnOUxcW51z+OUmqJJObLf1vMSFdJC9vUbSZ + 1ZhqYo2fJvjYXupoJfZgCmH5nu1I6xmMf9GZJneZublV41nah+9QoBw1U5jxOlZY + 2NKWPKMUVF29tsaLp4t4rUwUYXNxsaZ5Hj9iOwjdfX3mR1aXbLhOQN32Hh4lbipV + V9DsFjBOFHpRdPoF6xO1Jbg394EvHtDt9ln1PafFmCSavBXY0HWLqulweF8QxrF3 + Tc+d2szba48= -----END CERTIFICATE----- -----BEGIN CERTIFICATE----- MIIEkjCCA3qgAwIBAgIQCgFBQgAAAVOFc2oLheynCDANBgkqhkiG9w0BAQsFADA/ |