From 972317f752d5d621bd8284d4c00caaabbb447061 Mon Sep 17 00:00:00 2001 From: varac Date: Wed, 17 Apr 2013 18:46:13 +0200 Subject: added provider_base/services/mx.json --- provider_base/services/mx.json | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 provider_base/services/mx.json (limited to 'provider_base/services/mx.json') diff --git a/provider_base/services/mx.json b/provider_base/services/mx.json new file mode 100644 index 00000000..61ae0db9 --- /dev/null +++ b/provider_base/services/mx.json @@ -0,0 +1,8 @@ +{ + "stunnel": { + "couch_client": "= stunnel_client(nodes_like_me[:services => :couchdb], global.services[:couchdb].couch.port)" + }, + "haproxy": { + "local_ports": "= stunnel.couch_client.field(:accept_port)" + } +} -- cgit v1.2.3 From 720717e177af576936a7e3e950aec1d208a21fae Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Wed, 17 Apr 2013 16:01:19 -0400 Subject: initial mx couchdb stunnel configuration --- provider_base/services/mx.json | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'provider_base/services/mx.json') diff --git a/provider_base/services/mx.json b/provider_base/services/mx.json index 61ae0db9..949374ad 100644 --- a/provider_base/services/mx.json +++ b/provider_base/services/mx.json @@ -4,5 +4,14 @@ }, "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" } } -- cgit v1.2.3 From 8d93b0f2fa3198cf4071cf93d8213fbfc3e0a9be Mon Sep 17 00:00:00 2001 From: varac Date: Mon, 22 Apr 2013 17:28:40 +0200 Subject: hiera variable mx.contact -> postfix $root_mail_recipient --- provider_base/services/mx.json | 3 +++ 1 file changed, 3 insertions(+) (limited to 'provider_base/services/mx.json') diff --git a/provider_base/services/mx.json b/provider_base/services/mx.json index 949374ad..b15bfbc8 100644 --- a/provider_base/services/mx.json +++ b/provider_base/services/mx.json @@ -1,4 +1,7 @@ { + "mx": { + "contact": "= global.provider.contacts.default" + }, "stunnel": { "couch_client": "= stunnel_client(nodes_like_me[:services => :couchdb], global.services[:couchdb].couch.port)" }, -- cgit v1.2.3 From fd009ffef849986a691cf98aa1eefc21c3a72d9f Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Wed, 17 Apr 2013 16:01:19 -0400 Subject: initial mx couchdb stunnel configuration --- provider_base/services/mx.json | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'provider_base/services/mx.json') diff --git a/provider_base/services/mx.json b/provider_base/services/mx.json index b15bfbc8..ab46960d 100644 --- a/provider_base/services/mx.json +++ b/provider_base/services/mx.json @@ -17,4 +17,15 @@ "commercial_key": "= file [:commercial_key, domain.full_suffix]", "commercial_ca_cert": "= try_file :commercial_ca_cert" } +} + }, + "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" + } } -- cgit v1.2.3 From 02e32f7310a1960f9665f08517368d8fef4ea216 Mon Sep 17 00:00:00 2001 From: varac Date: Fri, 26 Apr 2013 10:08:18 +0200 Subject: fixed provider_base/services/mx.json syntax --- provider_base/services/mx.json | 11 ----------- 1 file changed, 11 deletions(-) (limited to 'provider_base/services/mx.json') diff --git a/provider_base/services/mx.json b/provider_base/services/mx.json index ab46960d..b15bfbc8 100644 --- a/provider_base/services/mx.json +++ b/provider_base/services/mx.json @@ -17,15 +17,4 @@ "commercial_key": "= file [:commercial_key, domain.full_suffix]", "commercial_ca_cert": "= try_file :commercial_ca_cert" } -} - }, - "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" - } } -- cgit v1.2.3 From 462c402e7850671cd6debc545bce93f51d5b6770 Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Tue, 21 May 2013 16:34:16 -0400 Subject: add necessary service type to the mx.json --- provider_base/services/mx.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'provider_base/services/mx.json') diff --git a/provider_base/services/mx.json b/provider_base/services/mx.json index b15bfbc8..91ad3277 100644 --- a/provider_base/services/mx.json +++ b/provider_base/services/mx.json @@ -16,5 +16,6 @@ "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" } -- cgit v1.2.3 From 3f1e47a8e92f2ddde45d0bdf6b0b1a51c79d913c Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Wed, 17 Apr 2013 16:01:19 -0400 Subject: initial mx couchdb stunnel configuration --- provider_base/services/mx.json | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'provider_base/services/mx.json') diff --git a/provider_base/services/mx.json b/provider_base/services/mx.json index 91ad3277..73bbea83 100644 --- a/provider_base/services/mx.json +++ b/provider_base/services/mx.json @@ -18,4 +18,15 @@ "commercial_ca_cert": "= try_file :commercial_ca_cert" }, "service_type": "user_service" +} + }, + "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" + } } -- cgit v1.2.3 From 28e4abe1b1032746cf63616a6e7a1f43860061c4 Mon Sep 17 00:00:00 2001 From: varac Date: Fri, 26 Apr 2013 10:08:18 +0200 Subject: fixed provider_base/services/mx.json syntax --- provider_base/services/mx.json | 11 ----------- 1 file changed, 11 deletions(-) (limited to 'provider_base/services/mx.json') diff --git a/provider_base/services/mx.json b/provider_base/services/mx.json index 73bbea83..91ad3277 100644 --- a/provider_base/services/mx.json +++ b/provider_base/services/mx.json @@ -18,15 +18,4 @@ "commercial_ca_cert": "= try_file :commercial_ca_cert" }, "service_type": "user_service" -} - }, - "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" - } } -- cgit v1.2.3