Added base_url to config and env variables

Author: mahtin

CloudFlare/cloudflare.py

@@ -37,8 +37,11 @@ def __init__(self, config):
                 self.certtoken = config['certtoken']
             else:
                 self.certtoken = None
-
-            self.base_url = config['base_url']
+            if 'base_url' in config:
+                self.base_url = config['base_url']
+            else:
+                # We must have a base_url value
+                self.base_url = BASE_URL
             self.raw = config['raw']
             self.use_sessions = config['use_sessions']
             self.profile = config['profile']
@@ -910,11 +913,9 @@ def api_from_web(self):
 
         return api_decode_from_web(self._base._api_from_web())
 
-    def __init__(self, email=None, token=None, certtoken=None, debug=False, raw=False, use_sessions=True, profile=None):
+    def __init__(self, email=None, token=None, certtoken=None, debug=False, raw=False, use_sessions=True, profile=None, base_url=None):
         """ Cloudflare v4 API"""
 
-        base_url = BASE_URL
-
         try:
             config = read_configs(profile)
         except:

CloudFlare/read_configs.py

@@ -11,13 +11,14 @@ def read_configs(profile=None):
     """ reading the config file for Cloudflare API"""
 
     # We return all these values
-    config = {'email': None, 'token': None, 'certtoken': None, 'extras': None, 'profile': None}
+    config = {'email': None, 'token': None, 'certtoken': None, 'extras': None, 'base_url': None, 'profile': None}
 
     # envioronment variables override config files - so setup first
     config['email'] = os.getenv('CF_API_EMAIL')
     config['token'] = os.getenv('CF_API_KEY')
     config['certtoken'] = os.getenv('CF_API_CERTKEY')
     config['extras'] = os.getenv('CF_API_EXTRAS')
+    config['base_url'] = os.getenv('CF_API_URL')
     if profile is None:
         profile = 'CloudFlare'
     config['profile'] = profile
@@ -42,7 +43,7 @@ def read_configs(profile=None):
             # however section name is missing - this is an error
             raise Exception("%s: configuration section missing" % (profile))
 
-        for option in ['email', 'token', 'certtoken', 'extras']:
+        for option in ['email', 'token', 'certtoken', 'extras', 'base_url']:
             if option not in config or config[option] is None:
                 try:
                     if option == 'extras':