suitmymind-ubuntu-machine 0.4.6.2 → 0.4.7

data/lib/capistrano/ext/ubuntu-machine/machine.rb

@@ -6,9 +6,16 @@ namespace :machine do
     set :user, 'root'
     
     run_and_watch_prompt("passwd", [/Enter new UNIX password/, /Retype new UNIX password:/])
-
+    
     run_and_watch_prompt("adduser #{user_to_create}", [/Enter new UNIX password/, /Retype new UNIX password:/, /\[\]\:/, /\[y\/N\]/i])
     
+    # force the non-interactive mode
+    run "cat /etc/environment > ~/environment.tmp"
+    run 'echo DEBIAN_FRONTEND=noninteractive >> ~/environment.tmp'
+    sudo 'mv ~/environment.tmp /etc/environment'
+    # prevent this env variable to be skipped by sudo
+    run "echo 'Defaults env_keep = \"DEBIAN_FRONTEND\"' >> /etc/sudoers"
+
     run "echo '#{user_to_create} ALL=(ALL)ALL' >> /etc/sudoers"
     run "echo 'AllowUsers #{user_to_create}' >> /etc/ssh/sshd_config"
     run "/etc/init.d/ssh reload"

data/lib/capistrano/ext/ubuntu-machine/mysql.rb

@@ -49,11 +49,10 @@ namespace :mysql do
   task :install, :roles => :db do
     db_root_password = Capistrano::CLI.ui.ask("Choose a MySQL root password : ")
 
-    run "export DEBIAN_FRONTEND=noninteractive"
-    sudo "aptitude install -y mysql-server mysql-client libmysqlclient15-dev"
+    sudo "aptitude install -y mysql-server mysql-client libmysqlclient15-dev"    
     run "mysqladmin -u root password #{db_root_password}"    
   end
-  
+    
   desc "Ask for a MySQL user and change his password"
   task :change_password, :roles => :db do
     user_to_update = Capistrano::CLI.ui.ask("Name of the MySQL user whose you want to update the password : ")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: suitmymind-ubuntu-machine
 version: !ruby/object:Gem::Version 
-  version: 0.4.6.2
+  version: 0.4.7
 platform: ruby
 authors: 
 - Thomas Balthazar
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-26 00:00:00 -08:00
+date: 2009-02-27 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency