Merge pull request #42 from radify/various-fixes

Various fixes and improvements
radify · Sep 8, 2015 · 96a146e · 96a146e
2 parents 3d096f8 + 877d5cc
commit 96a146e
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 6 deletions.
diff --git a/lib/Generator.js b/lib/Generator.js
@@ -77,7 +77,7 @@
         .then(getReader('myApp.pem.mustache')).then(render).then(getWriter('ansible/' + answers.appPem))
         .finally(function() {
           fs.chmod('ansible/provision.sh', '0744');
-          fs.chmod('ansible/inventory/ec2.py', '0744');
+          fs.chmod('ansible/inventory/ec2.py', '0755');
         })
         .catch(handler);
     }

diff --git a/lib/questions.js b/lib/questions.js
@@ -295,8 +295,9 @@
   }, {
     type: 'input',
     name: 'keypair',
-    message: 'What is the name of your keypair? This will be used to look for {name}.pem',
+    message: 'What name does AWS use to refer to your keypair?',
     default: function(answers) {
+      if (!answers.keypair) { return 'ansible'; }
       return answers.appName;
     }
   }, {

diff --git a/lib/templates/other.mustache b/lib/templates/other.mustache
diff --git a/lib/templates/provision.sh.mustache b/lib/templates/provision.sh.mustache
@@ -17,4 +17,4 @@ ansible-playbook tag-old-nodes.yaml --limit tag_Environment_{{ environment }}
 ansible-playbook immutable.yaml -vv
 
 # Now terminate any instances with tag "old"
-ansible-playbook destroy-old-nodes.yaml --limit tag_{{ tag_old_app }}_True
+ansible-playbook destroy-old-nodes.yaml --limit tag_{{ tag_old_app }}_True || true
diff --git a/lib/templates/template.mustache b/lib/templates/template.mustache