3 files changed, 11 insertions, 11 deletions
diff --git a/provider_base/services/openvpn.json b/provider_base/services/openvpn.json
index 5d77f946..5a87335b 100644
--- a/provider_base/services/openvpn.json
+++ b/provider_base/services/openvpn.json
@@ -14,10 +14,10 @@
     "filter_dns": false,
     "adblock": false,
     "user_ips": false,
-    "allow_limited": "= global.provider.service.allow_limited_bandwidth",
-    "allow_unlimited": "= global.provider.service.allow_unlimited_bandwidth",
-    "limited_prefix": "= global.provider.ca.client_certificates.limited_prefix",
-    "unlimited_prefix": "= global.provider.ca.client_certificates.unlimited_prefix",
-    "rate_limit": "= openvpn.allow_limited ? global.provider.service.bandwidth_limit : nil"
+    "allow_limited": "= provider.service.allow_limited_bandwidth",
+    "allow_unlimited": "= provider.service.allow_unlimited_bandwidth",
+    "limited_prefix": "= provider.ca.client_certificates.limited_prefix",
+    "unlimited_prefix": "= provider.ca.client_certificates.unlimited_prefix",
+    "rate_limit": "= openvpn.allow_limited ? provider.service.bandwidth_limit : nil"
   }
 }
diff --git a/provider_base/services/tor.json b/provider_base/services/tor.json
index 9173b8d4..ed75285c 100644
--- a/provider_base/services/tor.json
+++ b/provider_base/services/tor.json
@@ -1,6 +1,6 @@
 {
   "tor": {
     "bandwidth_rate": 6550,
-    "contacts": "= global.provider.contacts['tor'] || global.provider.contacts.default"
+    "contacts": "= provider.contacts['tor'] || provider.contacts.default"
   }
 }
diff --git a/provider_base/services/webapp.json b/provider_base/services/webapp.json
index f7abdffd..29c0cbf9 100644
--- a/provider_base/services/webapp.json
+++ b/provider_base/services/webapp.json
@@ -8,10 +8,10 @@
       "salt": "= hex_secret :couch_webapp_password_salt, 128"
     },
     "customization_dir": "= file_path 'webapp'",
-    "client_certificates": "= global.provider.ca.client_certificates",
-    "allow_limited_certs": "= global.provider.service.allow_limited_bandwidth",
-    "allow_unlimited_certs": "= global.provider.service.allow_unlimited_bandwidth",
-    "allow_anonymous_certs": "= global.provider.service.allow_anonymous",
+    "client_certificates": "= provider.ca.client_certificates",
+    "allow_limited_certs": "= provider.service.allow_limited_bandwidth",
+    "allow_unlimited_certs": "= provider.service.allow_unlimited_bandwidth",
+    "allow_anonymous_certs": "= provider.service.allow_anonymous",
     "secret_token": "= secret :webapp_secret_token",
     "api_version": 1,
     "secure": false,
@@ -19,7 +19,7 @@
       "source": "https://leap.se/git/leap_web",
       "revision": "origin/master"
     },
-    "client_version": "= global.provider.client_version",
+    "client_version": "= provider.client_version",
     "nagios_test_user": {
       "username": "nagios_test",
       "password": "= secret :nagios_test_password"