2 files changed, 10 insertions, 9 deletions
diff --git a/provider_base/services/openvpn.json b/provider_base/services/openvpn.json
index 71d1d2c7..15deab70 100644
--- a/provider_base/services/openvpn.json
+++ b/provider_base/services/openvpn.json
@@ -1,7 +1,9 @@
 {
   "service_type": "user_service",
   "x509": {
-    "use": true
+    "use": true,
+    "ca_cert": "= file :ca_cert, :missing => 'Certificate Authority. Run `leap init-ca`'",
+    "dh": "= file :dh_params, :missing => 'Diffie-Hellman parameters. Run `leap init-dh`'"
   },
   "openvpn": {
     "location": "Location Unknown",
@@ -9,9 +11,6 @@
     "protocols": ["tcp", "udp"],
     "filter_dns": false,
     "adblock": false,
-    "user_ips": false,
-    "ca_crt": "= file :ca_cert, :missing => 'Certificate Authority. Run `leap init-ca`'",
-    "ca_key": "= file :ca_key, :missing => 'Certificate Authority. Run `leap init-ca`'",
-    "dh": "= file :dh_params, :missing => 'Diffie-Hellman parameters. Run `leap init-dh`'"
+    "user_ips": false
   }
 }
diff --git a/provider_base/services/webapp.json b/provider_base/services/webapp.json
index ca9edf33..afb51ee1 100644
--- a/provider_base/services/webapp.json
+++ b/provider_base/services/webapp.json
@@ -1,12 +1,12 @@
 {
   "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": {
-    "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",
@@ -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