Merge pull request #16 from developmentseed/improvements

Making jekyll-hook compatible with Ubuntu 14.0

1 files changed, 19 insertions, 10 deletions

diff --git a/jekyll-hook.js b/jekyll-hook.js
index 5154fd6..a5d61fa 100755
--- a/jekyll-hook.js
+++ b/jekyll-hook.js
@@ -20,7 +20,7 @@ app.post('/hooks/jekyll/:branch', function(req, res) {
 
     // Queue request handler
     tasks.defer(function(req, res, cb) {
-        var data = JSON.parse(req.body.payload);
+        var data = req.body;
         var branch = req.params.branch;
         var params = [];
 
@@ -47,7 +47,14 @@ app.post('/hooks/jekyll/:branch', function(req, res) {
         /* repo   */ params.push(data.repo);
         /* branch */ params.push(data.branch);
         /* owner  */ params.push(data.owner);
-        /* giturl */ params.push('git@' + config.gh_server + ':' + data.owner + '/' + data.repo + '.git');
+
+        /* giturl */
+        if (config.public_repo) {
+            params.push('https://' + config.gh_server + '/' + data.owner + '/' + data.repo + '.git');
+        } else {
+            params.push('git@' + config.gh_server + ':' + data.owner + '/' + data.repo + '.git');
+        }
+
         /* source */ params.push(config.temp + '/' + data.owner + '/' + data.repo + '/' + data.branch + '/' + 'code');
         /* build  */ params.push(config.temp + '/' + data.owner + '/' + data.repo + '/' + data.branch + '/' + 'site');
 
@@ -105,13 +112,15 @@ function run(file, params, cb) {
 }
 
 function send(body, subject, data) {
-    if (config.email && data.pusher.email) {
-        var message = {
-            text: body,
-            from: config.email.user,
-            to: data.pusher.email,
-            subject: subject
-        };
-        mailer.send(message, function(err) { if (err) console.warn(err); });
+    if (config.email.isActivated) {
+        if (config.email && data.pusher.email) {
+            var message = {
+                text: body,
+                from: config.email.user,
+                to: data.pusher.email,
+                subject: subject
+            };
+            mailer.send(message, function(err) { if (err) console.warn(err); });
+        }
     }
 }