Skip to content
Snippets Groups Projects
Commit ad0557e9 authored by Lloyd Hilaiel's avatar Lloyd Hilaiel
Browse files

(aws deploy) another bug in deployer support for multiple keys - call...

(aws deploy) another bug in deployer support for multiple keys - call copyNext() to start key copying
parent d0ffcc10
No related branches found
No related tags found
No related merge requests found
......@@ -55,17 +55,7 @@ DevDeployer.prototype.setup = function(cb) {
vm.setName(r.instanceId, "dev.diresworb.org (" + self.sha + ")", function(err, r) {
if (err) return cb(err);
self.emit('progress', "name set");
// now copy up addtional keypairs
var i = 0;
function copyNext() {
if (i == self.keypairs.length) return cb(null);
ssh.addSSHPubKey(self.deets.ipAddress, self.keypairs[i++], function(err) {
if (err) return cb(err);
self.emit('progress', "key added...");
copyNext();
});
}
cb(null);
});
});
});
......@@ -77,7 +67,21 @@ DevDeployer.prototype.configure = function(cb) {
var config = { public_url: "https://dev.diresworb.org" };
ssh.copyUpConfig(self.deets.ipAddress, config, function (err) {
if (err) return cb(err);
ssh.copySSL(self.deets.ipAddress, self.sslpub, self.sslpriv, cb);
ssh.copySSL(self.deets.ipAddress, self.sslpub, self.sslpriv, function(err) {
if (err) return cb(err);
// now copy up addtional keypairs
var i = 0;
function copyNext() {
if (i == self.keypairs.length) return cb(null);
ssh.addSSHPubKey(self.deets.ipAddress, self.keypairs[i++], function(err) {
if (err) return cb(err);
self.emit('progress', "key added...");
copyNext();
});
}
copyNext();
});
});
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment