diff options
| author | Micah Anderson <micah@leap.se> | 2013-07-26 14:21:22 -0400 |
|---|---|---|
| committer | Micah Anderson <micah@leap.se> | 2013-07-26 14:21:22 -0400 |
| commit | 701c66c8de081f8148ab63c09f52fe97b122f54a (patch) | |
| tree | 6cd2aef6d2041d200e071d184e46996945c07f35 /provider_base | |
| parent | 4766d719b1181b636dc57374b478d2c21e369dc1 (diff) | |
| parent | 8d28379aca4d8a79caa00afbf79ad4e5a204493f (diff) | |
Merge branch 'feature/mx' into develop
Diffstat (limited to 'provider_base')
| -rw-r--r-- | provider_base/services/mx.json | 21 | ||||
| -rw-r--r-- | provider_base/services/soledad.json | 2 |
2 files changed, 22 insertions, 1 deletions
diff --git a/provider_base/services/mx.json b/provider_base/services/mx.json new file mode 100644 index 00000000..91ad3277 --- /dev/null +++ b/provider_base/services/mx.json @@ -0,0 +1,21 @@ +{ + "mx": { + "contact": "= global.provider.contacts.default" + }, + "stunnel": { + "couch_client": "= stunnel_client(nodes_like_me[:services => :couchdb], global.services[:couchdb].couch.port)" + }, + "haproxy": { + "local_ports": "= stunnel.couch_client.field(:accept_port)" + }, + "x509": { + "use": true, + "ca_cert": "= file :ca_cert, :missing => 'provider CA. Run `leap cert ca`'", + "client_ca_cert": "= file_path :client_ca_cert", + "client_ca_key": "= file_path :client_ca_key", + "commercial_cert": "= file [:commercial_cert, domain.full_suffix]", + "commercial_key": "= file [:commercial_key, domain.full_suffix]", + "commercial_ca_cert": "= try_file :commercial_ca_cert" + }, + "service_type": "user_service" +} diff --git a/provider_base/services/soledad.json b/provider_base/services/soledad.json index 10657563..de24d8ef 100644 --- a/provider_base/services/soledad.json +++ b/provider_base/services/soledad.json @@ -3,4 +3,4 @@ "soledad": { "port": 1111 } -}
\ No newline at end of file +} |