diff options
| author | drebs <drebs@leap.se> | 2016-12-20 19:16:16 -0200 |
|---|---|---|
| committer | drebs <drebs@leap.se> | 2016-12-20 19:16:16 -0200 |
| commit | 86e589ab0070d958c71bbae575d04a3ec281c4af (patch) | |
| tree | 79ae8f7453f3f417ae4b7be373f98c3e0084915e | |
| parent | 38e8e7b31b1b9deb39019ef8a1607d494022fab3 (diff) | |
renew certs for cdev.bitmask.net
| -rw-r--r-- | Leapfile | 2 | ||||
| -rw-r--r-- | files/cert/cdev.bitmask.net.crt | 20 | ||||
| -rw-r--r-- | hiera/lynx.yaml | 11 | ||||
| -rw-r--r-- | hiera/zebra.yaml | 4 |
4 files changed, 19 insertions, 18 deletions
@@ -1,2 +1,2 @@ -@platform_directory_path = '../leap_platform' +@platform_directory_path = '../platform' @log = "/var/log/leap/bitmask.log" diff --git a/files/cert/cdev.bitmask.net.crt b/files/cert/cdev.bitmask.net.crt index 4ed0e29..8cc5d72 100644 --- a/files/cert/cdev.bitmask.net.crt +++ b/files/cert/cdev.bitmask.net.crt @@ -1,8 +1,8 @@ -----BEGIN CERTIFICATE----- -MIIGBDCCBOygAwIBAgISA0C52ubsyFgaJwvEsAWRgqEZMA0GCSqGSIb3DQEBCwUA +MIIGBDCCBOygAwIBAgISA8jnc/dAC8bI1ie/jPMnCvAMMA0GCSqGSIb3DQEBCwUA MEoxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MSMwIQYDVQQD -ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMzAeFw0xNjEwMDIyMTMzMDBaFw0x -NjEyMzEyMTMzMDBaMBsxGTAXBgNVBAMTEGNkZXYuYml0bWFzay5uZXQwggIiMA0G +ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMzAeFw0xNjEyMjAyMDE3MDBaFw0x +NzAzMjAyMDE3MDBaMBsxGTAXBgNVBAMTEGNkZXYuYml0bWFzay5uZXQwggIiMA0G CSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDOSQHWGCuXnCz/MykBAugtPJUNu855 SPLEmKkKjg7mIsAPKWh9hXXXBi8PsE8GTQcFsjdv86nzLnfDYr0f7+PV8Fs4WxE+ hN8T8derrYM90Fbers9gmzIQORYE+iyXnuPSiGk5XBNTugDvr+fYMfvPf5b092SE @@ -25,13 +25,13 @@ BggrBgEFBQcCARYaaHR0cDovL2Nwcy5sZXRzZW5jcnlwdC5vcmcwgasGCCsGAQUF BwICMIGeDIGbVGhpcyBDZXJ0aWZpY2F0ZSBtYXkgb25seSBiZSByZWxpZWQgdXBv biBieSBSZWx5aW5nIFBhcnRpZXMgYW5kIG9ubHkgaW4gYWNjb3JkYW5jZSB3aXRo IHRoZSBDZXJ0aWZpY2F0ZSBQb2xpY3kgZm91bmQgYXQgaHR0cHM6Ly9sZXRzZW5j -cnlwdC5vcmcvcmVwb3NpdG9yeS8wDQYJKoZIhvcNAQELBQADggEBADFaDkKcaU9G -3r1WaGmHWqYwM08s9m/mTx4JiT1fqpO53LodCNfrdRl8rhr0VBMYNL0UIETKVA9j -1ruJEde1J4nyk7i8iD8WXsLwipQIWvuMXEto2CW4FFxFcm9s99ilLsE6E3Bl20YA -m1IzoosBiT0S0tCLzcGxEK42Si//uY0+Bqiw2iaoK5wdS251dSbmORPW3ISbXiFm -JRP4GM8jgciSMfR04WW5Y/M4/5XIlEOArRxjMYqthHvHCXgTzWsTlcQPSKo25EDX -hdWiOWuyQ8ljdFjK8ugdLd4kNxXROEuoVodGnK70sUUEEE9XBFW/1DaIrdTNX2m4 -wVIHAVSETaI= +cnlwdC5vcmcvcmVwb3NpdG9yeS8wDQYJKoZIhvcNAQELBQADggEBAC5yMU0olaVZ +Xx0qCZyZsk8+IbJof4OpDIKQK+p8dlJiOvdbLwmEKq5eE4I30gdp4NCdAcAZ7sLa +oOqz0TOTPArMO7agjSKuAUnZ7S1+ZNQqVZsZJM9+N7MZqd/gB8K6xfisSP9tUMbc +/8PFesWndpFtrHvN7xpNYgp9ilOz/CGJWNZdXuOEFDbe+dz8Km9B+DiNs1SL6y6N +es/W/CiUstT1Dr6LY///LD4I7mrFIOcJV3MTfzb7LYO4a2nKuyMWaj60k0xewMUd +deYJvotp0qooCTYdNXYjYegBY4+hZ0VY6ncgTaz20NW9ZpwIMi+ZUPs0KjG+uoYU +kD3P+Nwrtfs= -----END CERTIFICATE----- -----BEGIN CERTIFICATE----- MIIEkjCCA3qgAwIBAgIQCgFBQgAAAVOFc2oLheynCDANBgkqhkiG9w0BAQsFADA/ diff --git a/hiera/lynx.yaml b/hiera/lynx.yaml index fe326d5..62e7e02 100644 --- a/hiera/lynx.yaml +++ b/hiera/lynx.yaml @@ -186,9 +186,6 @@ mx: selector: babcfe98e4 key_lookup_domain: cdev.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" @@ -203,6 +200,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: lynx @@ -232,7 +232,7 @@ sources: revision: latest type: apt nickserver: - revision: origin/version/0.8 + revision: origin/master source: "https://leap.se/git/nickserver" type: git platform: @@ -243,7 +243,7 @@ sources: revision: latest type: apt webapp: - revision: origin/version/0.8 + revision: origin/master source: "https://leap.se/git/leap_web" type: git ssh: @@ -395,6 +395,7 @@ webapp: - tickets - vmail - www-data + invite_required: false locales: - de - en diff --git a/hiera/zebra.yaml b/hiera/zebra.yaml index 3bad410..484e644 100644 --- a/hiera/zebra.yaml +++ b/hiera/zebra.yaml @@ -104,7 +104,7 @@ sources: revision: latest type: apt nickserver: - revision: origin/version/0.8 + revision: origin/master source: "https://leap.se/git/nickserver" type: git platform: @@ -115,7 +115,7 @@ sources: revision: latest type: apt webapp: - revision: origin/version/0.8 + revision: origin/master source: "https://leap.se/git/leap_web" type: git ssh: |