Merge pull request #5 from keown/master

add more options to ssh configuration

Author: Eddie Flores

README.md

@@ -26,6 +26,7 @@ var stagingEnvironment = {
     type: 'ssh', // the default store is 'redis', use 'ssh' for this addon.
     remoteDir: process.env['APP_STAGING_REMOTE_DIR_PATH'],
     host: process.env['APP_STAGING_REMOTE_HOST_IP'],
+    port: process.env['APP_STAGING_REMOTE_SSH_PORT'],
     username: process.env['APP_STAGING_REMOTE_USERNAME'],
     privateKeyFile: process.env['APP_STAGING_REMOTE_PRIVATE_KEY']
   },
@@ -46,6 +47,18 @@ module.exports = {
 
 ```
 
+**SSH Configuration**
+
+The following parameters are available to setup correctly ssh:
+
+* **host** - Hostname or IP address of the server (**required**)
+* **username** - Username for authentication (**required**)
+* **port** - Port of the server (**optional**)
+* **privateKeyFile** - String that contains a private key for either key-based or hostbased user authentication (**optional**)
+* **passphrase** - Passphrase used to decrypt private key, if needed (**optional**)
+* **agent** - Path to ssh-agent's UNIX socket for ssh-agent-based user authentication (**optional**)
+
+
 ## Directory Structure ##
 
 The following directory structure is created on your server. The basic gist is that your revisions will be stored inside of their own directory along with meta data about the revision (date of commit, commit message, author of the commit, and commit hash). Information about your revisions is viewable via the following command `ember deploy:list -e <your environment>`.
@@ -104,4 +117,4 @@ $ ember deploy:activate -e staging -r <revisionId>
 ```
 
 
-> This project is based on this repo: https://github.com/treyhunner/ember-deploy-ssh-index. Though, it's been heavily modified to serve a different purpose -credit where credit is due.
+> This project is based on this repo: https://github.com/treyhunner/ember-deploy-ssh-index. Though, it's been heavily modified to serve a different purpose -credit where credit is due.

lib/ssh-adapter.js

@@ -13,6 +13,17 @@ var noop = function () {};
  */
 var connect = function (conn, config, cb) {
 
+  var ssh_config = {
+    host: config.host,
+    username: config.username,
+    port: config.port || '22',
+    agent: config.agent,
+    passphrase: config.passphrase
+  }
+
+  if (typeof config.privateKeyFile != 'undefined')
+    ssh_config['privateKey'] = require('fs').readFileSync(config.privateKeyFile);
+
   conn.on('ready', function () {
     cb();
   });
@@ -21,11 +32,7 @@ var connect = function (conn, config, cb) {
     cb(error);
   });
 
-  conn.connect({
-    host: config.host,
-    username: config.username,
-    privateKey: require('fs').readFileSync(config.privateKeyFile),
-  });
+  conn.connect(ssh_config);
 };
 
 /**
@@ -247,9 +254,16 @@ var upload = function (indexBuffer) {
         conn = _this.conn,
         config = _this.config,
         revisionDir = path.join(config.remoteDir, shortCommitId),
-        host = config.host,
-        username = config.username;
+        ssh_config = {
+          host: _this.config.host,
+          username: _this.config.username,
+          port: _this.config.port || '22',
+          agent: _this.config.agent,
+          passphrase: _this.config.passphrase
+        };
 
+    if (typeof _this.config.privateKeyFile != 'undefined')
+      ssh_config['privateKey'] = require('fs').readFileSync(_this.config.privateKeyFile);
 
     conn.on('ready', function () {
       console.log('+- Connected.');
@@ -273,11 +287,7 @@ var upload = function (indexBuffer) {
 
     conn.on('error', reject);
 
-    conn.connect({
-      host: host,
-      username: username,
-      privateKey: require('fs').readFileSync(config.privateKeyFile)
-    });
+    conn.connect(ssh_config);
 
   });
 };