From 428c32e6d750a419cb453ffb3ce163aad968bd42 Mon Sep 17 00:00:00 2001 From: elijah Date: Wed, 14 Nov 2012 23:51:33 -0800 Subject: removed all the generic .json code. now it is in leap_platform/provider_base. this requires latest leap_cli. --- provider/common.json | 21 ------------ .../files/service-definitions/provider.json.erb | 39 ---------------------- provider/provider.json | 17 +--------- provider/services/ca.json | 6 ---- provider/services/couchdb.json | 22 ------------ provider/services/dns.json | 7 ---- provider/services/openvpn.json | 13 -------- provider/services/webapp.json | 16 --------- 8 files changed, 1 insertion(+), 140 deletions(-) delete mode 100644 provider/files/service-definitions/provider.json.erb delete mode 100644 provider/services/ca.json delete mode 100644 provider/services/couchdb.json delete mode 100644 provider/services/dns.json delete mode 100644 provider/services/openvpn.json delete mode 100644 provider/services/webapp.json diff --git a/provider/common.json b/provider/common.json index 85a93cb..dba3f80 100644 --- a/provider/common.json +++ b/provider/common.json @@ -2,25 +2,4 @@ # Options put here are inherited by all nodes. # { - "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) : nil", - "key": "= x509.use ? file(:node_x509_key) : nil" - }, - "local": "= self.vagrant?" } diff --git a/provider/files/service-definitions/provider.json.erb b/provider/files/service-definitions/provider.json.erb deleted file mode 100644 index 742b88f..0000000 --- a/provider/files/service-definitions/provider.json.erb +++ /dev/null @@ -1,39 +0,0 @@ -<%= - hsh = {} - - # grab some fields from provider.json - hsh = global.provider.pick(:languages, :description, :name, :enrollment_policy) - - # typically this is specified in common.json - hsh['domain'] = domain.full_suffix - - # 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'] = - #hsh['ca_cert_fingerprint'] = - - # { - # "serial": 1, - # "version": "0.1.0", - # "domain": "springbok", - # "languages": ["en"], - # "display_name": { - # "en": "Test Provider" - # }, - # "description": { - # "en": "This is a test provider" - # }, - # "enrollment_policy": "open", - # "services": ["eip"], - # "api_version": "1.0.0", - # "api_uri": "https://94.103.43.3", - # "ca_cert_fingerprint": "SHA256 Fingerprint=19:F1:44:AA:57:DD:59:65:3B:07:5F:25:5D:02:D2:3F:FB:E6:A6:DA:FE:67:35:F2:7D:D7:8B:0E:BF:2B:E5:3C", - # "ca_cert_uri": "https://springbok/ca.crt" - # } - - generate_json hsh -%> \ No newline at end of file diff --git a/provider/provider.json b/provider/provider.json index e083c68..e28bcce 100644 --- a/provider/provider.json +++ b/provider/provider.json @@ -3,7 +3,6 @@ # { "domain": "bitmask.net", - "internal_domain": "= domain.sub(/\\..*$/,'.i')", "name": { "en": "Bitmask" }, @@ -12,19 +11,5 @@ }, "languages": ["en"], "default_language": "en", - "enrollment_policy": "open", - "ca": { - "name": "= global.provider.ca.organization + ' Root CA'", - "organization": "= global.provider.name[global.provider.default_language]", - "organizational_unit": "= 'https://' + global.common.domain.full_suffix", - "bit_size": 4096, - "life_span": "10y", - "server_certificates": { - "bit_size": 3248, - "life_span": "1y" - } - }, - "vagrant": { - "network": "10.5.5.0/24" - } + "enrollment_policy": "open" } diff --git a/provider/services/ca.json b/provider/services/ca.json deleted file mode 100644 index 68f970f..0000000 --- a/provider/services/ca.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "service_type": "internal_service", - "x509": { - "use": true - } -} diff --git a/provider/services/couchdb.json b/provider/services/couchdb.json deleted file mode 100644 index 1c8005c..0000000 --- a/provider/services/couchdb.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "service_type": "internal_service", - "x509": { - "use": true - }, - "couch": { - "users": { - "admin": { - "username": "admin", - "password": "= secret :couch_admin_password" - }, - "webapp": { - "username": "webapp", - "password": "= secret :couch_webapp_password" - }, - "ca_daemon": { - "username": "ca_daemon", - "password": "= secret :couch_ca_daemon_password" - } - } - } -} diff --git a/provider/services/dns.json b/provider/services/dns.json deleted file mode 100644 index 677d9b2..0000000 --- a/provider/services/dns.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "hosts": { - "public": "= nodes['dns.public' => true].fields('domain.name', 'dns.aliases', 'ip_address')", - "private": "= nodes['dns.public' => false].fields('domain.name', 'dns.aliases', 'ip_address')" - }, - "service_type": "public_service" -} \ No newline at end of file diff --git a/provider/services/openvpn.json b/provider/services/openvpn.json deleted file mode 100644 index 29bd5a3..0000000 --- a/provider/services/openvpn.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "openvpn": { - "ports": ["80", "443", "53", "1194"], - "filter_dns": false, - "nat": true, - "ca_crt": "= file 'ca/ca.crt'", - "ca_key": "= file 'ca/ca.key'", - "dh": "= file 'ca/dh.pem'", - "server_crt": "= file :node_x509_cert", - "server_key": "= file :node_x509_key" - }, - "service_type": "user_service" -} diff --git a/provider/services/webapp.json b/provider/services/webapp.json deleted file mode 100644 index a997dc1..0000000 --- a/provider/services/webapp.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "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]" - } -} \ No newline at end of file -- cgit v1.2.3