FiXato-ubuntu-machine 0.5.3.2.9 → 0.5.3.2.10

data/README

@@ -4,6 +4,10 @@ http://suitmymind.github.com/ubuntu-machine
 = Changelog here :
 http://suitmymind.github.com/ubuntu-machine/#changelog
 
+(Note: the above links belong to the official ubuntu-machine; not my fork.)
+
 = Contributors :
  - Joseph Glenn
- - Ahume
+ - Ahume
+ - Tarik Alkasab
+ - Filip H.F. "FiXato" Slagter

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

@@ -115,7 +115,7 @@ namespace :apache do
       reload
     end
   end
-  
+
   desc "Fix the mod_deflate configuration and activate it"
   task :mod_deflate, :roles => :web do
     put render("deflate.conf", binding), "deflate.conf"

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

@@ -1,10 +1,16 @@
 namespace :ffmpeg do
-  set :x264_commit_hash, ''
-  set :ffmpeg_commit_hash, ''
-  set :libswscale_commit_hash, ''
+  # FFmpeg install has been tested in June 2009 as working with these settings: 
+  # set :x264_commit_hash, '2c597171d5126c3ccae7546f6699d6c4d8ec5e3a'
+  # set :ffmpeg_commit_hash, 'cc32213534573a127e01a0e2ed4962eb4b1939fd'
+  # set :libswscale_commit_hash, '0fa4ae3fc08f75277e2c1f225561053243f18576'
+  _cset :x264_commit_hash, ''
+  _cset :ffmpeg_commit_hash, ''
+  _cset :libswscale_commit_hash, ''
 
   desc 'Install FFmpeg dependencies'
   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"
     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"

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

@@ -37,6 +37,12 @@ namespace :gems do
     sudo "gem uninstall #{name}"
   end
 
+  desc "Adds the --no-rdoc and --no-ri flags to the .gemrc; you don't need docs on a production server."
+  task :add_nodocs_to_gemrc, :roles => :app 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: ")
@@ -45,17 +51,15 @@ namespace :gems do
     sudo "gem install -l gems/#{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"
     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)}"
     end
   end
-
-  desc "Adds the --no-rdoc and --no-ri flags to the .gemrc; you don't need docs on a production server."
-  task :add_nodocs_to_gemrc, :roles => :app do
-    run "echo 'gem: --no-rdoc --no-ri' >> ~/.gemrc"
-  end
 end

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

@@ -7,6 +7,7 @@ namespace :git do
     run "cd #{git_version}"
     run "cd #{git_version} && ./configure"
     run "cd #{git_version} && make"
+    sudo_keepalive
     run "cd #{git_version} && sudo make install"
     run "rm #{git_version}.tar.gz"
     run "rm -Rf #{git_version}"

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

@@ -33,12 +33,41 @@ def watch_prompt(ch, stream, data, regex_to_watch)
   end
 end
 
-# Adds 1 or more commands to the cron tab of root
-def sudo_add_to_crontab(commands,period)
-  tmp_cron="/tmp/tmp_cron"
-  sudo "rm -f #{tmp_cron} && crontab -l || true > #{tmp_cron}"
-  [*commands].each do |cmd|
-    run "echo '#{period} #{cmd}' >> #{tmp_cron}"
+def add_to_file(file,lines)
+  [*lines].each do |line|
+    run 'echo "%s" >> %s' % [line.gsub('"','\"'),file]
   end
-  sudo "crontab #{tmp_cron}"
 end
+
+def sudo_add_to_file(file,lines)
+  tmpfile = "#{File.basename(file)}.tmp"
+  run "cp #{file} #{tmpfile}"
+  add_to_file(tmpfile,lines)
+  sudo "mv #{tmpfile} #{file}"
+end
+
+# Re-activate sudo session if it has expired.
+def sudo_keepalive
+  sudo "ls > /dev/null"
+end
+ 
+# Adds 1 or more commands to the cron tab
+# - commands can be a string or an array
+# - period should be a valid crontab period
+# - use_sudo can be set to true if you want to edit the root crontab.
+def add_to_crontab(commands,period,use_sudo=false)
+  send_cmd = use_sudo ? :run : :sudo
+  tmp_cron="/tmp/cron.tmp"
+  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)
+  self.send(send_cmd, "crontab #{tmp_cron}")
+  sudo "rm -f #{tmp_cron}"
+end
+
+# Adds 1 or more commands to the cron tab of root
+# - commands can be a string or an array
+# - period should be a valid crontab period
+def sudo_add_to_crontab(commands,period)
+  add_to_crontab(commands, period, true)
+end

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

@@ -13,8 +13,6 @@ namespace :iptables do
     sudo "iptables-restore < /etc/iptables.up.rules"
     
     # ensure that the iptables rules are applied when we reboot the server
-    run "cat /etc/network/interfaces > ~/tmp_interfaces"
-    run "echo 'pre-up iptables-restore < /etc/iptables.up.rules' >> ~/tmp_interfaces"
-    sudo "mv ~/tmp_interfaces /etc/network/interfaces"
+    sudo_add_to_file('/etc/network/interfaces','pre-up iptables-restore < /etc/iptables.up.rules')
   end
 end

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

@@ -1,13 +1,13 @@
 require 'yaml'
 namespace :lmsensors do
-  desc "Install lmsensors"
-  task :install, :roles => :app do
+  desc "Install lmsensors. Not relevant for virtual servers as they usually do not have sensors available."
+  task :install do
     sudo "aptitude install -y lm-sensors"
     to_probe = []
     sudo "sensors-detect", :pty => true do |ch, stream, data|
       if [/YES\/no/,/yes\/NO/,/to continue/].find { |regex| data =~ regex}
         # prompt, and then send the response to the remote process
-        ch.send_data(Capistrano::CLI.password_prompt(data) + "\n")
+        ch.send_data(Capistrano::CLI.ui.ask(data) + "\n")
       elsif offset = data =~ /#----cut here----\s+# Chip drivers/
         text = data[offset,data.size - offset]
         text.gsub!('# Chip drivers','').gsub!('#----cut here----','')
@@ -18,7 +18,7 @@ namespace :lmsensors do
         Capistrano::Configuration.default_io_proc.call(ch, stream, data)
       end
     end
-    puts "Will prob the following modules:" % to_probe.join(',')
+    puts "Will modprobe the following modules: %s" % to_probe.join(',')
     to_probe.each do |mod|
       sudo "modprobe #{mod}"
     end

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

@@ -10,14 +10,13 @@ namespace :machine do
     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'
+    add_to_file('/etc/environment','DEBIAN_FRONTEND=noninteractive')
     # prevent this env variable to be skipped by sudo
-    run "echo 'Defaults env_keep = \"DEBIAN_FRONTEND\"' >> /etc/sudoers"
+    sudoers_lines = ['Defaults env_keep = "DEBIAN_FRONTEND"']
+    sudoers_lines << "#{user_to_create} ALL=(ALL)ALL"
+    add_to_file('/etc/sudoers',sudoers_lines)
 
-    run "echo '#{user_to_create} ALL=(ALL)ALL' >> /etc/sudoers"
-    run "echo 'AllowUsers #{user_to_create}' >> /etc/ssh/sshd_config"
+    add_to_file('/etc/ssh/sshd_config',"AllowUsers #{user_to_create}")
     run "/etc/init.d/ssh reload"
   end
   
@@ -28,13 +27,16 @@ namespace :machine do
   end
   
   task :install_dev_tools do
+    _cset :default_to_ruby_enterprise, true
+
     mysql.install
     apache.install
     ruby.install
     postfix.install
     gems.install_rubygems
+    gems.add_nodocs_to_gemrc
     ruby.install_enterprise
-    ruby.make_enterprise_default
+    ruby.make_enterprise_default if default_to_ruby_enterprise
     ruby.install_passenger
     git.install
     php.install

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

@@ -1,20 +1,42 @@
 namespace :network do
+  _cset :network_interfaces_config do
+    abort "Please specify the location of the /etc/network/interfaces config you want to upload.\n For example:\n  set :network_interfaces_config, File.expand_path(File.join(File.dirname(__FILE__),'interfaces'))"
+  end
+  _cset :resolv_config do
+    abort "Please specify the location of the /etc/resolv.conf config you want to upload.\n For example:\n  set :resolv_config, File.expand_path(File.join(File.dirname(__FILE__),'resolv.conf'))"
+  end
+
   desc "Configure /etc/resolv.conf and /etc/network/interfaces"
-  task :configure, :roles => :gateway do
+  task :configure do
     configure_resolv_conf
     configure_network_interfaces
   end
 
   desc "Configure network interfaces"
-  task :configure_network_interfaces, :roles => :gateway do
-    put File.read(network_interfaces_config), "interfaces"
-    sudo "mv interfaces /etc/network/interfaces"
-    sudo "/etc/init.d/networking restart"
+  task :configure_network_interfaces do
+    put File.read(network_interfaces_config), "interfaces.tmp"
+    sudo "mv interfaces.tmp /etc/network/interfaces"
+    restart
   end
 
   desc "Configure /etc/resolv.conf"
-  task :configure_resolv_conf, :roles => :gateway do
-    put File.read(resolv_config), "resolv.conf"
-    sudo "mv resolv.conf /etc/resolv.conf"
+  task :configure_resolv_conf do
+    put File.read(resolv_config), "resolv.conf.tmp"
+    sudo "mv resolv.conf.tmp /etc/resolv.conf"
+  end
+
+  desc "Start the network"
+  task :start do
+    sudo "/etc/init.d/networking start"
+  end
+
+  desc "Restart the network"
+  task :restart do
+    sudo "/etc/init.d/networking restart"
+  end
+
+  desc "Stop the network"
+  task :stop do
+    sudo "/etc/init.d/networking stop"
   end
 end

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

@@ -1,37 +1,37 @@
 require 'yaml'
 namespace :ntp do
   set :ntp_default_ntpd_opts, "NTPD_OPTS='-g'"
-  set :ntp_server_pool, "nl.pool.ntp.org"
+  set :ntp_pool_servers, (0..2).map {|num| "#{num}.pool.ntp.org"}
 
   desc "Install NTP"
-  task :install, :roles => :app do
+  task :install do
     sudo "aptitude install -y ntp"
     configure
   end
 
   desc "Configure NTP"
-  task :configure, :roles => :app do
-    put render("ntpdate", binding), "ntpdate"
-    sudo "mv ntpdate /etc/default/ntpdate"
-    put render("ntp.conf", binding), "ntp.conf"
-    sudo "mv ntp.conf /etc/ntp.conf"
-    run "echo '#{ntp_default_ntpd_opts}' > ntp"
-    sudo "mv ntp /etc/default/ntp"
+  task :configure do
+    put render("ntpdate", binding), "ntpdate.tmp"
+    sudo "mv ntpdate.tmp /etc/default/ntpdate"
+    put render("ntp.conf", binding), "ntp.conf.tmp"
+    sudo "mv ntp.conf.tmp /etc/ntp.conf"
+    run "echo '#{ntp_default_ntpd_opts}' > ntp.tmp"
+    sudo "mv ntp.tmp /etc/default/ntp"
     restart
   end
 
   desc "Start the NTP server"
-  task :start, :roles => :app do
+  task :start do
     sudo "/etc/init.d/ntp start"
   end
 
   desc "Restart the NTP server"
-  task :restart, :roles => :app do
+  task :restart do
     sudo "/etc/init.d/ntp restart"
   end
 
   desc "Stop the NTP server"
-  task :stop, :roles => :app do
+  task :stop do
     sudo "/etc/init.d/ntp stop"
   end
 end

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

@@ -1,35 +1,33 @@
 namespace :odbc do
+  _cset(:odbc_sourcename)  { abort "Please specify the odbc sourcename:\n  set :odbc_sourcename, 'MyFirstSQLServer'" }
+  _cset(:odbc_database)    { abort "Please specify the odbc database:\n  set :odbc_database, 'MyDB'" }
+  _cset(:odbc_host)        { abort "Please specify the odbc host:\n  set :odbc_host, '127.0.0.1'" }
+  _cset :odbc_port,       '1433'
+
   desc "Install ODBC/FreeTDS"
   task :install, :roles => :app do
-    run "cp /etc/profile ~/profile.tmp"
-    run "echo 'export ODBCINI=/etc/odbc.ini' >> ~/profile.tmp"
-    run "echo 'export ODBCSYSINI=/etc' >> ~/profile.tmp"
-    run "echo 'export FREETDSCONF=/etc/freetds/freetds.conf' >> ~/profile.tmp"
-    sudo "mv ~/profile.tmp /etc/profile"
+    profile_lines = ["export ODBCINI=/etc/odbc.ini",
+      "export ODBCSYSINI=/etc",
+      "export FREETDSCONF=/etc/freetds/freetds.conf"]
+    sudo_add_to_file('/etc/profile',profile_lines)
 
     freetds = "freetds-0.82"
     sudo "sudo apt-get install unixodbc unixodbc-dev tdsodbc -y"
     run "wget -nv ftp://ftp.ibiblio.org/pub/Linux/ALPHA/freetds/stable/#{freetds}.tar.gz"
-    run "tar xvzf #{freetds}.tar.gz"
-    run "cd #{freetds}"
-    run "cd #{freetds} && ./configure"
-    run "cd #{freetds} && make"
+    run "tar xvzf #{freetds}.tar.gz && cd #{freetds} && ./configure && make"
+    sudo_keepalive
     run "cd #{freetds} && sudo make install"
-    run "rm #{freetds}.tar.gz"
-    run "rm -Rf #{freetds}"
+    run "rm #{freetds}.tar.gz && rm -Rf #{freetds}"
   end
-  
+
   desc "Install the ruby ODBC library"
   task :install_rubyodbc, :roles => :app do
     rubyodbc = "ruby-odbc-0.9996"
     run "wget -nv http://www.ch-werner.de/rubyodbc/#{rubyodbc}.tar.gz"
-    run "tar xvzf #{rubyodbc}.tar.gz"
-    run "cd #{rubyodbc}"
-    run "cd #{rubyodbc} && ruby extconf.rb"
-    run "cd #{rubyodbc} && make"
+    run "tar xvzf #{rubyodbc}.tar.gz && cd #{rubyodbc} && ruby extconf.rb && make"
+    sudo_keepalive
     run "cd #{rubyodbc} && sudo make install"
-    run "rm #{rubyodbc}.tar.gz"
-    run "rm -Rf #{rubyodbc}"
+    run "rm #{rubyodbc}.tar.gz && rm -Rf #{rubyodbc}"
   end
 
   desc "Install FreeTDS/ODBC configuration files"

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

@@ -27,9 +27,7 @@ namespace :ruby do
     "#{ruby_enterprise_url[/(ruby-enterprise.*)(.tar.gz)/, 1]}"
   end
 
-  set :ruby_enterprise_path_prefix do
-    '/opt'
-  end
+  _cset :ruby_enterprise_path_prefix, '/opt'
   
   set :passenger_version do
     `gem list passenger$ -r`.gsub(/[\n|\s|passenger|(|)]/,"").split(',').first
@@ -52,9 +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
-    run "cat /etc/environment > ~/environment.tmp"
-    run 'echo PATH="%s/ruby-enterprise/bin:$PATH" >> ~/environment.tmp' % ruby_enterprise_path_prefix
-    sudo 'mv ~/environment.tmp /etc/environment'
+    sudo_add_to_file('/etc/environment','echo 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, []
   desc <<-DESC
     Setup SSH on the gateway host. Runs `upload_keys`, `install_ovh_ssh_key` AND \
     `configure_sshd` then reloads the SSH service to finalize the changes.
@@ -10,7 +10,18 @@ namespace :ssh do
     install_ovh_ssh_key if ["ovh-rps", "ovh-dedie"].include?(hosting_provider)
     reload
   end
-  
+
+  desc "Uploads secundary ssh pubkeys defined in ssh_secundary_keys which don't necessarily belong to you."
+  task :add_secundary_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")
+      run "echo '#{key}' >> ./.ssh/authorized_keys2"
+    end
+  end
   
   desc <<-DESC
     Uploads your local public SSH keys to the server. A .ssh folder is created if \
@@ -29,7 +40,7 @@ namespace :ssh do
     authorized_keys = ssh_options[:keys].collect { |key| File.read("#{key}.pub") }.join("\n")
     put authorized_keys, "./.ssh/authorized_keys2", :mode => 0600
   end
-  
+
   desc <<-DESC
     Configure SSH daemon with more secure settings recommended by Slicehost. The \
     will be configured to run on the port configured in Capistrano's "ssh_options". \
@@ -64,10 +75,11 @@ namespace :ssh do
     Upload a default SSH config.
   DESC
   task :upload_ssh_config, :roles => :gateway do
+    _cset(:ssh_config) { abort "Please specify the location of the ssh config file you want to upload:\n  set :ssh_config, '~/.ssh/config'" }
     run "mkdir -p ~/.ssh"
     run "chown -R #{user}:#{user} ~/.ssh"
     run "chmod 700 ~/.ssh"
-    put File.read(ssh_config), "./.ssh/config", :mode => 0600
+    put File.read(File.expand_path(ssh_config)), "./.ssh/config", :mode => 0600
   end
   
 end

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

@@ -40,7 +40,7 @@
 
 
 # Reject all other inbound - default deny unless explicitly allowed policy
-#-A INPUT -j REJECT
-#-A FORWARD -j REJECT
+-A INPUT -j REJECT
+-A FORWARD -j REJECT
 
 COMMIT

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

@@ -10,8 +10,7 @@ restrict 10.13.0.0 mask 255.255.255.0 nomodify notrap
 restrict 10.14.0.0 mask 255.255.255.0 nomodify notrap
 restrict 127.0.0.1
 restrict ::1
-server 0.<%=ntp_server_pool%>
-server 1.<%=ntp_server_pool%>
-server 2.<%=ntp_server_pool%> iburst
-server 3.<%=ntp_server_pool%>
+<% ntp_pool_servers.each_with_index do |ntp_server,index|%>
+<%= "server #{ntp_server} #{index == 0 ? 'iburst' : ''}" %>
+<% end %>
 statistics loopstats peerstats clockstats

data/lib/capistrano/ext/ubuntu-machine/templates/odbc.ini.erb

@@ -1,8 +1,8 @@
 [<%= odbc_sourcename %>]
-Driver		  = FreeTDS
-Description	= ODBC Connection via FreeTDS
-Trace		    = No
-Server	    = <%= odbc_host %>
+Driver      = FreeTDS
+Description = ODBC Connection via FreeTDS
+Trace       = No
+Server      = <%= odbc_host %>
 Port        = <%= odbc_port %>
 TDS Version = <%= odbc_tds_version rescue '8.0' %>
-Database	  = <%= odbc_database %>
+Database    = <%= odbc_database %>

data/lib/capistrano/ext/ubuntu-machine/templates/odbcinst.ini.erb

@@ -1,7 +1,7 @@
 [FreeTDS]
-Description	= TDS driver (Sybase/MS SQL)
-Driver		= /usr/lib/odbc/libtdsodbc.so
-Setup		= /usr/lib/odbc/libtdsS.so
-CPTimeout	=
-CPReuse		=
-FileUsage	= 1
+Description = TDS driver (Sybase/MS SQL)
+Driver      = /usr/lib/odbc/libtdsodbc.so
+Setup       = /usr/lib/odbc/libtdsS.so
+CPTimeout   =
+CPReuse     =
+FileUsage   = 1

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

@@ -1,36 +1,17 @@
 namespace :tmpfs do
-  set :tmpfs_directories do
-    {
-      '/tmpfs' => {:size => '2G', :mode => '0744'},
-    }
+  _cset(:tmpfs_directories) do
+    abort "Please specify the tmpfs directories:\n  set :tmpfs_directories do\n{\n'/tmpfs' => {:size => '2G', :mode => '0744'},\n}\nend"
   end
 
   desc "Create tmpfs directories"
   task :create_directories, :roles => :app do
     tmpfs_directories.each do |dir,options|
-      options[:size] = '2G' if options[:size].nil?
-      options[:mode] = '0744' if options[:mode].nil?
+      options[:size] ||= '2G'
+      options[:mode] ||= '0744'
       sudo "mkdir -p #{dir}"
-      sudo "mount -t tmpfs -o size=#{options[:size]},mode=#{options[:mode]} tmpfs #{dir}"
-      run "cp /etc/fstab fstab.tmp"
-      run "echo 'tmpfs #{dir} tmpfs size=#{options[:size]},mode=#{options[:mode]} 0 0' >> fstab.tmp"
-      sudo "mv fstab.tmp /etc/fstab"
+      fstab_line = "tmpfs #{dir} tmpfs size=#{options[:size]},mode=#{options[:mode]} 0 0"
+      sudo_add_to_file('/etc/fstab',fstab_line)
+      sudo "mount #{dir}"
     end
   end
-
-  desc "Create ftp directories within :vsftpd_tmpfs_directory for each user defined in :vsftpd_users and symlink in their homedirs"
-  task :create_vsftpd_tmpfs_dirs, :roles => :app do
-    cron_commands = []
-    vsftpd_users.each do |target_user|
-      target_tmpfs_dir = File.join(vsftpd_tmpfs_directory,target_user)
-      cmds = []
-      cmds << "mkdir -p #{target_tmpfs_dir}"
-      cmds << "chown #{target_user}:#{vsftpd_group} #{target_tmpfs_dir}"
-      cmds << "chmod 0777 #{target_tmpfs_dir}"
-      cmds.each{|cmd| sudo cmd}
-      cron_commands << cmds.join(' && ')
-      sudo "ln -s #{File.join(vsftpd_tmpfs_directory,target_user)} ~#{target_user}/ftp"
-    end
-    sudo_add_to_crontab(cron_commands.compact,'@reboot')
-  end
 end

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

@@ -38,7 +38,7 @@ namespace :utils do
   end
 
   desc "Force fsck to check the disk at every boot."
-  task :force_fsck_at_every_boot, :roles => :gateway do
+  task :force_fsck_at_every_boot 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}"

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

@@ -1,54 +1,65 @@
 namespace :vsftpd do
   set :vsftpd_user_shell, '/usr/sbin/nologin'
   set :vsftpd_group, 'ftpusers'
+  _cset(:vsftpd_users) { abort "Please specify the VSFTPd users:\n  set :vsftpd_users, ['user1', 'user2']" }
 
   desc "Install VSFTPd"
-  task :install, :roles => :app do
+  task :install do
     sudo "aptitude install -y vsftpd"
     configure
     add_nologin_shell
+    create_group
+    add_user_to_group
     create_users
   end
 
   desc "Install VSFTPd configuration file"
-  task :configure, :roles => :app do
+  task :configure do
+    # TODO: Don't use a template for the config, or append it to the existing config.
+    # TODO: Other solution could be to allow setting a local config file which will be uploaded.
     put render("vsftpd.conf", binding), "vsftpd.conf"
     sudo "mv vsftpd.conf /etc/vsftpd.conf"
     restart
   end
 
   desc "Add the :vsftpd_user_shell to /etc/shells"
-  task :add_nologin_shell, :roles => :app do
+  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`"
-    run "cp /etc/shells ~/shells.tmp"
-    run "echo '#{vsftpd_user_shell}' >> ~/shells.tmp"
-    sudo "mv ~/shells.tmp /etc/shells"
+    sudo_add_to_file('/etc/shells',vsftpd_user_shell)
   end
 
   desc "Create VSFTPd-only users"
-  task :create_users, :roles => :app do
+  task :create_users do
     vsftpd_users.each do |user_to_create|
-      sudo "groupadd -f #{vsftpd_group}"
-      sudo "usermod -a -G #{vsftpd_group} #{user}"
       sudo "useradd --shell #{vsftpd_user_shell} --groups #{vsftpd_group} -m #{user_to_create}"
       puts "Changing password for #{user_to_create}:"
       sudo_and_watch_prompt("passwd #{user_to_create}", [/Enter new UNIX password/, /Retype new UNIX password:/, /\[\]\:/, /\[y\/N\]/i])
     end
   end
 
+  desc "Create VSFTPd group"
+  task :create_group do
+    sudo "groupadd -f #{vsftpd_group}"
+  end
+
+  desc "Adds current user to VSFTPd group"
+  task :add_user_to_group do
+    sudo "usermod -a -G #{vsftpd_group} #{user}"
+  end
+
   desc "Start the vsftpd server"
-  task :start, :roles => :app do
+  task :start do
     sudo "/etc/init.d/vsftpd start"
   end
 
   desc "Restart the vsftpd server"
-  task :restart, :roles => :app do
+  task :restart do
     sudo "/etc/init.d/vsftpd restart"
   end
 
   desc "Stop the vsftpd server"
-  task :stop, :roles => :app do
+  task :stop do
     sudo "/etc/init.d/vsftpd stop"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: FiXato-ubuntu-machine
 version: !ruby/object:Gem::Version 
-  version: 0.5.3.2.9
+  version: 0.5.3.2.10
 platform: ruby
 authors: 
 - Thomas Balthazar
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-22 00:00:00 -07:00
+date: 2009-06-26 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,7 +25,7 @@ dependencies:
         version: 2.5.2
     version: 
 description: Capistrano recipes for setting up and deploying to a Ubuntu Machine
-email: thomas@suitmymind.com
+email: fixato@gmail.com
 executables: []
 
 extensions: []
@@ -41,7 +41,6 @@ files:
 - lib/capistrano/ext/ubuntu-machine/ffmpeg.rb
 - lib/capistrano/ext/ubuntu-machine/gems.rb
 - lib/capistrano/ext/ubuntu-machine/git.rb
-- lib/capistrano/ext/ubuntu-machine/odbc.rb
 - lib/capistrano/ext/ubuntu-machine/helpers.rb
 - lib/capistrano/ext/ubuntu-machine/iptables.rb
 - lib/capistrano/ext/ubuntu-machine/lmsensors.rb
@@ -49,6 +48,7 @@ files:
 - lib/capistrano/ext/ubuntu-machine/mysql.rb
 - lib/capistrano/ext/ubuntu-machine/network.rb
 - lib/capistrano/ext/ubuntu-machine/ntp.rb
+- lib/capistrano/ext/ubuntu-machine/odbc.rb
 - lib/capistrano/ext/ubuntu-machine/php.rb
 - lib/capistrano/ext/ubuntu-machine/postfix.rb
 - lib/capistrano/ext/ubuntu-machine/ruby.rb
@@ -57,22 +57,22 @@ files:
 - lib/capistrano/ext/ubuntu-machine/utils.rb
 - lib/capistrano/ext/ubuntu-machine/vsftpd.rb
 - lib/capistrano/ext/ubuntu-machine/templates/apache2.erb
+- lib/capistrano/ext/ubuntu-machine/templates/deflate.conf.erb
+- lib/capistrano/ext/ubuntu-machine/templates/freetds.conf.erb
 - lib/capistrano/ext/ubuntu-machine/templates/iptables.erb
 - lib/capistrano/ext/ubuntu-machine/templates/my.cnf.erb
 - lib/capistrano/ext/ubuntu-machine/templates/new_db.erb
 - lib/capistrano/ext/ubuntu-machine/templates/ntpdate.erb
 - lib/capistrano/ext/ubuntu-machine/templates/ntp.conf.erb
+- lib/capistrano/ext/ubuntu-machine/templates/odbc.ini.erb
+- lib/capistrano/ext/ubuntu-machine/templates/odbcinst.ini.erb
 - lib/capistrano/ext/ubuntu-machine/templates/passenger.conf.erb
 - lib/capistrano/ext/ubuntu-machine/templates/passenger.load.erb
 - 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/deflate.conf.erb
-- lib/capistrano/ext/ubuntu-machine/templates/freetds.conf.erb
-- lib/capistrano/ext/ubuntu-machine/templates/odbc.ini.erb
-- lib/capistrano/ext/ubuntu-machine/templates/odbcinst.ini.erb
 has_rdoc: false
-homepage: http://suitmymind.github.com/ubuntu-machine
+homepage: http://github.com/FiXato/ubuntu-machine
 post_install_message: 
 rdoc_options: []
 
@@ -96,6 +96,6 @@ rubyforge_project:
 rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
-summary: Capistrano recipes for setting up and deploying to a Ubuntu Machine
+summary: Capistrano recipes for setting up and deploying to a Ubuntu Machine. Fork of SuitMyMind's ubuntu-machine
 test_files: []