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/services/webapp.json | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 provider_base/services/webapp.json (limited to 'provider_base/services/webapp.json') diff --git a/provider_base/services/webapp.json b/provider_base/services/webapp.json new file mode 100644 index 00000000..6e5c029c --- /dev/null +++ b/provider_base/services/webapp.json @@ -0,0 +1,19 @@ +{ + "webapp": { + "modules": ["user", "billing", "help"], + "couchdb_hosts": "= nodes[:services => :couchdb].field('domain.name')", + "couchdb_user": "= global.services[:couchdb].couch.users[:webapp]" + }, + "definition_files": { + "provider": "= file('service-definitions/provider.json.erb')", + "eip_service": "file('service-definitions/eip-service.json.erb')" + }, + "service_type": "public_service", + "api_domain": "= 'api.' + domain.full_suffix", + "dns": { + "aliases": "= [domain.full, api_domain]" + }, + "x509": { + "use": true + } +} \ No newline at end of file -- cgit v1.2.3 From 74047765ad815ae72a1e0eb2355e6fbc68d4db57 Mon Sep 17 00:00:00 2001 From: elijah Date: Thu, 15 Nov 2012 01:18:10 -0800 Subject: added eip-service.json --- provider_base/services/webapp.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'provider_base/services/webapp.json') diff --git a/provider_base/services/webapp.json b/provider_base/services/webapp.json index 6e5c029c..7e12d26e 100644 --- a/provider_base/services/webapp.json +++ b/provider_base/services/webapp.json @@ -5,8 +5,8 @@ "couchdb_user": "= global.services[:couchdb].couch.users[:webapp]" }, "definition_files": { - "provider": "= file('service-definitions/provider.json.erb')", - "eip_service": "file('service-definitions/eip-service.json.erb')" + "provider": "= file 'service-definitions/provider.json.erb'", + "eip_service": "= file 'service-definitions/eip-service.json.erb'" }, "service_type": "public_service", "api_domain": "= 'api.' + domain.full_suffix", -- cgit v1.2.3 From 0c65e5c1169fa33d08c3ffa02d5cf3060a009892 Mon Sep 17 00:00:00 2001 From: elijah Date: Sat, 17 Nov 2012 01:24:00 -0800 Subject: added commercial_cert to webapp --- provider_base/services/webapp.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'provider_base/services/webapp.json') diff --git a/provider_base/services/webapp.json b/provider_base/services/webapp.json index 7e12d26e..ca9edf33 100644 --- a/provider_base/services/webapp.json +++ b/provider_base/services/webapp.json @@ -14,6 +14,8 @@ "aliases": "= [domain.full, api_domain]" }, "x509": { - "use": true + "use": true, + "commercial_cert": "= file [:commercial_cert, global.provider.domain]", + "commercial_key": "= file [:commercial_key, global.provider.domain]" } } \ No newline at end of file -- 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/services/webapp.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'provider_base/services/webapp.json') diff --git a/provider_base/services/webapp.json b/provider_base/services/webapp.json index ca9edf33..bdef5761 100644 --- a/provider_base/services/webapp.json +++ b/provider_base/services/webapp.json @@ -15,7 +15,9 @@ }, "x509": { "use": true, + "ca_cert": "= file :ca_cert, :missing => 'provider CA. Run `leap init-ca`'", "commercial_cert": "= file [:commercial_cert, global.provider.domain]", - "commercial_key": "= file [:commercial_key, global.provider.domain]" + "commercial_key": "= file [:commercial_key, global.provider.domain]", + "commercial_ca_cert": "= try_file :commercial_ca_cert" } } \ No newline at end of file -- cgit v1.2.3 From 3e53ba65fbf1eb48dbe01526342e601a1c10c824 Mon Sep 17 00:00:00 2001 From: elijah Date: Fri, 23 Nov 2012 01:54:40 -0800 Subject: get rid of paths in webapp.json, use symbolic filenames instead. --- provider_base/services/webapp.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'provider_base/services/webapp.json') diff --git a/provider_base/services/webapp.json b/provider_base/services/webapp.json index bdef5761..321c26ea 100644 --- a/provider_base/services/webapp.json +++ b/provider_base/services/webapp.json @@ -5,8 +5,8 @@ "couchdb_user": "= global.services[:couchdb].couch.users[:webapp]" }, "definition_files": { - "provider": "= file 'service-definitions/provider.json.erb'", - "eip_service": "= file 'service-definitions/eip-service.json.erb'" + "provider": "= file :provider_json_template", + "eip_service": "= file :eip_service_json_template" }, "service_type": "public_service", "api_domain": "= 'api.' + domain.full_suffix", -- 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/services/webapp.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'provider_base/services/webapp.json') diff --git a/provider_base/services/webapp.json b/provider_base/services/webapp.json index 321c26ea..afb51ee1 100644 --- a/provider_base/services/webapp.json +++ b/provider_base/services/webapp.json @@ -1,7 +1,7 @@ { "webapp": { "modules": ["user", "billing", "help"], - "couchdb_hosts": "= nodes[:services => :couchdb].field('domain.name')", + "couchdb_hosts": "= nodes[:services => :couchdb][:local => local].field('domain.name')", "couchdb_user": "= global.services[:couchdb].couch.users[:webapp]" }, "definition_files": { -- cgit v1.2.3 From bef21f7f132438777b2ab92525559ba8ed869fb9 Mon Sep 17 00:00:00 2001 From: elijah Date: Wed, 28 Nov 2012 14:09:23 -0800 Subject: updated service templates to reflect new command names --- provider_base/services/webapp.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'provider_base/services/webapp.json') diff --git a/provider_base/services/webapp.json b/provider_base/services/webapp.json index afb51ee1..b04ed684 100644 --- a/provider_base/services/webapp.json +++ b/provider_base/services/webapp.json @@ -15,7 +15,7 @@ }, "x509": { "use": true, - "ca_cert": "= file :ca_cert, :missing => 'provider CA. Run `leap init-ca`'", + "ca_cert": "= file :ca_cert, :missing => 'provider CA. Run `leap cert ca`'", "commercial_cert": "= file [:commercial_cert, global.provider.domain]", "commercial_key": "= file [:commercial_key, global.provider.domain]", "commercial_ca_cert": "= try_file :commercial_ca_cert" -- 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/services/webapp.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'provider_base/services/webapp.json') diff --git a/provider_base/services/webapp.json b/provider_base/services/webapp.json index b04ed684..3eb0ba62 100644 --- a/provider_base/services/webapp.json +++ b/provider_base/services/webapp.json @@ -1,7 +1,7 @@ { "webapp": { "modules": ["user", "billing", "help"], - "couchdb_hosts": "= nodes[:services => :couchdb][:local => local].field('domain.name')", + "couchdb_hosts": "= hostnames nodes[:services => :couchdb][:local => local]", "couchdb_user": "= global.services[:couchdb].couch.users[:webapp]" }, "definition_files": { -- cgit v1.2.3 From c3c23bbc27dee3fdcdf9aec6addcc816ad7b52ba Mon Sep 17 00:00:00 2001 From: elijah Date: Wed, 19 Dec 2012 12:12:16 -0800 Subject: webapp api now uses a customizable port (so that we don't try to rely on SNI for hosting two TLS domains on one IP). --- provider_base/services/webapp.json | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'provider_base/services/webapp.json') diff --git a/provider_base/services/webapp.json b/provider_base/services/webapp.json index 3eb0ba62..e40ed0ca 100644 --- a/provider_base/services/webapp.json +++ b/provider_base/services/webapp.json @@ -9,9 +9,12 @@ "eip_service": "= file :eip_service_json_template" }, "service_type": "public_service", - "api_domain": "= 'api.' + domain.full_suffix", + "api": { + "domain": "= 'api.' + domain.full_suffix", + "port": "4430" + }, "dns": { - "aliases": "= [domain.full, api_domain]" + "aliases": "= [domain.full, api.domain]" }, "x509": { "use": true, -- cgit v1.2.3 From ec6c48ab589d4174dc192a01c4b99833227c5942 Mon Sep 17 00:00:00 2001 From: elijah Date: Sun, 13 Jan 2013 20:30:24 -0800 Subject: added ability to customize the webapp appearance --- provider_base/services/webapp.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'provider_base/services/webapp.json') diff --git a/provider_base/services/webapp.json b/provider_base/services/webapp.json index e40ed0ca..311f1284 100644 --- a/provider_base/services/webapp.json +++ b/provider_base/services/webapp.json @@ -2,7 +2,11 @@ "webapp": { "modules": ["user", "billing", "help"], "couchdb_hosts": "= hostnames nodes[:services => :couchdb][:local => local]", - "couchdb_user": "= global.services[:couchdb].couch.users[:webapp]" + "couchdb_user": "= global.services[:couchdb].couch.users[:webapp]", + "favicon": "= file_path 'branding/favicon.ico'", + "tail_scss": "= file_path 'branding/tail.scss'", + "head_scss": "= file_path 'branding/head.scss'", + "img_dir": "= file_path 'branding/img'" }, "definition_files": { "provider": "= file :provider_json_template", -- cgit v1.2.3 From 306a0e6c21d0e27035ba48530392eede59537516 Mon Sep 17 00:00:00 2001 From: elijah Date: Mon, 21 Jan 2013 22:41:51 -0800 Subject: client ca -- configure the webapp with the client ca --- provider_base/services/webapp.json | 2 ++ 1 file changed, 2 insertions(+) (limited to 'provider_base/services/webapp.json') diff --git a/provider_base/services/webapp.json b/provider_base/services/webapp.json index 311f1284..c9e4c532 100644 --- a/provider_base/services/webapp.json +++ b/provider_base/services/webapp.json @@ -23,6 +23,8 @@ "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, global.provider.domain]", "commercial_key": "= file [:commercial_key, global.provider.domain]", "commercial_ca_cert": "= try_file :commercial_ca_cert" -- cgit v1.2.3 From ba2b83b19f951322e85f64bf010764a49ee9f2f4 Mon Sep 17 00:00:00 2001 From: elijah Date: Tue, 12 Feb 2013 10:54:04 -0800 Subject: temporarily make the webapp use the admin couchdb user. waiting on https://leap.se/code/issues/1163 --- provider_base/services/webapp.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'provider_base/services/webapp.json') diff --git a/provider_base/services/webapp.json b/provider_base/services/webapp.json index c9e4c532..e3055c6f 100644 --- a/provider_base/services/webapp.json +++ b/provider_base/services/webapp.json @@ -2,7 +2,9 @@ "webapp": { "modules": ["user", "billing", "help"], "couchdb_hosts": "= hostnames nodes[:services => :couchdb][:local => local]", - "couchdb_user": "= global.services[:couchdb].couch.users[:webapp]", + # NOTE: this is bad, but pending a fix to https://leap.se/code/issues/1163 + # before we can use user "webapp" + "couchdb_user": "= global.services[:couchdb].couch.users[:admin]", "favicon": "= file_path 'branding/favicon.ico'", "tail_scss": "= file_path 'branding/tail.scss'", "head_scss": "= file_path 'branding/head.scss'", -- cgit v1.2.3