diff options
| author | kwadronaut <kwadronaut@leap.se> | 2015-11-12 10:00:27 +0100 |
|---|---|---|
| committer | kwadronaut <kwadronaut@leap.se> | 2015-11-12 10:00:27 +0100 |
| commit | 92cc2b1118e98a4fb086d7c62a140dbfc845f4b0 (patch) | |
| tree | 92896619c0cf4ace177cecfbdea6cbbbb9bc8419 /provider_base/services/mx.json | |
| parent | 81467100826ad95266a4c29b11a2ecef759dd782 (diff) | |
| parent | 7d0b6b25e49a1ccb70c4f502f7dfc58878b900cc (diff) | |
Merge remote-tracking branch 'origin/develop' into HEAD
Diffstat (limited to 'provider_base/services/mx.json')
| -rw-r--r-- | provider_base/services/mx.json | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/provider_base/services/mx.json b/provider_base/services/mx.json index 11293ae8..70acf5cb 100644 --- a/provider_base/services/mx.json +++ b/provider_base/services/mx.json @@ -1,4 +1,11 @@ { + "mx": { + // provider should define their own custom aliases. + // these are in *addition* to the standard reserved aliases for root and postmaster, etc. + "aliases": {}, + // this is the domain that is used for the OpenPGP header + "key_lookup_domain": "= global.services[:webapp].webapp.domain" + }, "stunnel": { "clients": { "couch_client": "= stunnel_client(nodes_like_me[:services => :couchdb], global.services[:couchdb].couch.port)" @@ -16,6 +23,10 @@ "salt": "= hex_secret :couch_leap_mx_password_salt, 128" }, "mynetworks": "= nodes['environment' => '!local'].map{|name, n| [n.ip_address, (global.facts[name]||{})['ec2_public_ipv4']]}.flatten.compact.uniq", + "rbls": ["zen.spamhaus.org"], + "clamav": { + "whitelisted_addresses": [] + }, "x509": { "use": true, "use_commercial": true, @@ -23,5 +34,12 @@ "client_ca_cert": "= file :client_ca_cert, :missing => 'Certificate Authority. Run `leap cert ca`'", "client_ca_key": "= file :client_ca_key, :missing => 'Certificate Authority. Run `leap cert ca`'" }, - "service_type": "user_service" + "service_type": "user_service", + "firewall": { + "mx": { + "from": "*", + "to": "= ip_address", + "port": [25, 465] + } + } } |