Merge pull request carlos-jenkins#13 from gisce/config_hooks_path

carlos-jenkins · web-flow · commit 37c0ec90c85b · 2016-08-24T11:14:51.000-06:00
Allow to configure hooks path
diff --git a/README.rst b/README.rst
@@ -33,6 +33,7 @@ You can configure what the application does by changing ``config.json``:
         "github_ips_only": true,
         "enforce_secret": "",
         "return_scripts_info": true
+        "hooks_path": "/.../hooks/"
     }
 
 :github_ips_only: Restrict application to be called only by GitHub IPs. IPs
@@ -48,6 +49,8 @@ You can configure what the application does by changing ``config.json``:
  you will be able to see the result of your hooks from within your GitHub
  hooks configuration page (see "Recent Deliveries").
  Default: ``true``.
+ :hooks_path: Configures a path to import the hooks. If not set, it'll import
+ the hooks from the default location (/.../python-github-webhooks/hooks)
 
 
 Adding Hooks
diff --git a/webhooks.py b/webhooks.py
@@ -42,7 +42,6 @@ def index():
     """
 
     path = normpath(abspath(dirname(__file__)))
-    hooks = join(path, 'hooks')
 
     # Only POST is implemented
     if request.method != 'POST':
@@ -52,6 +51,8 @@ def index():
     with open(join(path, 'config.json'), 'r') as cfg:
         config = loads(cfg.read())
 
+    hooks = config.get('hooks_path', join(path, 'hooks'))
+
     # Allow Github IPs only
     if config.get('github_ips_only', True):
         src_ip = ip_address(
