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) --- .../files/service-definitions/provider.json.erb | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 provider_base/files/service-definitions/provider.json.erb (limited to 'provider_base/files') diff --git a/provider_base/files/service-definitions/provider.json.erb b/provider_base/files/service-definitions/provider.json.erb new file mode 100644 index 00000000..76245739 --- /dev/null +++ b/provider_base/files/service-definitions/provider.json.erb @@ -0,0 +1,20 @@ +<%= + hsh = {} + + # grab some fields from provider.json + hsh = global.provider.pick( + :languages, :description, :name, + :enrollment_policy, :default_language, :domain + ) + + # advertise services that are 'user services' + hsh['services'] = global.services[:service_type => :user_service].field(:name) + + hsh['api_version'] = "1" + hsh['api_uri'] = "https://" + api_domain + + hsh['ca_cert_uri'] = 'https://' + global.provider.domain + '/ca.crt' + hsh['ca_cert_fingerprint'] = "" + + generate_json hsh +%> \ 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 --- .../files/service-definitions/eip-service.json.erb | 33 ++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 provider_base/files/service-definitions/eip-service.json.erb (limited to 'provider_base/files') diff --git a/provider_base/files/service-definitions/eip-service.json.erb b/provider_base/files/service-definitions/eip-service.json.erb new file mode 100644 index 00000000..095f3530 --- /dev/null +++ b/provider_base/files/service-definitions/eip-service.json.erb @@ -0,0 +1,33 @@ +<%= + def underscore(words) + words = words.to_s.dup + words.downcase! + words.gsub! /[^a-z]/, '_' + words + end + + hsh = {} + hsh["serial"] = 1 + hsh["version"] = 1 + clusters = {} + gateways = [] + global.services['openvpn'].node_list.each_node do |node| + next if node.vagrant? + gateway = {} + gateway["capabilities"] = node.openvpn.pick( + :ports, :protocols, :user_ips, :adblock, :filter_dns) + gateway["capabilities"]["transport"] = ["openvpn"] + gateway["ip_address"] = node.ip_address + gateway["host"] = node.domain.full + gateway["cluster"] = underscore(node.openvpn.location) + gateways << gateway + clusters[gateway["cluster"]] ||= { + "name" => gateway["cluster"], + "label" => {"en" => node.openvpn.location} + } + end + hsh["gateways"] = gateways + hsh["clusters"] = clusters.values + + generate_json hsh +%> \ No newline at end of file -- cgit v1.2.3 From cee55f72a33ca735745045ea304a9b6a78c79e96 Mon Sep 17 00:00:00 2001 From: elijah Date: Sat, 17 Nov 2012 01:24:36 -0800 Subject: added missing fingerprint of ca cert to provider definition --- provider_base/files/service-definitions/provider.json.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'provider_base/files') diff --git a/provider_base/files/service-definitions/provider.json.erb b/provider_base/files/service-definitions/provider.json.erb index 76245739..c19e5538 100644 --- a/provider_base/files/service-definitions/provider.json.erb +++ b/provider_base/files/service-definitions/provider.json.erb @@ -14,7 +14,7 @@ hsh['api_uri'] = "https://" + api_domain hsh['ca_cert_uri'] = 'https://' + global.provider.domain + '/ca.crt' - hsh['ca_cert_fingerprint'] = "" + hsh['ca_cert_fingerprint'] = fingerprint(:ca_cert) generate_json hsh %> \ No newline at end of file -- cgit v1.2.3 From 3c253f7015540dde8e2402ba084cc48a70403d33 Mon Sep 17 00:00:00 2001 From: elijah Date: Fri, 23 Nov 2012 01:53:34 -0800 Subject: fix bugs in eip-service.json template --- provider_base/files/service-definitions/eip-service.json.erb | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'provider_base/files') diff --git a/provider_base/files/service-definitions/eip-service.json.erb b/provider_base/files/service-definitions/eip-service.json.erb index 095f3530..8dc7211d 100644 --- a/provider_base/files/service-definitions/eip-service.json.erb +++ b/provider_base/files/service-definitions/eip-service.json.erb @@ -17,7 +17,7 @@ gateway["capabilities"] = node.openvpn.pick( :ports, :protocols, :user_ips, :adblock, :filter_dns) gateway["capabilities"]["transport"] = ["openvpn"] - gateway["ip_address"] = node.ip_address + gateway["ip_address"] = node.openvpn.gateway_address gateway["host"] = node.domain.full gateway["cluster"] = underscore(node.openvpn.location) gateways << gateway @@ -28,6 +28,10 @@ end hsh["gateways"] = gateways hsh["clusters"] = clusters.values - + hsh["openvpn_configuration"] = { + "tls-cipher" => "DHE-RSA-AES128-SHA", + "auth" => "SHA1", + "cipher" => "AES-128-CBC" + } generate_json hsh %> \ No newline at end of file -- 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/files/service-definitions/provider.json.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'provider_base/files') diff --git a/provider_base/files/service-definitions/provider.json.erb b/provider_base/files/service-definitions/provider.json.erb index c19e5538..f26f25a2 100644 --- a/provider_base/files/service-definitions/provider.json.erb +++ b/provider_base/files/service-definitions/provider.json.erb @@ -11,7 +11,7 @@ hsh['services'] = global.services[:service_type => :user_service].field(:name) hsh['api_version'] = "1" - hsh['api_uri'] = "https://" + api_domain + hsh['api_uri'] = "https://" + api.domain + ':' + api.port hsh['ca_cert_uri'] = 'https://' + global.provider.domain + '/ca.crt' hsh['ca_cert_fingerprint'] = fingerprint(:ca_cert) -- 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/files/branding/head.scss | 1 + provider_base/files/branding/tail.scss | 1 + 2 files changed, 2 insertions(+) create mode 100644 provider_base/files/branding/head.scss create mode 100644 provider_base/files/branding/tail.scss (limited to 'provider_base/files') diff --git a/provider_base/files/branding/head.scss b/provider_base/files/branding/head.scss new file mode 100644 index 00000000..c100a004 --- /dev/null +++ b/provider_base/files/branding/head.scss @@ -0,0 +1 @@ +// no head.scss set diff --git a/provider_base/files/branding/tail.scss b/provider_base/files/branding/tail.scss new file mode 100644 index 00000000..919aeec6 --- /dev/null +++ b/provider_base/files/branding/tail.scss @@ -0,0 +1 @@ +// no tail.scss set -- cgit v1.2.3