suitmymind-ubuntu-machine 0.4.8 → 0.4.9

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

@@ -15,6 +15,7 @@ Capistrano::Configuration.instance.load {load("#{File.dirname(__FILE__)}/ubuntu-
 Capistrano::Configuration.instance.load {load("#{File.dirname(__FILE__)}/ubuntu-machine/machine.rb")}
 Capistrano::Configuration.instance.load {load("#{File.dirname(__FILE__)}/ubuntu-machine/mysql.rb")}
 Capistrano::Configuration.instance.load {load("#{File.dirname(__FILE__)}/ubuntu-machine/php.rb")}
+Capistrano::Configuration.instance.load {load("#{File.dirname(__FILE__)}/ubuntu-machine/postfix.rb")}
 Capistrano::Configuration.instance.load {load("#{File.dirname(__FILE__)}/ubuntu-machine/ruby.rb")}
 Capistrano::Configuration.instance.load {load("#{File.dirname(__FILE__)}/ubuntu-machine/ssh.rb")}
 Capistrano::Configuration.instance.load {load("#{File.dirname(__FILE__)}/ubuntu-machine/utils.rb")}

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

@@ -1,7 +1,7 @@
 namespace :apache do
   desc "Install Apache"
   task :install, :roles => :web do
-    sudo "aptitude install apache2 apache2.2-common apache2-mpm-prefork apache2-utils libexpat1 ssl-cert -y"
+    sudo "apt-get install apache2 apache2.2-common apache2-mpm-prefork apache2-utils libexpat1 ssl-cert -y"
     
     run "cat /etc/apache2/apache2.conf > ~/apache2.conf.tmp"
     put render("apache2", binding), "apache2.append.conf.tmp"

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

@@ -7,7 +7,7 @@ namespace :aptitude do
     http://articles.slicehost.com/2007/11/6/ubuntu-gutsy-setup-page-2
   DESC
   task :update, :roles => :app do
-    sudo "aptitude update"
+    sudo "apt-get update"
   end
 
   desc "Alias for 'aptitude:safe_upgrade'"
@@ -31,12 +31,13 @@ namespace :aptitude do
     http://articles.slicehost.com/2007/11/6/ubuntu-gutsy-setup-page-2
   DESC
   task :safe_upgrade, :roles => :app do
-    # sudo "aptitude safe-upgrade -y", :pty => true
+    
+    # to prevent interactive mode to block the install script
+    sudo 'aptitude hold console-setup -y'
     
     # By default, OVH replace the original /etc/issue. The safe_upgrade will then ask \
     # if it must overwrite this file, since it has been modified by OVH. \
     # data =~ /^\*\*\*\sissue/ looks for the interactive prompt to enable you to answer
-    sudo 'aptitude hold console-setup -y'
     sudo_and_watch_prompt("aptitude safe-upgrade -y", /^\*\*\*\sissue/)    
   end
   
@@ -64,7 +65,7 @@ namespace :aptitude do
   DESC
   task :install, :roles => :app do
     package = Capistrano::CLI.ui.ask("Which package should we install: ")
-    sudo "aptitude install #{package}"
+    sudo "apt-get install #{package}"
   end
 
   desc <<-DESC
@@ -73,7 +74,7 @@ namespace :aptitude do
   DESC
   task :uninstall, :roles => :app do
     package = Capistrano::CLI.ui.ask("Which package should we uninstall: ")
-    sudo "aptitude remove #{package}"
+    sudo "apt-get remove #{package}"
   end
   
   desc <<-DESC
@@ -90,6 +91,6 @@ namespace :aptitude do
     sudo "/usr/sbin/update-locale LANG=en_GB.UTF-8"
     safe_upgrade
     full_upgrade
-    sudo "aptitude install -y build-essential"
+    sudo "apt-get install -y build-essential"
   end
 end

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

@@ -6,7 +6,7 @@ namespace :iptables do
     http://articles.slicehost.com/2008/4/25/ubuntu-hardy-setup-page-1
   DESC
   task :configure, :roles => :gateway do
-    sudo "aptitude install iptables -y"
+    sudo "apt-get install iptables -y"
     put render("iptables", binding), "iptables.up.rules"
     sudo "mv iptables.up.rules /etc/iptables.up.rules"
     

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

@@ -31,6 +31,7 @@ namespace :machine do
     mysql.install
     apache.install
     ruby.install
+    postfix.install
     gems.install_rubygems
     ruby.install_enterprise
     ruby.install_passenger

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

@@ -49,7 +49,7 @@ namespace :mysql do
   task :install, :roles => :db do
     db_root_password = Capistrano::CLI.ui.ask("Choose a MySQL root password : ")
 
-    sudo "aptitude install -y mysql-server mysql-client libmysqlclient15-dev"    
+    sudo "apt-get install -y mysql-server mysql-client libmysqlclient15-dev"    
     run "mysqladmin -u root password #{db_root_password}"    
   end
     

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

@@ -1,7 +1,7 @@
 namespace :php do
   desc "Install PHP 5"
   task :install, :roles => :app do    
-    sudo "aptitude install libapache2-mod-php5 php5 php5-common php5-curl php5-dev php5-gd php5-imagick php5-mcrypt php5-memcache php5-mhash php5-mysql php5-pspell php5-snmp php5-sqlite php5-xmlrpc php5-xsl -y"
+    sudo "apt-get install libapache2-mod-php5 php5 php5-common php5-curl php5-dev php5-gd php5-imagick php5-mcrypt php5-memcache php5-mhash php5-mysql php5-pspell php5-snmp php5-sqlite php5-xmlrpc php5-xsl -y"
     sudo "/etc/init.d/apache2 reload"
   end
 

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

@@ -0,0 +1,7 @@
+namespace :postfix do
+  desc "Install postfix"
+  task :install, :roles => :app do
+    sudo "sudo apt-get install postfix -y"
+  end
+
+end

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

@@ -3,8 +3,8 @@ require 'net/http'
 namespace :ruby do
   desc "Install Ruby 1.8"
   task :install, :roles => :app do
-    sudo "aptitude install -y ruby1.8-dev ruby1.8 ri1.8 rdoc1.8 irb1.8 libreadline-ruby1.8 libruby1.8 libopenssl-ruby sqlite3 libsqlite3-ruby1.8"
-    sudo "aptitude install -y libmysql-ruby1.8"
+    sudo "apt-get install -y ruby1.8-dev ruby1.8 ri1.8 rdoc1.8 irb1.8 libreadline-ruby1.8 libruby1.8 libopenssl-ruby sqlite3 libsqlite3-ruby1.8"
+    sudo "apt-get install -y libmysql-ruby1.8"
 
     sudo "ln -s /usr/bin/ruby1.8 /usr/bin/ruby"
     sudo "ln -s /usr/bin/ri1.8 /usr/bin/ri"
@@ -20,6 +20,11 @@ namespace :ruby do
   set :ruby_enterprise_version do
     "#{ruby_enterprise_url[/(ruby-enterprise.*)(.tar.gz)/, 1]}"
   end
+  
+  set :passenger_version do
+    `gem list passenger$ -r`.gsub(/[\n|\s|passenger|(|)]/,"")
+  end
+  
 
   desc "Install Ruby Enterpise Edition"
   task :install_enterprise, :roles => :app do
@@ -48,12 +53,12 @@ namespace :ruby do
     sudo "gem install rake"
 
     sudo "apt-get install apache2-mpm-prefork -y"
-    sudo "aptitude install libapr1-dev -y"
+    sudo "apt-get install libapr1-dev -y"
     sudo "apt-get install apache2-prefork-dev -y"
 
     sudo "/opt/#{ruby_enterprise_version}/bin/ruby /opt/#{ruby_enterprise_version}/bin/gem install passenger"
     
-    run "echo -en '\n\n\n\n\n' | sudo /opt/#{ruby_enterprise_version}/bin/ruby /opt/#{ruby_enterprise_version}/bin/passenger-install-apache2-module"
+    run "sudo /opt/#{ruby_enterprise_version}/bin/ruby /opt/#{ruby_enterprise_version}/bin/passenger-install-apache2-module --auto"
     
     put render("passenger.load", binding), "/home/#{user}/passenger.load"
     put render("passenger.conf", binding), "/home/#{user}/passenger.conf"
@@ -64,5 +69,5 @@ namespace :ruby do
     sudo "a2enmod passenger"
     apache.force_reload
   end 
-   
+     
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: suitmymind-ubuntu-machine
 version: !ruby/object:Gem::Version 
-  version: 0.4.8
+  version: 0.4.9
 platform: ruby
 authors: 
 - Thomas Balthazar
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-10 00:00:00 -07:00
+date: 2009-03-17 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -43,6 +43,7 @@ files:
 - lib/capistrano/ext/ubuntu-machine/machine.rb
 - lib/capistrano/ext/ubuntu-machine/mysql.rb
 - lib/capistrano/ext/ubuntu-machine/php.rb
+- lib/capistrano/ext/ubuntu-machine/postfix.rb
 - lib/capistrano/ext/ubuntu-machine/ruby.rb
 - lib/capistrano/ext/ubuntu-machine/ssh.rb
 - lib/capistrano/ext/ubuntu-machine/utils.rb