FiXato-ubuntu-machine 0.5.3.2.11 → 0.5.3.2.20

data/README

@@ -10,4 +10,5 @@ http://suitmymind.github.com/ubuntu-machine/#changelog
  - Joseph Glenn
  - Ahume
  - Tarik Alkasab
- - Filip H.F. "FiXato" Slagter
+ - Filip H.F. "FiXato" Slagter
+ - Wes "Narnach" Oldenbeuving

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

@@ -1,7 +1,10 @@
 namespace :apache do
+  _cset(:sites_path) { "/home/#{user}/websites" }
+
   desc "Install Apache"
   task :install, :roles => :web do
     sudo "apt-get install apache2 apache2.2-common apache2-mpm-prefork apache2-utils libexpat1 ssl-cert -y"
+    _cset(:server_name) {Capistrano::CLI.ui.ask("Server name : ")}
     
     run "cat /etc/apache2/apache2.conf > ~/apache2.conf.tmp"
     put render("apache2", binding), "apache2.append.conf.tmp"
@@ -90,12 +93,15 @@ namespace :apache do
     server_admin    = default_server_admin if server_admin.empty?
     server_name     = Capistrano::CLI.ui.ask("Server name : ")
     server_alias    = Capistrano::CLI.ui.ask("Server alias : ")
+    server_port     = Capistrano::CLI.ui.ask("Server port (80) if blank : ")
+    server_port     = 80 if server_port.empty?
     directory_index = Capistrano::CLI.ui.ask("Directory index (#{default_directory_index}) if blank : ")
     directory_index = default_directory_index if directory_index.empty?
+    document_root   = "#{sites_path}/#{server_name}/public"
 
     # Website skeleton
     %w{backup cap cgi-bin logs private public tmp}.each { |d|
-      run "mkdir -p /home/#{user}/websites/#{server_name}/#{d}"
+      run "mkdir -p #{sites_path}/#{server_name}/#{d}"
     }
     
     put render("vhost", binding), server_name
@@ -111,7 +117,7 @@ namespace :apache do
     if sure=="y"
       sudo "sudo a2dissite #{server_name}"
       sudo "rm /etc/apache2/sites-available/#{server_name}"
-      sudo "rm -Rf /home/#{user}/websites/#{server_name}"
+      sudo "rm -Rf #{sites_path}/#{server_name}"
       reload
     end
   end
@@ -130,6 +136,11 @@ namespace :apache do
     run "tar -xzf mod_xsendfile-0.9.tar.gz"
     sudo "mkdir -p /usr/local/src"
     sudo "mv mod_xsendfile-0.9* /usr/local/src/"
-    sudo "apxs2 -cia /usr/local/src/mod_xsendfile-0.9/mod_xsendfile.c"
+    sudo "apxs2 -ci /usr/local/src/mod_xsendfile-0.9/mod_xsendfile.c"
+    put render("xsendfile.conf", binding), "xsendfile.conf.tmp"
+    sudo "mv xsendfile.conf.tmp /etc/apache2/mods-available/xsendfile.conf"
+    put render("xsendfile.load", binding), "xsendfile.load.tmp"
+    sudo "mv xsendfile.load.tmp /etc/apache2/mods-available/xsendfile.load"
+    sudo "a2enmod xsendfile"
   end
 end

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

@@ -0,0 +1,33 @@
+desc "Installs extra utils: curl, lynx, mailutils, munin, imagemagick"
+task :install_all do
+  install_curl
+  install_lynx
+  install_mailutils
+  install_munin
+  install_imagemagick
+end
+
+desc "Installs extra util curl"
+task :install_curl do
+  sudo "aptitude install -y curl"
+end
+
+desc "Installs extra util lynx"
+task :install_lynx do
+  sudo "aptitude install -y lynx"
+end
+
+desc "Installs extra util mailutils"
+task :install_mailutils do
+  sudo "aptitude install -y mailutils"
+end
+
+desc "Installs extra util munin"
+task :install_munin do
+  sudo "aptitude install -y munin"
+end
+
+desc "Installs extra util imagemagick"
+task :install_imagemagick do
+  sudo "aptitude install -y imagemagick"
+end

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

@@ -11,7 +11,7 @@ namespace :ffmpeg do
   task :install_dependencies, :roles => :app do
     #TODO: Ensure that the multiverse repositories/sources are available and being used by aptitude \
     # otherwise add them to /etc/apt/sources.list since they are needed for libraries such as libmp3lame-dev
-    sudo "aptitude install -y ccache checkinstall fakeroot liba52-0.7.4-dev liba52-dev libfaac-dev libfaad-dev libfreetype6-dev libgpac-dev libjpeg62-dev libmp3lame-dev libogg-dev libpng12-dev libtheora-dev libtiff4-dev libvorbis-dev libxvidcore4-dev"
+    sudo "aptitude install -y ccache checkinstall fakeroot liba52-0.7.4-dev liba52-dev libfaac-dev libfaad-dev libfreetype6-dev libgpac-dev libjpeg62-dev liblame-dev liblame0 libmp3lame-dev libogg-dev libpng12-dev libtheora-dev libtiff4-dev libvorbis-dev libxvidcore4-dev"
     run "wget http://www.tortall.net/projects/yasm/releases/yasm-0.7.1.tar.gz -O yasm-0.7.1.tar.gz && tar -xzf yasm-0.7.1.tar.gz && cd yasm-0.7.1 && ./configure && make && sudo checkinstall -y"
     sudo "ldconfig"
     run "if test -x x264; then cd x264 && git checkout master && git pull; else git clone git://git.videolan.org/x264.git; fi"

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

@@ -42,24 +42,28 @@ namespace :gems do
     run "echo 'gem: --no-rdoc --no-ri' >> ~/.gemrc"
   end
 
-  # TODO: Replace scp with Capistrano's way of uploading/deploying files.
   desc "Scp local gem to the remote server and install it"
   task :deploy_local_gem, :roles => :app do
     local_gem_path = Capistrano::CLI.ui.ask("Please supply the path to the local gem: ")
     run "mkdir -p gems"
-    `scp -P #{ssh_options[:port]} #{File.expand_path(local_gem_path)} #{user}@#{server_name}:gems/`
-    sudo "gem install -l gems/#{File.basename(local_gem_path)}"
+    upload(local_gem_path,'~/gems/',:via => :scp, :recursive => false)
+    sudo_keepalive
+    run "cd gems/ && sudo gem install -l #{File.basename(local_gem_path)}"
   end
 
-  # TODO: Replace scp with Capistrano's way of uploading/deploying files.
   # TODO: Refactor with deploy_local_gem
   desc "Scp a set of local gems preconfigured in :local_gems_to_deploy to the remote server and install them"
   task :deploy_local_gems, :roles => :app do
     _cset(:local_gems_to_deploy) { abort "Please specify the local gems you want to deploy:\n  set :local_gems_to_deploy, ['/path/to/your_local-1.2.gem']" }
     run "mkdir -p gems"
+    # First upload all gems
     local_gems_to_deploy.each do |local_gem_path|
-      `scp -P #{ssh_options[:port]} #{File.expand_path(local_gem_path)} #{user}@#{server_name}:gems/`
-      sudo "gem install -l gems/#{File.basename(local_gem_path)}"
+      upload(local_gem_path,'~/gems/',:via => :scp, :recursive => false)
+    end
+    # Then install them
+    local_gems_to_deploy.each do |local_gem_path|
+      sudo_keepalive
+      run "cd gems/ && sudo gem install -l #{File.basename(local_gem_path)}"
     end
   end
 end

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

@@ -61,9 +61,10 @@ end
 def add_to_crontab(commands,period,use_sudo=false)
   send_cmd = use_sudo ? :sudo : :run
   tmp_cron="/tmp/cron.tmp"
+  self.send(send_cmd, "rm -f #{tmp_cron} && touch #{tmp_cron}")
+  run "(#{use_sudo ? 'sudo ' : ''}crontab -l || true) > #{tmp_cron}"
   cron_lines = [*commands].map{|cmd| "#{period} #{cmd}"}
-  self.send(send_cmd, "rm -f #{tmp_cron} && crontab -l || true > #{tmp_cron}")
-  add_to_file(cron_lines, tmp_cron)
+  add_to_file(tmp_cron, cron_lines)
   self.send(send_cmd, "crontab #{tmp_cron}")
   sudo "rm -f #{tmp_cron}"
 end

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

@@ -40,6 +40,7 @@ namespace :machine do
     ruby.install_passenger
     git.install
     php.install
+    extras.install_all
   end
   
   desc = "Ask for a user and change his password"
@@ -48,4 +49,35 @@ namespace :machine do
     
     run_and_watch_prompt("passwd #{user_to_update}", [/Enter new UNIX password/, /Retype new UNIX password:/])
   end
+
+  desc "Change the hostname of the machine"
+  task :change_hostname do
+    _cset(:hostname) {Capistrano::CLI.ui.ask("What do you want to change the hostname of this machine to? : ")}
+    tmp_host = 'hostname.tmp'
+    run "echo '#{hostname}' > #{tmp_host}"
+    sudo "cp #{tmp_host} /etc/hostname"
+    sudo "rm #{tmp_host}"
+    sudo_add_to_file('/etc/hosts', "127.0.0.1 #{hostname}")
+    sudo "/etc/init.d/hostname.sh start"
+  end
+
+  desc "Add current path to crontab"
+  task :add_path_to_crontab do
+    tmp_cron="/tmp/cron.tmp"
+    run "rm -f #{tmp_cron} && touch #{tmp_cron}"
+    run "echo PATH=$PATH > #{tmp_cron}"
+    run "(crontab -l || true) >> #{tmp_cron}"
+    run "crontab #{tmp_cron}"
+    run "rm -f #{tmp_cron}"
+  end
+
+  desc "Add current path to sudo crontab"
+  task :sudo_add_path_to_crontab do
+    tmp_cron="/tmp/cron.tmp"
+    sudo "rm -f #{tmp_cron} && touch #{tmp_cron}"
+    run "echo PATH=$PATH > #{tmp_cron}"
+    run "(sudo crontab -l || true) >> #{tmp_cron}"
+    sudo "crontab #{tmp_cron}"
+    sudo "rm -f #{tmp_cron}"
+  end
 end

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

@@ -50,7 +50,7 @@ namespace :ruby do
     sudo "ln -s #{ruby_enterprise_path_prefix}/#{ruby_enterprise_version} #{ruby_enterprise_path_prefix}/ruby-enterprise" 
     
     # add REE bin to the path
-    sudo_add_to_file('/etc/environment','echo PATH="%s/ruby-enterprise/bin:$PATH"' % ruby_enterprise_path_prefix)
+    sudo_add_to_file('/etc/environment','PATH="%s/ruby-enterprise/bin:$PATH"' % ruby_enterprise_path_prefix)
   end
   
   desc "Install Phusion Passenger"

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

@@ -1,5 +1,5 @@
 namespace :ssh do
-  _cset :ssh_secundary_keys, []
+  _cset :ssh_secondary_keys, []
   _cset(:ssh_config_port) {ssh_options[:port] || 22}
 
   desc <<-DESC
@@ -13,17 +13,24 @@ namespace :ssh do
     reload
   end
 
-  desc "Uploads secundary ssh pubkeys defined in ssh_secundary_keys which don't necessarily belong to you."
-  task :add_secundary_keys do
+  desc "Uploads secondary ssh pubkeys defined in ssh_secondary_keys which don't necessarily belong to you."
+  task :add_secondary_keys do
     run "mkdir -p ~/.ssh"
     run "chown -R #{user}:#{user} ~/.ssh"
     run "chmod 700 ~/.ssh"
 
-    [*ssh_secundary_keys].each do |key|
-      key = File.read("#{key}.pub")
+    [*ssh_secondary_keys].each do |key|
+      key = File.read("#{key}.pub").strip
       run "echo '#{key}' >> ./.ssh/authorized_keys2"
     end
   end
+
+  after 'ssh:add_secondary_keys', 'ssh:cleanup_keys'
+
+  desc 'Sort and remove duplicate keys. Useful if you run ssh:add_secondary_keys multiple times by accident.'
+  task :cleanup_keys do
+    run 'sort -u ~/.ssh/authorized_keys2 > /home/yoadmin/.ssh/authorized_keys2-sorted && mv /home/yoadmin/.ssh/authorized_keys2-sorted /home/yoadmin/.ssh/authorized_keys2'
+  end
   
   desc <<-DESC
     Uploads your local public SSH keys to the server. A .ssh folder is created if \

data/lib/capistrano/ext/ubuntu-machine/templates/vhost.erb

@@ -1,4 +1,5 @@
-<VirtualHost *:80>
+NameVirtualHost *:<%= server_port %>
+<VirtualHost *:<%= server_port %>>
 
   # Admin email, Server Name (domain name) and any aliases
   ServerAdmin <%= server_admin %>
@@ -7,11 +8,11 @@
 
   # Index file and Document Root (where the public files are located)
   DirectoryIndex <%= directory_index %>
-  DocumentRoot /home/<%= user %>/websites/<%= server_name %>/public
+  DocumentRoot <%= document_root %>
 
   # Custom log file locations
   LogLevel warn
-  ErrorLog  /home/<%= user %>/websites/<%= server_name %>/logs/error.log
-  CustomLog /home/<%= user %>/websites/<%= server_name %>/logs/access.log combined
+  ErrorLog  <%= sites_path %>/<%= server_name %>/logs/error.log
+  CustomLog <%= sites_path %>/<%= server_name %>/logs/access.log combined
 
 </VirtualHost>

data/lib/capistrano/ext/ubuntu-machine/templates/xsendfile.conf.erb

@@ -0,0 +1,3 @@
+<IfModule mod_xsendfile.c>
+    XSendFile on
+</IfModule>

data/lib/capistrano/ext/ubuntu-machine/templates/xsendfile.load.erb

@@ -0,0 +1 @@
+LoadModule xsendfile_module /usr/lib/apache2/modules/mod_xsendfile.so

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

@@ -42,5 +42,6 @@ namespace :utils do
     run "df"
     partition = Capistrano::CLI.ui.ask("Which partition do you want to run a filesystem check on, on every boot? ")
     sudo "tune2fs -c 1 #{partition}"
+    sudo 'sed -i -e s/FSCKFIX=no/FSCKFIX=yes/ /etc/default/rcS'
   end
 end

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

@@ -24,8 +24,6 @@ namespace :vsftpd do
 
   desc "Add the :vsftpd_user_shell to /etc/shells"
   task :add_nologin_shell do
-    puts "If this fails, then the '#{vsftpd_user_shell}'-shell is already in /etc/shells"
-    run "test -z `grep #{vsftpd_user_shell} /etc/shells`"
     sudo_add_to_file('/etc/shells',vsftpd_user_shell)
   end
 

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

@@ -8,6 +8,7 @@ end
 
 Capistrano::Configuration.instance.load {load("#{File.dirname(__FILE__)}/ubuntu-machine/apache.rb")}
 Capistrano::Configuration.instance.load {load("#{File.dirname(__FILE__)}/ubuntu-machine/aptitude.rb")}
+Capistrano::Configuration.instance.load {load("#{File.dirname(__FILE__)}/ubuntu-machine/extras.rb")}
 Capistrano::Configuration.instance.load {load("#{File.dirname(__FILE__)}/ubuntu-machine/ffmpeg.rb")}
 Capistrano::Configuration.instance.load {load("#{File.dirname(__FILE__)}/ubuntu-machine/gems.rb")}
 Capistrano::Configuration.instance.load {load("#{File.dirname(__FILE__)}/ubuntu-machine/git.rb")}

metadata

@@ -1,17 +1,18 @@
 --- !ruby/object:Gem::Specification 
 name: FiXato-ubuntu-machine
 version: !ruby/object:Gem::Version 
-  version: 0.5.3.2.11
+  version: 0.5.3.2.20
 platform: ruby
 authors: 
 - Thomas Balthazar
 - Tarik Alkasab
 - Filip H.F. 'FiXato' Slagter
+- Wes Oldenbeuving
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2009-06-26 00:00:00 -07:00
+date: 2009-09-18 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -38,6 +39,7 @@ files:
 - lib/capistrano/ext/ubuntu-machine.rb
 - lib/capistrano/ext/ubuntu-machine/apache.rb
 - lib/capistrano/ext/ubuntu-machine/aptitude.rb
+- lib/capistrano/ext/ubuntu-machine/extras.rb
 - lib/capistrano/ext/ubuntu-machine/ffmpeg.rb
 - lib/capistrano/ext/ubuntu-machine/gems.rb
 - lib/capistrano/ext/ubuntu-machine/git.rb
@@ -71,8 +73,11 @@ files:
 - lib/capistrano/ext/ubuntu-machine/templates/sshd_config.erb
 - lib/capistrano/ext/ubuntu-machine/templates/vhost.erb
 - lib/capistrano/ext/ubuntu-machine/templates/vsftpd.conf.erb
+- lib/capistrano/ext/ubuntu-machine/templates/xsendfile.load.erb
+- lib/capistrano/ext/ubuntu-machine/templates/xsendfile.conf.erb
 has_rdoc: false
 homepage: http://github.com/FiXato/ubuntu-machine
+licenses: 
 post_install_message: 
 rdoc_options: []
 
@@ -93,7 +98,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.2.0
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 2
 summary: Capistrano recipes for setting up and deploying to a Ubuntu Machine. Fork of SuitMyMind's ubuntu-machine