renewed cert for unstable

7 files changed, 280 insertions, 169 deletions

diff --git a/files/cert/unstable.bitmask.net.crt b/files/cert/unstable.bitmask.net.crt
index 4295fa6..e73524e 100644
--- a/files/cert/unstable.bitmask.net.crt
+++ b/files/cert/unstable.bitmask.net.crt
@@ -1,26 +1,32 @@
 -----BEGIN CERTIFICATE-----
-MIIEdDCCAlygAwIBAgIQWW5S+JG3Fr6DInjm7VQ7UjANBgkqhkiG9w0BAQsFADBK
-MRgwFgYDVQQDDA9CaXRtYXNrIFJvb3QgQ0ExEDAOBgNVBAoMB0JpdG1hc2sxHDAa
-BgNVBAsME2h0dHBzOi8vYml0bWFzay5uZXQwHhcNMTQxMDAyMDAwMDAwWhcNMTUx
-MDAyMDAwMDAwWjAxMRAwDgYDVQQKDAdCaXRtYXNrMR0wGwYDVQQDDBR1bnN0YWJs
-ZS5iaXRtYXNrLm5ldDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALfS
-Asf/zPXdD+M2Zp1Pcps3DdyElsAvK2IqaStVKVx9oEETTlDUciUkhtO2CmKsszEn
-SkvYKM6QsiffarwSe7QIBZBQxXYjGqP9IPhpTt9JPuabJGeZIIu6Pc/odbR9kHYA
-qIoSGb97JlPsd1Q38q+9WRZdGINIgpHwWmsEe/3fXdy6F2WSdsYI+LLlRmNpi9FU
-l7sUuXgjyjEvmqzRR001/xglV/8xRDkWZ0R/phQk3KMMexB1STjC9ZyT3+N7SQWP
-PiC/pus5Aqo5CuknJTNn6bwbPPaCEMqG0U19l33HbZua48QyxYTGz9BSKLt7+77I
-koJ7H1E5CVOPC46rqUkCAwEAAaNvMG0wHQYDVR0OBBYEFNaC7Y+9eGMFw4b02rfZ
-DKRoifxAMAsGA1UdDwQEAwIFoDATBgNVHSUEDDAKBggrBgEFBQcDATAJBgNVHRME
-AjAAMB8GA1UdIwQYMBaAFLmBgyy9rLMJ2KRx7z66LdSVPg+PMA0GCSqGSIb3DQEB
-CwUAA4ICAQBSACTOk/lidgImS9KsoRBdmM1kdWhD+FY3RYSpZF8CPr4W1UdPn0GZ
-C1hGTXZ6fC/muQpZ8IFtNXMnmKnyQ6hw2wBoM/yk8bgyMVOIuRJQ/X4PTdIMrkXT
-CKsqhzfddob+Gf2XA2/z6MyOKsL2mIJZchAqzZDQDezWzOvb/FP2gUyiiEvBgs2U
-Re5jgixCKQd8YZ+AZLo6TPM/5JLJoTeRtd2JJyhMuJvLdZGKY8oSlu1TryK9uMB6
-LxbYsHOjfQd1y3odvq8TPP++AMwAEzYsQm6LNzr6G2DrfFYWmItIbCyE2slAarzu
-LcaJM8l6tzVYU3qsc+Dwi1a1yIqle3mPmwPf8PYYExIE3aqAD0n9jjJbB8XQ/N2E
-5Uit63hahzBarvBDxvjh53teElBDvX0G6tgFQHdiZYY+DtMWMpADl5m7kquCfY80
-HHxBbP7tt55LdZu0N/9CkNdKkeStaDTb4+sSg0A+mXz0IU4zE2aufuWcFsdG/3cQ
-PuRM7u9dBpD6qPRVw0pw+a6z+6OxaldiuJds+c15taDgab6rLYOPcmxNfFW9qdgA
-dyRrHeMHcjToYJKQmMtB8VH1HdIUT0WyZlibKj3YBhPIExNLJk83rfF9W72zGUbI
-0MVbrOyfza0ePv2ngWZlZIhnRBO3iWEn7UNhfBqin8pDuQfDAdgSvg==
+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
+e4iJY10Ihdd3
 -----END CERTIFICATE-----
diff --git a/files/cert/unstable.bitmask.net.csr b/files/cert/unstable.bitmask.net.csr
index bc049ae..1e0b867 100644
--- a/files/cert/unstable.bitmask.net.csr
+++ b/files/cert/unstable.bitmask.net.csr
@@ -1,16 +1,28 @@
 -----BEGIN CERTIFICATE REQUEST-----
-MIICdjCCAV4CAQAwMTEQMA4GA1UECgwHQml0bWFzazEdMBsGA1UEAwwUdW5zdGFi
-bGUuYml0bWFzay5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC3
-0gLH/8z13Q/jNmadT3KbNw3chJbALytiKmkrVSlcfaBBE05Q1HIlJIbTtgpirLMx
-J0pL2CjOkLIn32q8Enu0CAWQUMV2Ixqj/SD4aU7fST7mmyRnmSCLuj3P6HW0fZB2
-AKiKEhm/eyZT7HdUN/KvvVkWXRiDSIKR8FprBHv9313cuhdlknbGCPiy5UZjaYvR
-VJe7FLl4I8oxL5qs0UdNNf8YJVf/MUQ5FmdEf6YUJNyjDHsQdUk4wvWck9/je0kF
-jz4gv6brOQKqOQrpJyUzZ+m8Gzz2ghDKhtFNfZd9x22bmuPEMsWExs/QUii7e/u+
-yJKCex9ROQlTjwuOq6lJAgMBAAGgADANBgkqhkiG9w0BAQsFAAOCAQEAloJOyga9
-Kqr609VPTnQN5RLvfwt7Y9J7kCBSSDt2w2LFCYPzm7fUBEvIyMBgwQXkVlaK2sD/
-fwL/Ue3VssJ1Ymwc6tREUp/CH6biV+cN3X604FWjfLTb89Pm2Og5urazofHcFybD
-TQcmkKr25n7sB/ZZ/mXInN5s7h0U7NjxskSWV1h1oNipLoi6PZ3uiRpLbtLT6Khq
-g+OaZ9dOTMH3p9I+HJ45JKMdz7OI55eVfPAphoIDVg3mk1OWV3OQCjwFGj6DzoXt
-ejZf4IGAO+4ubzGLKKPgJeSptyAb7nENGkHptyrFGPLP8Ua0O6XWxnfMrqA7Un5o
-XP54EcY5dZoWYQ==
+MIIEtDCCApwCAQAwMTEQMA4GA1UECgwHQml0bWFzazEdMBsGA1UEAwwUdW5zdGFi
+bGUuYml0bWFzay5uZXQwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDQ
+vzRVG7HkrnIqzZvMutTF2WCQ8RQyLaXDkYVl3/MEDsmUUtwXqqmSkU6ToWmn0AKv
+a435oBFImTiwxTF0zTIg8CTA6kAv/i0470hghMIShqlx9scGI8h/y2VyrswpqGqg
+0p8lYDXheprsWPTyYN8y+dnK5mgXed/x2uXGLFPGB+Z8L5FqKnzXwyL829fh68Kf
+p4z26WpCF0ciKzNMXiIo+notPvvjVejUXfwHO9FJkCOt/4cJLZLe4JdyzXoweE+w
+WXKH29dmNE4vOi8acQjEJ0r9KA2fgHWxfd1p0AeH3bONdJpE8yew3BLvnLFz4YUv
+pBRgtZ9OOTaBZcSMKTqpDy4gjKGB90IpqyhLaEmHY6t09l1ZnytXZtWL1fy56o+K
+8hjou70X/itV4gZh/baGdxyshufqGGDGasyw/U9vsz/Orrwx8bN9upv/GOdTxqYd
+RatFuCvt3Krdt+wkAS+8P4U9o6ZOGiV89fr8e6WFSuqKHY9ZI6a5ocz34BCiWZIz
+C6ixPOOzMN5dnRsK6hCnwifswkDYNFAmF2RuGTpR2CVR8U9y3yE8YT8IeXoQHYrP
+NDeXHDwBzWu5dQ4ysfLEs1m+WnWQv9h0GQdGbP225+zEy6UKYct2l6Uz6UzGulyM
+GUj7+IlM7cRjSPy/bG4PD6FycWzw55qZE4zEcFKWawIDAQABoD4wPAYJKoZIhvcN
+AQkOMS8wLTAJBgNVHRMEAjAAMAsGA1UdDwQEAwIFoDATBgNVHSUEDDAKBggrBgEF
+BQcDATANBgkqhkiG9w0BAQsFAAOCAgEAcnzxb+Hn6QmgGSaintk4gRUM+0svSWWZ
+bNDdp5sEr+Vj6ZLYh2ZxmKykxwtYFAUU9+2zaQapBTPMPmsRR+miHUvVgC885w1t
+3zWxGPJVPFzkaSsB8tG+zJhFoUHgB7lWpVRNmU4QqdvPrDbFshlOLXSX1VE3IFjO
+i/ibGgfvU+1hxDeqX9roTsIudAURaNr6LVed5lp9r4H7feQZ3F+jcjLepbqPF5On
+CIdLHeKXwh4y1Kf8X7YK56MAG1387utby+UlKgftWnIRCEE6779k8dmQIJ4ueJHV
+lvQUkAbIehttBtIsJmF4644N/I5cnPscITjUJdL0oj44QovSgkZzto+MKEyWzqL6
+42BEgHvasgoaxvoCZo6m9j+mOirNVKj7FhUc+IRgSNiWs/ml93iNMABnPpOVM3WM
+82DRbaONnqr0kpr781UMGfwR5M4acQx+WGWE3odD71hL117+Mel73wGyCFQPk9jT
+yDCLTlQ29pwaAMh4KTXExbgWu/h99D6RcY8WjuDeYKNXvhJcAdh/fORVUt/NoAGS
+4CMUia4DtjpYm7zT7ok6LuDEv1RU+9ca20PPBbRevAICTQn2ExM86i2Nv0vPDkio
+KEmqYspfOAowLhOVidhEsZ23faocnOAY4JgZq/3ZB2QTCK3h3+Uztmbp+9JlZtUx
+TSQLq1TNWM0=
 -----END CERTIFICATE REQUEST-----
diff --git a/files/cert/unstable.bitmask.net.key b/files/cert/unstable.bitmask.net.key
index e254ae0..59ab44c 100644
--- a/files/cert/unstable.bitmask.net.key
+++ b/files/cert/unstable.bitmask.net.key
@@ -1,27 +1,51 @@
 -----BEGIN RSA PRIVATE KEY-----
-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
+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
 -----END RSA PRIVATE KEY-----
diff --git a/hiera/aardwolf.yaml b/hiera/aardwolf.yaml
index dd51ba8..dfa4847 100644
--- a/hiera/aardwolf.yaml
+++ b/hiera/aardwolf.yaml
@@ -77,8 +77,8 @@ mail:
     - cat.unstable.bitmask.net
 name: aardwolf
 platform: 
-  major_version: "0.7"
-  version: "0.7.1"
+  major_version: "0.8"
+  version: "0.8"
 service_type: public_service
 services: 
   - couchdb
diff --git a/hiera/cat.yaml b/hiera/cat.yaml
index 5ae3eae..36d44f5 100644
--- a/hiera/cat.yaml
+++ b/hiera/cat.yaml
@@ -77,8 +77,10 @@ mynetworks:
   - "85.17.92.143"
 name: cat
 platform: 
-  major_version: "0.7"
-  version: "0.7.1"
+  major_version: "0.8"
+  version: "0.8"
+rbls: 
+  - zen.spamhaus.org
 service_type: user_service
 services: 
   - mx
@@ -385,58 +387,88 @@ x509:
       -----END CERTIFICATE-----
   commercial_cert: |
       -----BEGIN CERTIFICATE-----
-      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
+      MIIFdTCCA12gAwIBAgIRAIzmxZPBJG4l/0NIAC2Nf+YwDQYJKoZIhvcNAQELBQAw
+      SjEYMBYGA1UEAwwPQml0bWFzayBSb290IENBMRAwDgYDVQQKDAdCaXRtYXNrMRww
+      GgYDVQQLDBNodHRwczovL2JpdG1hc2submV0MB4XDTE1MDgyNzAwMDAwMFoXDTE2
+      MDgyNzAwMDAwMFowMTEQMA4GA1UECgwHQml0bWFzazEdMBsGA1UEAwwUdW5zdGFi
+      bGUuYml0bWFzay5uZXQwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDQ
+      vzRVG7HkrnIqzZvMutTF2WCQ8RQyLaXDkYVl3/MEDsmUUtwXqqmSkU6ToWmn0AKv
+      a435oBFImTiwxTF0zTIg8CTA6kAv/i0470hghMIShqlx9scGI8h/y2VyrswpqGqg
+      0p8lYDXheprsWPTyYN8y+dnK5mgXed/x2uXGLFPGB+Z8L5FqKnzXwyL829fh68Kf
+      p4z26WpCF0ciKzNMXiIo+notPvvjVejUXfwHO9FJkCOt/4cJLZLe4JdyzXoweE+w
+      WXKH29dmNE4vOi8acQjEJ0r9KA2fgHWxfd1p0AeH3bONdJpE8yew3BLvnLFz4YUv
+      pBRgtZ9OOTaBZcSMKTqpDy4gjKGB90IpqyhLaEmHY6t09l1ZnytXZtWL1fy56o+K
+      8hjou70X/itV4gZh/baGdxyshufqGGDGasyw/U9vsz/Orrwx8bN9upv/GOdTxqYd
+      RatFuCvt3Krdt+wkAS+8P4U9o6ZOGiV89fr8e6WFSuqKHY9ZI6a5ocz34BCiWZIz
+      C6ixPOOzMN5dnRsK6hCnwifswkDYNFAmF2RuGTpR2CVR8U9y3yE8YT8IeXoQHYrP
+      NDeXHDwBzWu5dQ4ysfLEs1m+WnWQv9h0GQdGbP225+zEy6UKYct2l6Uz6UzGulyM
+      GUj7+IlM7cRjSPy/bG4PD6FycWzw55qZE4zEcFKWawIDAQABo28wbTAdBgNVHQ4E
+      FgQUwkbdcfJwhE/s92QLDrSJ76++4hwwCwYDVR0PBAQDAgWgMBMGA1UdJQQMMAoG
+      CCsGAQUFBwMBMAkGA1UdEwQCMAAwHwYDVR0jBBgwFoAUuYGDLL2sswnYpHHvProt
+      1JU+D48wDQYJKoZIhvcNAQELBQADggIBABsC2EmmFricgmnqGuGBRf9jMKfT4o3N
+      yXL7+peB02cK5cMRA/SEU1KEK9gSJvIp6lgsJZbp5H/R0ZixRuSSs5XLLNbGV/0x
+      5HZRyoPQ2x3t1rP2UVJp2ecllewnGdTHPZ195vBP08dujYDnpC87NKPDA844TSxU
+      lLNGNdeaUbk5CgVEBSTpkPP31xeC0S3T/PbUINMkjcVmkivtnaD1rRcJSlOJLB7o
+      lYttpLUY/rZIxlrLgdeJXhQTMakR+ThlnXpD3MjkN+s32XV1a/N5FirPFsAIN5zN
+      xWHL7uxv9zkxA5AliDGHrRTsi9kPzywDiSqEf1BzCh24giD1JhRkHwy6J7Li+V5C
+      UIN6BzYJKyFRmsgPL3WidhCl0hvPJI9YUlagRFAHasbj3n5U9vSohamL6C+/ui3d
+      Wy5HJ4Ex5q5XwfcNTbo4b6QzcUygjTC4+J7q6jzNRRmsMenjC4+iJ7g3q9c69PYS
+      VuA1+3vKo8VKzPgdqHU5wZ7yrtHEXkmXpY7HepNOGlfdqdrFZvzs5Ky3jYPG9wxZ
+      sOut238xxmTt/4mMgajhkXgXg1P6YznIxUzBWRXGymUGcbSEH8UM6fmTIrjOEmok
+      vIxI8dZixUEexIVSZPp9YLyx0eTDv6LXaF8xyOwTzq0LysCYLwXoQPZze/XUE1J8
+      e4iJY10Ihdd3
       -----END CERTIFICATE-----
   commercial_key: |
       -----BEGIN RSA PRIVATE KEY-----
-      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
+      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
       -----END RSA PRIVATE KEY-----
   key: |
       -----BEGIN RSA PRIVATE KEY-----
diff --git a/hiera/donkey.yaml b/hiera/donkey.yaml
index 2f17a42..4e61591 100644
--- a/hiera/donkey.yaml
+++ b/hiera/donkey.yaml
@@ -1,5 +1,6 @@
 --- 
 api: 
+  ca_cert_uri: "https://unstable.bitmask.net/ca.crt"
   domain: api.unstable.bitmask.net
   port: 4430
 contacts: 
@@ -617,8 +618,8 @@ nickserver:
   domain: nicknym.unstable.bitmask.net
   port: 6425
 platform: 
-  major_version: "0.7"
-  version: "0.7.1"
+  major_version: "0.8"
+  version: "0.8"
 service_type: public_service
 services: 
   - monitor
@@ -751,6 +752,7 @@ webapp:
     salt: 478bf7e8ca879a9711b279055f00153e
     username: webapp
   customization_dir: /srv/leap/files/webapp/
+  default_locale: en
   default_service_level: 1
   domain: unstable.bitmask.net
   engines: 
@@ -793,6 +795,11 @@ webapp:
     - tickets
     - vmail
     - www-data
+  locales: 
+    - de
+    - en
+    - es
+    - pt
   modules: 
     - billing
     - help
@@ -1033,58 +1040,88 @@ x509:
       -----END CERTIFICATE-----
   commercial_cert: |
       -----BEGIN CERTIFICATE-----
-      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
+      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
+      e4iJY10Ihdd3
       -----END CERTIFICATE-----
   commercial_key: |
       -----BEGIN RSA PRIVATE KEY-----
-      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
+      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
       -----END RSA PRIVATE KEY-----
   key: |
       -----BEGIN RSA PRIVATE KEY-----
diff --git a/hiera/tuatara.yaml b/hiera/tuatara.yaml
index 7002584..07c968a 100644
--- a/hiera/tuatara.yaml
+++ b/hiera/tuatara.yaml
@@ -53,8 +53,8 @@ openvpn:
   unlimited_prefix: UNLIMITED
   user_ips: false
 platform: 
-  major_version: "0.7"
-  version: "0.7.1"
+  major_version: "0.8"
+  version: "0.8"
 service_type: user_service
 services: 
   - openvpn