From 80172de8a301c3befa26ac25c5e858f070bb2040 Mon Sep 17 00:00:00 2001 From: varac Date: Thu, 10 Oct 2013 18:09:32 +0200 Subject: provide global.provider.contacts.default on every node, no need to add in services/mx.json again --- provider_base/common.json | 1 + 1 file changed, 1 insertion(+) (limited to 'provider_base/common.json') diff --git a/provider_base/common.json b/provider_base/common.json index 2313bd8b..7ccb5005 100644 --- a/provider_base/common.json +++ b/provider_base/common.json @@ -3,6 +3,7 @@ "environment": null, "services": [], "tags": [], + "contacts": "= global.provider.contacts.default", "domain": { "full_suffix": "= global.provider.domain", "internal_suffix": "= global.provider.domain_internal", -- cgit v1.2.3 From 1d080ba042d9ce55c4eaad6d35f7fffefccdbbca Mon Sep 17 00:00:00 2001 From: varac Date: Thu, 10 Oct 2013 18:30:44 +0200 Subject: added mail.smarthost variable to hiera --- provider_base/common.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'provider_base/common.json') diff --git a/provider_base/common.json b/provider_base/common.json index 7ccb5005..5be0dd70 100644 --- a/provider_base/common.json +++ b/provider_base/common.json @@ -36,5 +36,8 @@ }, "name": "common", "location": null, - "enabled": true + "enabled": true, + "mail": { + "smarthost": "= nodes_like_me[:services => :mx].exclude(self).field('domain.full')" + } } -- cgit v1.2.3 From e8af63fedc1738c0afbb9cee2a2339719d62b38f Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Tue, 17 Dec 2013 13:06:17 -0500 Subject: set x509 use to true for all nodes, we need a cert for relaying using TLS (#1910) Change-Id: I347178f2a172e4be6af8c0c76d801b3c769235cd --- provider_base/common.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'provider_base/common.json') diff --git a/provider_base/common.json b/provider_base/common.json index 5be0dd70..07a45972 100644 --- a/provider_base/common.json +++ b/provider_base/common.json @@ -25,7 +25,7 @@ }, "hosts": "=> hosts_file", "x509": { - "use": false, + "use": true, "cert": "= x509.use ? file(:node_x509_cert, :missing => 'x509 certificate for node $node. Run `leap cert update`') : nil", "key": "= x509.use ? file(:node_x509_key, :missing => 'x509 key for node $node. Run `leap cert update`') : nil", "ca_cert": "= try_file :ca_cert" -- cgit v1.2.3 From 665db30f37838bcebbfdc368f65ed369282c31b8 Mon Sep 17 00:00:00 2001 From: elijah Date: Sun, 9 Feb 2014 17:04:58 -0800 Subject: deploy a valid /etc/ssh/ssh_known_hosts for all nodes (requires new leap_cli) --- provider_base/common.json | 1 - 1 file changed, 1 deletion(-) (limited to 'provider_base/common.json') diff --git a/provider_base/common.json b/provider_base/common.json index 07a45972..07a58bba 100644 --- a/provider_base/common.json +++ b/provider_base/common.json @@ -16,7 +16,6 @@ }, "ssh": { "authorized_keys": "= authorized_keys", - "known_hosts": "=> known_hosts_file", "port": 22, "mosh": { "ports": "60000:61000", -- cgit v1.2.3 From 18121335c200b86a39f83a7cd240258c40a81f4e Mon Sep 17 00:00:00 2001 From: elijah Date: Fri, 14 Mar 2014 17:54:01 -0700 Subject: added support for environment specific providers (e.g. provider.production.json). requires latest leap_cli. --- provider_base/common.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'provider_base/common.json') diff --git a/provider_base/common.json b/provider_base/common.json index 07a58bba..a4d9c5f2 100644 --- a/provider_base/common.json +++ b/provider_base/common.json @@ -3,10 +3,10 @@ "environment": null, "services": [], "tags": [], - "contacts": "= global.provider.contacts.default", + "contacts": "= provider.contacts.default", "domain": { - "full_suffix": "= global.provider.domain", - "internal_suffix": "= global.provider.domain_internal", + "full_suffix": "= provider.domain", + "internal_suffix": "= provider.domain_internal", "full": "= node.name + '.' + domain.full_suffix", "internal": "= node.name + '.' + domain.internal_suffix", "name": "= node.name + '.' + (dns.public ? domain.full_suffix : domain.internal_suffix)" -- cgit v1.2.3