FiXato-ubuntu-machine 0.5.3.2.7 → 0.5.3.2.9

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

@@ -53,4 +53,9 @@ namespace :gems do
       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/helpers.rb

@@ -33,4 +33,12 @@ 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}"
+  end
+  sudo "crontab #{tmp_cron}"
+end

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

@@ -34,6 +34,7 @@ namespace :machine do
     postfix.install
     gems.install_rubygems
     ruby.install_enterprise
+    ruby.make_enterprise_default
     ruby.install_passenger
     git.install
     php.install

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

@@ -0,0 +1,20 @@
+namespace :network do
+  desc "Configure /etc/resolv.conf and /etc/network/interfaces"
+  task :configure, :roles => :gateway 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"
+  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"
+  end
+end

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

@@ -0,0 +1,37 @@
+require 'yaml'
+namespace :ntp do
+  set :ntp_default_ntpd_opts, "NTPD_OPTS='-g'"
+  set :ntp_server_pool, "nl.pool.ntp.org"
+
+  desc "Install NTP"
+  task :install, :roles => :app 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"
+    restart
+  end
+
+  desc "Start the NTP server"
+  task :start, :roles => :app do
+    sudo "/etc/init.d/ntp start"
+  end
+
+  desc "Restart the NTP server"
+  task :restart, :roles => :app do
+    sudo "/etc/init.d/ntp restart"
+  end
+
+  desc "Stop the NTP server"
+  task :stop, :roles => :app do
+    sudo "/etc/init.d/ntp stop"
+  end
+end

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

@@ -75,8 +75,8 @@ namespace :ruby do
   
   desc "Upgrade Phusion Passenger"
   task :upgrade_passenger, :roles => :app do
-    sudo "#{ruby_enterprise_path_prefix}/#{ruby_enterprise_version}/bin/ruby #{ruby_enterprise_path_prefix}/#{ruby_enterprise_version}/bin/gem install passenger"
-    run "sudo #{ruby_enterprise_path_prefix}/#{ruby_enterprise_version}/bin/ruby #{ruby_enterprise_path_prefix}/#{ruby_enterprise_version}/bin/passenger-install-apache2-module --auto"
+    sudo "#{ruby_enterprise_path_prefix}/ruby-enterprise/bin/ruby #{ruby_enterprise_path_prefix}/ruby-enterprise/bin/gem install passenger"
+    run "sudo #{ruby_enterprise_path_prefix}/ruby-enterprise/bin/ruby #{ruby_enterprise_path_prefix}/ruby-enterprise/bin/passenger-install-apache2-module --auto"
 
     put render("passenger.load", binding), "/home/#{user}/passenger.load"
     put render("passenger.conf", binding), "/home/#{user}/passenger.conf"

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

@@ -0,0 +1,17 @@
+# /etc/ntp.conf, configuration for ntpd; see ntp.conf(5) for help
+
+driftfile /var/lib/ntp/ntp.drift
+filegen clockstats file clockstats type day enable
+filegen loopstats file loopstats type day enable
+filegen peerstats file peerstats type day enable
+restrict -4 default kod notrap nomodify nopeer noquery
+restrict -6 default kod notrap nomodify nopeer noquery
+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%>
+statistics loopstats peerstats clockstats

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

@@ -0,0 +1,13 @@
+# The settings in this file are used by the program ntpdate-debian, but not
+# by the upstream program ntpdate.
+
+# Set to "yes" to take the server list from /etc/ntp.conf, from package ntp,
+# so you only have to keep it in one place.
+NTPDATE_USE_NTP_CONF=yes
+
+# List of NTP servers to use  (Separate multiple servers with spaces.)
+# Not used if NTPDATE_USE_NTP_CONF is yes.
+NTPSERVERS="ntp.ubuntu.com"
+
+# Additional options to pass to ntpdate
+NTPOPTIONS=""

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

@@ -1,2 +1,2 @@
-PassengerRoot <%= ruby_enterprise_path_prefix %>/<%= ruby_enterprise_version %>/lib/ruby/gems/1.8/gems/passenger-<%= passenger_version %>
-PassengerRuby <%= ruby_enterprise_path_prefix %>/<%= ruby_enterprise_version %>/bin/ruby
+PassengerRoot <%= ruby_enterprise_path_prefix %>/ruby-enterprise/lib/ruby/gems/1.8/gems/passenger-<%= passenger_version %>
+PassengerRuby <%= ruby_enterprise_path_prefix %>/ruby-enterprise/bin/ruby

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

@@ -1 +1 @@
-LoadModule passenger_module <%= ruby_enterprise_path_prefix %>/<%= ruby_enterprise_version %>/lib/ruby/gems/1.8/gems/passenger-<%= passenger_version %>/ext/apache2/mod_passenger.so
+LoadModule passenger_module <%= ruby_enterprise_path_prefix %>/ruby-enterprise/lib/ruby/gems/1.8/gems/passenger-<%= passenger_version %>/ext/apache2/mod_passenger.so

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

@@ -31,12 +31,6 @@ namespace :tmpfs do
       cron_commands << cmds.join(' && ')
       sudo "ln -s #{File.join(vsftpd_tmpfs_directory,target_user)} ~#{target_user}/ftp"
     end
-
-    tmp_cron="/tmp/tmp_cron"
-    sudo "rm -f #{tmp_cron} && crontab -l || true > #{tmp_cron}"
-    cron_commands.compact.each do |cmd|
-      run "echo '@reboot #{cmd}' >> #{tmp_cron}"
-    end
-    sudo "crontab #{tmp_cron}"
+    sudo_add_to_crontab(cron_commands.compact,'@reboot')
   end
 end

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

@@ -36,5 +36,11 @@ namespace :utils do
 
     sudo_and_watch_prompt("#{ruby_enterprise_path_prefix}/ruby-enterprise/bin/passenger-make-enterprisey", [/Key\:/,  /again\:/])
   end
-  
+
+  desc "Force fsck to check the disk at every boot."
+  task :force_fsck_at_every_boot, :roles => :gateway 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}"
+  end
 end

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

@@ -17,6 +17,8 @@ Capistrano::Configuration.instance.load {load("#{File.dirname(__FILE__)}/ubuntu-
 Capistrano::Configuration.instance.load {load("#{File.dirname(__FILE__)}/ubuntu-machine/lmsensors.rb")}
 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/network.rb")}
+Capistrano::Configuration.instance.load {load("#{File.dirname(__FILE__)}/ubuntu-machine/ntp.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")}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: FiXato-ubuntu-machine
 version: !ruby/object:Gem::Version 
-  version: 0.5.3.2.7
+  version: 0.5.3.2.9
 platform: ruby
 authors: 
 - Thomas Balthazar
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-18 00:00:00 -07:00
+date: 2009-06-22 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -47,6 +47,8 @@ files:
 - lib/capistrano/ext/ubuntu-machine/lmsensors.rb
 - lib/capistrano/ext/ubuntu-machine/machine.rb
 - 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/php.rb
 - lib/capistrano/ext/ubuntu-machine/postfix.rb
 - lib/capistrano/ext/ubuntu-machine/ruby.rb
@@ -58,6 +60,8 @@ files:
 - 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/passenger.conf.erb
 - lib/capistrano/ext/ubuntu-machine/templates/passenger.load.erb
 - lib/capistrano/ext/ubuntu-machine/templates/sshd_config.erb