From ac74640c5f4a65f8f117deeaed8d1cd29a22bc3c Mon Sep 17 00:00:00 2001 From: elijah Date: Wed, 14 Nov 2012 23:49:56 -0800 Subject: added provider_base (latest leap_cli required) --- provider_base/common.json | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 provider_base/common.json (limited to 'provider_base/common.json') diff --git a/provider_base/common.json b/provider_base/common.json new file mode 100644 index 00000000..f3557800 --- /dev/null +++ b/provider_base/common.json @@ -0,0 +1,25 @@ +{ + "ip_address": "REQUIRED", + "services": [], + "domain": { + "full_suffix": "= global.provider.domain", + "internal_suffix": "= global.provider.internal_domain", + "full": "= node.name + '.' + domain.full_suffix", + "internal": "= node.name + '.' + domain.internal_suffix", + "name": "= node.name + '.' + (dns.public ? domain.full_suffix : domain.internal_suffix)" + }, + "dns": { + "public": "= service_type != 'internal_service'" + }, + "ssh": { + "authorized_keys": "= file :authorized_keys", + "known_hosts": "= file :known_hosts", + "port": 22 + }, + "x509": { + "use": false, + "cert": "= x509.use ? file(:node_x509_cert, :missing => 'x509 certificate for node $node. Run `leap update-cert`') : nil", + "key": "= x509.use ? file(:node_x509_key, :missing => 'x509 key for node $node. Run `leap update-cert`') : nil" + }, + "local": "= self.vagrant?" +} -- cgit v1.2.3 From 930eac488f8175fe17e9cb73ed3dff6763895562 Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Tue, 20 Nov 2012 15:04:46 -0500 Subject: add ca_cert key because we will need to place the cert into the webroot on the webapp --- provider_base/common.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'provider_base/common.json') diff --git a/provider_base/common.json b/provider_base/common.json index f3557800..4e85c9b0 100644 --- a/provider_base/common.json +++ b/provider_base/common.json @@ -19,7 +19,8 @@ "x509": { "use": false, "cert": "= x509.use ? file(:node_x509_cert, :missing => 'x509 certificate for node $node. Run `leap update-cert`') : nil", - "key": "= x509.use ? file(:node_x509_key, :missing => 'x509 key for node $node. Run `leap update-cert`') : nil" + "key": "= x509.use ? file(:node_x509_key, :missing => 'x509 key for node $node. Run `leap update-cert`') : nil", + "ca_cert": "= file :ca_cert" }, "local": "= self.vagrant?" } -- cgit v1.2.3 From 9491f15a64c13f2424b781d32d5734db3bb4a22f Mon Sep 17 00:00:00 2001 From: elijah Date: Wed, 21 Nov 2012 13:47:41 -0800 Subject: added x509.commercial_ca_cert. x509.ca_cert is now optional, except for webapp. --- 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 4e85c9b0..0eeef6e5 100644 --- a/provider_base/common.json +++ b/provider_base/common.json @@ -20,7 +20,7 @@ "use": false, "cert": "= x509.use ? file(:node_x509_cert, :missing => 'x509 certificate for node $node. Run `leap update-cert`') : nil", "key": "= x509.use ? file(:node_x509_key, :missing => 'x509 key for node $node. Run `leap update-cert`') : nil", - "ca_cert": "= file :ca_cert" + "ca_cert": "= try_file :ca_cert" }, "local": "= self.vagrant?" } -- cgit v1.2.3 From be2300a01a7744986d6ea76b44c663df619aae03 Mon Sep 17 00:00:00 2001 From: elijah Date: Sat, 24 Nov 2012 21:35:40 -0800 Subject: new leap_cli sets local tag automatically. --- provider_base/common.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'provider_base/common.json') diff --git a/provider_base/common.json b/provider_base/common.json index 0eeef6e5..12b9dab6 100644 --- a/provider_base/common.json +++ b/provider_base/common.json @@ -1,6 +1,7 @@ { "ip_address": "REQUIRED", "services": [], + "tags": [], "domain": { "full_suffix": "= global.provider.domain", "internal_suffix": "= global.provider.internal_domain", @@ -21,6 +22,5 @@ "cert": "= x509.use ? file(:node_x509_cert, :missing => 'x509 certificate for node $node. Run `leap update-cert`') : nil", "key": "= x509.use ? file(:node_x509_key, :missing => 'x509 key for node $node. Run `leap update-cert`') : nil", "ca_cert": "= try_file :ca_cert" - }, - "local": "= self.vagrant?" + } } -- cgit v1.2.3 From 05d3c0903f48e9c0d69145c9e027b70a392c9602 Mon Sep 17 00:00:00 2001 From: elijah Date: Tue, 27 Nov 2012 12:27:35 -0800 Subject: fix webapp: only list couchdb hosts that match node's 'local' value. --- provider_base/common.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'provider_base/common.json') diff --git a/provider_base/common.json b/provider_base/common.json index 12b9dab6..6d4291c6 100644 --- a/provider_base/common.json +++ b/provider_base/common.json @@ -22,5 +22,6 @@ "cert": "= x509.use ? file(:node_x509_cert, :missing => 'x509 certificate for node $node. Run `leap update-cert`') : nil", "key": "= x509.use ? file(:node_x509_key, :missing => 'x509 key for node $node. Run `leap update-cert`') : nil", "ca_cert": "= try_file :ca_cert" - } + }, + "local": false } -- cgit v1.2.3 From 6af460dd3b2e686734df876eff9b621f2162da69 Mon Sep 17 00:00:00 2001 From: elijah Date: Fri, 7 Dec 2012 15:52:50 -0800 Subject: added hostname tracking and late evaluation. new key "hosts" added, for building /etc/hosts. also, now ssh.known_hosts only includes what is necessary. --- provider_base/common.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'provider_base/common.json') diff --git a/provider_base/common.json b/provider_base/common.json index 6d4291c6..42444b1f 100644 --- a/provider_base/common.json +++ b/provider_base/common.json @@ -14,9 +14,10 @@ }, "ssh": { "authorized_keys": "= file :authorized_keys", - "known_hosts": "= file :known_hosts", + "known_hosts": "=> known_hosts_file", "port": 22 }, + "hosts": "=> hosts_file", "x509": { "use": false, "cert": "= x509.use ? file(:node_x509_cert, :missing => 'x509 certificate for node $node. Run `leap update-cert`') : nil", -- cgit v1.2.3 From 9c671a9b1e4d13545c511eefd1eac274c16f80de Mon Sep 17 00:00:00 2001 From: elijah Date: Sat, 8 Dec 2012 20:03:00 -0800 Subject: minor - fix hint. --- 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 42444b1f..b5d37f8e 100644 --- a/provider_base/common.json +++ b/provider_base/common.json @@ -1,5 +1,5 @@ { - "ip_address": "REQUIRED", + "ip_address": null, "services": [], "tags": [], "domain": { @@ -20,8 +20,8 @@ "hosts": "=> hosts_file", "x509": { "use": false, - "cert": "= x509.use ? file(:node_x509_cert, :missing => 'x509 certificate for node $node. Run `leap update-cert`') : nil", - "key": "= x509.use ? file(:node_x509_key, :missing => 'x509 key for node $node. Run `leap update-cert`') : nil", + "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" }, "local": false -- cgit v1.2.3 From ca6347905e4293883b196f6e2120754fb823ae49 Mon Sep 17 00:00:00 2001 From: varac Date: Sat, 26 Jan 2013 20:38:22 +0100 Subject: service_type: internal_service as default --- provider_base/common.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'provider_base/common.json') diff --git a/provider_base/common.json b/provider_base/common.json index b5d37f8e..74eb494c 100644 --- a/provider_base/common.json +++ b/provider_base/common.json @@ -24,5 +24,6 @@ "key": "= x509.use ? file(:node_x509_key, :missing => 'x509 key for node $node. Run `leap cert update`') : nil", "ca_cert": "= try_file :ca_cert" }, - "local": false + "local": false, + "service_type": "internal_service" } -- cgit v1.2.3 From 078bc9674c247cc2c3ad715eec57903138e481e1 Mon Sep 17 00:00:00 2001 From: varac Date: Sun, 27 Jan 2013 11:15:36 +0100 Subject: added 'development' hiera hash to exclude certain class for better testing --- 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 74eb494c..8ffe8cd4 100644 --- a/provider_base/common.json +++ b/provider_base/common.json @@ -25,5 +25,8 @@ "ca_cert": "= try_file :ca_cert" }, "local": false, - "service_type": "internal_service" + "service_type": "internal_service", + "development": { + "site_config": true + } } -- cgit v1.2.3 From 49fc7e085f635c906b32adfc41a207939be2cf39 Mon Sep 17 00:00:00 2001 From: elijah Date: Fri, 8 Feb 2013 19:40:56 -0800 Subject: make monitor service include the nodes that are of a similar type (e.g. production or local). --- provider_base/common.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'provider_base/common.json') diff --git a/provider_base/common.json b/provider_base/common.json index 8ffe8cd4..8e4dc6e7 100644 --- a/provider_base/common.json +++ b/provider_base/common.json @@ -25,8 +25,9 @@ "ca_cert": "= try_file :ca_cert" }, "local": false, + "production": false, "service_type": "internal_service", "development": { - "site_config": true + "site_config": true } } -- cgit v1.2.3 From 57adb7f3d527ecd4d3a41b6a1935b93c8266a688 Mon Sep 17 00:00:00 2001 From: elijah Date: Fri, 8 Feb 2013 21:50:59 -0800 Subject: minor changes to default json: give common a name, add contacts.default --- provider_base/common.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'provider_base/common.json') diff --git a/provider_base/common.json b/provider_base/common.json index 8e4dc6e7..e674edb6 100644 --- a/provider_base/common.json +++ b/provider_base/common.json @@ -4,7 +4,7 @@ "tags": [], "domain": { "full_suffix": "= global.provider.domain", - "internal_suffix": "= global.provider.internal_domain", + "internal_suffix": "= global.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)" @@ -29,5 +29,6 @@ "service_type": "internal_service", "development": { "site_config": true - } + }, + "name": "common" } -- cgit v1.2.3