le1t0-deprec 2.1.6.057 → 2.1.6.058

data/lib/deprec/recipes/app/passenger.rb

@@ -5,12 +5,24 @@ Capistrano::Configuration.instance(:must_exist).load do
           
       set(:passenger_install_dir) {
         if ruby_choice == :ree
-          base_dir = "#{ree_install_dir}/lib/ruby/gems/1.8/gems/"
-          latest_passenger_version = capture("ls -d #{base_dir + 'passenger-*'} | tail -1").chomp
+          "#{ree_install_dir}/lib/ruby/gems/1.8/gems/passenger-#{passenger_version}"
+        elsif ruby_choice == :rvm && (rvm_default_ruby || 'custom').to_sym != :system
+          ruby_dir = capture("rvm info homes").split("\n").grep(/^\s*gem:/).first.split(/\s/).select { |x| !x.empty? && x != "gem:" }.first.gsub(/\"/, '')
+          "#{ruby_dir}/gems/passenger-#{passenger_version}"
         else
           "/usr/local/lib/ruby/gems/1.8/gems/passenger-#{passenger_version}"
         end
       }
+      
+      set(:passenger_ruby) {
+        if ruby_choice == :ree
+          "#{ree_install_dir}/bin/ruby"
+        elsif ruby_choice == :rvm
+          rvm_default_ruby.to_sym == :system ? "/usr/local/bin/passenger_ruby" : File.join(capture("pwd").chomp, '.rvm', 'bin', 'passenger_ruby')
+        else
+          "/usr/local/bin/ruby"
+        end
+      }
 
       set(:passenger_document_root) { "#{current_path}/public" }
       set :passenger_rails_allow_mod_rewrite, 'off'
@@ -35,24 +47,33 @@ Capistrano::Configuration.instance(:must_exist).load do
       set :passenger_app_root, nil # set to a string to set an explicit path, set to false to disable the setting,
                                    # defaults to parent dir of :passenger_document_root
 
+      set :passenger_disable_modules, []
+      set :passenger_enable_modules, []
+      set :passenger_disable_sites, []
+      set :passenger_extra_vhosts, {} # key should be name of file in /etc/apache2/sites-available, value should be contents
+
       desc "Install passenger"
-      task :install, :roles => :app do
+      task :install, :roles => :passenger do
         install_deps
         gem2.install 'passenger', passenger_version
-        sudo "passenger-install-apache2-module -a"
+        if ruby_choice == :rvm
+          run "rvmsudo passenger-install-apache2-module -a"
+        else
+          sudo "passenger-install-apache2-module -a"
+        end
         initial_config_push
         activate_system
       end
       
       # Install dependencies for Passenger
-      task :install_deps, :roles => :app do
+      task :install_deps, :roles => :passenger do
         apt.install( {:base => %w(apache2-mpm-prefork apache2-prefork-dev rsync)}, :stable )
         gem2.install 'fastthread'
         gem2.install 'rack'
         gem2.install 'rake'
       end
       
-      task :initial_config_push, :roles => :web do
+      task :initial_config_push, :roles => :passenger do
         # XXX Non-standard!
         # We need to push out the .load and .conf files for Passenger
         SYSTEM_CONFIG_FILES[:passenger].each do |file|
@@ -109,48 +130,79 @@ Capistrano::Configuration.instance(:must_exist).load do
       end
 
       desc "Push Passenger config files (system & project level) to server"
-      task :config, :roles => :app do
+      task :config, :roles => :passenger do
         config_system
         config_project  
       end
 
       desc "Push Passenger configs (system level) to server"
-      task :config_system, :roles => :app do
+      task :config_system, :roles => :passenger do
         deprec2.push_configs(:passenger, SYSTEM_CONFIG_FILES[:passenger])
+        symlink_extra_apache_vhosts
+        disable_modules
+        enable_modules
+        disable_sites
         activate_system
       end
 
       desc "Push Passenger configs (project level) to server"
-      task :config_project, :roles => :app do
+      task :config_project, :roles => :passenger do
         deprec2.push_configs(:passenger, PROJECT_CONFIG_FILES[:passenger])
         symlink_apache_vhost
         activate_project
         symlink_logrotate_config
       end
       
-      task :symlink_logrotate_config, :roles => :app do
+      task :symlink_logrotate_config, :roles => :passenger do
         sudo "ln -sf #{deploy_to}/passenger/logrotate.conf /etc/logrotate.d/passenger-#{application}"
       end
       
       # Passenger runs Rails as the owner of this file.
-      task :set_owner_of_environment_rb, :roles => :app do
+      task :set_owner_of_environment_rb, :roles => :passenger do
         sudo "chown  #{app_user} #{current_path}/config/environment.rb"
       end
       
-      task :symlink_apache_vhost, :roles => :app do
+      task :symlink_apache_vhost, :roles => :passenger do
         sudo "ln -sf #{deploy_to}/passenger/apache_vhost #{apache_vhost_dir}/#{application}"
       end
       
-      task :activate, :roles => :app do
+      task :symlink_extra_apache_vhosts, :roles => :passenger do
+        passenger_extra_vhosts.each do |name, vhost|
+          put vhost, tmp_file = "/tmp/apache_default_vhost_#{Time.now.strftime("%Y%m%d%H%M%S")}.txt", :mode => 0644
+          sudo "chown root:root #{tmp_file}"
+          sudo "mv #{tmp_file} /etc/apache2/sites-available/#{name}"
+          sudo "a2ensite #{name}"
+        end
+      end
+      
+      task :disable_modules, :roles => :passenger do
+        passenger_disable_modules.each do |apache_module|
+          sudo "a2dismod #{apache_module}"
+        end
+      end
+
+      task :enable_modules, :roles => :passenger do
+        passenger_enable_modules.each do |apache_module|
+          sudo "a2enmod #{apache_module}"
+        end
+      end
+
+      task :disable_sites, :roles => :passenger do
+        passenger_disable_sites.each do |apache_vhost|
+          sudo "a2dissite #{apache_vhost}"
+        end
+      end
+      
+      task :activate, :roles => :passenger do
         activate_system
         activate_project
       end
       
-      task :activate_system, :roles => :app do
+      task :activate_system, :roles => :passenger do
         sudo "a2enmod passenger"
       end
       
-      task :activate_project, :roles => :app do
+      task :activate_project, :roles => :passenger do
         sudo "a2ensite #{application}"
       end
       
@@ -170,16 +222,16 @@ Capistrano::Configuration.instance(:must_exist).load do
         puts
       end
       
-      task :deactivate_system, :roles => :app do
+      task :deactivate_system, :roles => :passenger do
         sudo "a2dismod passenger"
       end
       
-      task :deactivate_project, :roles => :app do
+      task :deactivate_project, :roles => :passenger do
         sudo "a2dissite #{application}"
       end
       
       desc "Restart Application"
-      task :restart, :roles => :app do
+      task :restart, :roles => :passenger do
         run "#{sudo} touch #{current_path}/tmp/restart.txt"
       end
       

data/lib/deprec/recipes/iptables.rb

@@ -5,9 +5,15 @@ Capistrano::Configuration.instance(:must_exist).load do
 
       # see iptables-init script and iptables-default file for syntax
       set :iptables_allowed, "tcp:22,80,443"
+      set :iptables_drop, ""
+      set :iptables_reject, ""
       set :iptables_forwards, ""
+      set :iptables_rate_limits, ""
       set :iptables_binary, "/sbin/iptables"
       set :iptables_save_binary, "/sbin/iptables-save"
+      set :iptables_ipfrag_high_thresh, 262144
+      set :iptables_ipfrag_low_thresh, 196608
+      set :iptables_ipfrag_time, 30
 
       task :status do
         sudo "iptables -L -v"
@@ -27,10 +33,6 @@ Capistrano::Configuration.instance(:must_exist).load do
         {:template => 'firewall-init.erb',
           :path => '/etc/init.d/firewall',
           :mode => 0755,
-          :owner => 'root:root'},
-        {:template => 'firewall-default.erb',
-          :path => '/etc/default/firewall',
-          :mode => 0755,
           :owner => 'root:root'}
       ]
 
@@ -43,8 +45,7 @@ Capistrano::Configuration.instance(:must_exist).load do
 
       desc "Push iptables config files to server"
       task :config do
-        sudo "test -e /etc/default/firewall && cp /etc/default/firewall /etc/default/firewall.bak || true"
-        sudo "test -e /etc/init.d/firewall && cp /etc/init.d/firewall /etc/init.d/firewall.bak || true"
+        sudo "test -e /etc/init.d/firewall && sudo cp /etc/init.d/firewall /etc/init.d/firewall.bak || true"
         deprec2.push_configs(:iptables, SYSTEM_CONFIG_FILES[:iptables])
         deprec2.append_to_file_if_missing('/etc/services', 'vrrp           112/raw                          # vrrpd daemon')
       end
@@ -54,8 +55,7 @@ Capistrano::Configuration.instance(:must_exist).load do
         transaction do
           on_rollback {
             puts `git checkout config/#{stage}/iptables/etc`
-            sudo "test -e /etc/default/firewall.bak && mv /etc/default/firewall.bak /etc/default/firewall || true"
-            sudo "test -e /etc/init.d/firewall.bak && mv /etc/init.d/firewall.bak /etc/init.d/firewall || true"
+            sudo "test -e /etc/init.d/firewall.bak && sudo mv /etc/init.d/firewall.bak /etc/init.d/firewall || true"
             sudo "/etc/init.d/firewall start &"
           }
           config_gen
@@ -67,7 +67,6 @@ Capistrano::Configuration.instance(:must_exist).load do
       
       desc "Revert iptables config on server"
       task :revert do
-        sudo "test -e /etc/default/firewall.bak && mv /etc/default/firewall.bak /etc/default/firewall || true"
         sudo "test -e /etc/init.d/firewall.bak && mv /etc/init.d/firewall.bak /etc/init.d/firewall || true"
       end
 

data/lib/deprec/recipes/profiles.rb

@@ -221,5 +221,89 @@ Capistrano::Configuration.instance(:must_exist).load do
       "#{executing_recipe}_#{executing_task}"
     end
   end
+  
+  profile :rails_stack, :install do |p, r|
+    r.ruby
+    r.rails
+    r.svn
+    r.git
+    r.apache
+    r.passenger
+    r.s3utils
+    r.monit if use_monit
+    r.logrotate if use_logrotate
+  end
+
+  profile :ubuntu_base do |p, r|
+    r.call.ubuntu.remove_admin_group_from_users :config
+    r.iptables
+    r.postfix
+    r.ntp
+    r.ubuntu :install
+    r.nagios_plugins :install
+    r.ubuntu.utils.bash :config
+    r.syslog_ng
+  end
+
+  profile :app_base do |p, r|
+    p.ubuntu_base
+    p.rails_stack :install
+    r.imagemagick :install
+    r.aspell :install
+    r.sphinx :install
+    r.java
+  end
+
+  profile :app_server do |p, r|
+    p.app_base
+    r.god
+    r.call.passenger.config_gen_system :config_gen
+    r.glusterfs :install
+    r.call.glusterfs.config_client :config
+    r.call.glusterfs.activate_client :activate
+    r.call.glusterfs.start_client :start
+    r.call.haproxy.create_check_file :install
+  end
+
+  profile :db_server do |p, r|
+    p.app_base
+    r.mysql
+    r.keepalived
+    r.redis
+  end
+
+  profile :single_server do |p,r|
+    p.app_base
+    r.call.passenger.config_gen_system :config_gen
+    r.mysql
+    r.god
+    r.redis
+  end
+  
+  profile :shared_server do |p, r|
+    p.ubuntu_base
+    r.keepalived
+    r.redis
+    r.glusterfs :install
+    r.call.glusterfs.config_server :config
+    r.call.glusterfs.activate_server :activate
+    r.call.glusterfs.start_server :start
+  end
+
+  profile :backups_server do |p, r|
+    p.ubuntu_base
+    p.rails_stack :install
+  end
+
+  profile :xen_server do |p, r|
+    p.ubuntu_base
+    r.haproxy
+    r.keepalived
+    r.apache
+    r.amcc_3ware :install
+    r.xentools :config_gen, :install, :config
+    r.call.xen.create_images :activate
+    r.call.xen.start_images :start
+  end
 
 end

data/lib/deprec/recipes/redis.rb

@@ -7,14 +7,9 @@ Capistrano::Configuration.instance(:must_exist).load do
       set :redis_group, 'redis'
       
       SRC_PACKAGES[:redis] = {
-        :md5sum => '0c5355e57606523f9e8ce816db5e542f  redis-1.2.6.tar.gz',
-        :filename => 'redis-1.2.6.tar.gz',
-        :dir => 'redis-1.2.6',
-        :url => "http://redis.googlecode.com/files/redis-1.2.6.tar.gz",
-        :unpack => "tar zxf redis-1.2.6.tar.gz;",
-        :make => 'make;',
+        :md5sum => '7799de79f36ebdb73bcb8f09816d1ac3  redis-2.0.3.tar.gz',
+        :url => "http://redis.googlecode.com/files/redis-2.0.3.tar.gz",
         :configure => nil,
-        :install => "install -t /usr/local/bin redis-server redis-benchmark redis-cli redis-stat; install -o #{redis_user} -g #{redis_group} -d /var/lib/redis /var/log/redis"
       }
       
       desc "install Redis"

data/lib/deprec/recipes/ruby/rvm.rb

@@ -0,0 +1,75 @@
+# Copyright 2010 by le1t0@github. All rights reserved.
+Capistrano::Configuration.instance(:must_exist).load do 
+  namespace :deprec do
+    namespace :rvm do
+      
+      RVM_VERSION='1.0.1'
+      
+      set :rvm_apt_packages, []
+      set :rvm_rubies, [] # First ruby will be set as default if rvm_default_ruby is nil or empty
+      set :rvm_default_ruby, nil
+      set :rvm_support_jruby, false
+      set :rvm_support_ree, false
+      set :rvm_support_mri, false
+      set :rvm_support_rbx, false
+      set :rvm_support_ironruby, false
+      
+      desc "Install Rvm"
+      task :install do
+        install_deps
+        install_rvm = true
+        run "rvm --version | perl -n -e 'm/^rvm / && s/^rvm ([^ ]+) .*/$1/ && print'" do |channel, stream, data|
+          install_rvm = false if data.strip == RVM_VERSION
+        end
+        if install_rvm
+          run "mkdir -p ~/.rvm/src/"
+          run "cd ~/.rvm/src/ && rm -Rf rvm-#{RVM_VERSION} && wget -O /dev/stdout -o /dev/null http://rvm.beginrescueend.com/releases/rvm-#{RVM_VERSION}.tar.gz | tar zxf -"
+          run "cd ~/.rvm/src/rvm-#{RVM_VERSION} && ./install"
+          run "perl -p -i -e 's/^([^#]+&& return.*)/#$1/' ~/.bashrc"
+          sudo <<-END
+          sh -c '
+          grep -F "[[ -s \\$HOME/.rvm/scripts/rvm ]] && source \\$HOME/.rvm/scripts/rvm" ~/.bashrc > /dev/null 2>&1 || 
+          echo "[[ -s \\$HOME/.rvm/scripts/rvm ]] && source \\$HOME/.rvm/scripts/rvm" >> ~/.bashrc
+          '
+          END
+        end
+        install_rubies
+      end
+      
+      task :install_deps do
+        top.deprec.mri.install_deps
+        apt_packages = rvm_apt_packages.dup
+        apt_packages += %w(build-essential bison openssl libreadline5 libreadline-dev curl git-core zlib1g zlib1g-dev libssl-dev vim libsqlite3-0 libsqlite3-dev sqlite3 libreadline-dev libxml2-dev git-core subversion autoconf patch) if rvm_support_mri || rvm_support_ree
+        apt_packages += %w(curl sun-java6-bin sun-java6-jre sun-java6-jdk) if rvm_support_jruby
+        apt_packages += %w(curl mono-2.0-devel) if rvm_support_ironruby
+        apt_packages.uniq!
+        apt.install( {:base => apt_packages}, :stable )
+      end
+      
+      desc "Install rubies"
+      task :install_rubies do
+        rubies = rvm_rubies.dup
+        rubies ||= []
+        rubies.unshift('ruby-1.8.7-p160') if rubies.empty? || rvm_support_rbx
+        rubies.uniq!
+        rubies.each_with_index do |ruby_def, i|
+          ruby = ruby_def.is_a?(Hash) ? ruby_def.keys.first : ruby_def
+          env_opts = ""
+          configure_opts = ""
+          ruby_arch = ruby_def.is_a?(Hash) ? ruby_def.values.first : nil
+          if ruby_arch == "i386"
+            env_opts = "CFLAGS='-m32' CXXFLAGS='-m32' LDFLAGS='-m32' "
+            configure_opts = "--configure --host=i686-pc-linux,--target=i686-pc-linux,--build=i686-pc-linux"
+          end
+          run "#{env_opts}rvm --reconfigure #{configure_opts} --force install #{ruby}"
+          run "rvm --default #{ruby} --passenger" if i == 0 && (rvm_default_ruby.nil? || rvm_default_ruby.empty?)
+        end
+        if !(rvm_default_ruby.nil? || rvm_default_ruby.empty?)
+          set_default = rvm_default_ruby == "system" ? rvm_default_ruby : "--default #{rvm_default_ruby}"
+          run "rvm #{set_default} --passenger"
+        end
+      end
+      
+    end
+  end
+end

data/lib/deprec/recipes/sphinx/thinking_sphinx.rb

@@ -3,7 +3,7 @@ Capistrano::Configuration.instance(:must_exist).load do
   namespace :deprec do 
     namespace :thinking_sphinx do
       
-      SRC_PACKAGES[:sphinx] = {
+      SRC_PACKAGES[:thinking_sphinx] = {
         :filename => 'sphinx-0.9.9.tar.gz',   
         :dir => 'sphinx-0.9.9',  
         :url => "http://www.sphinxsearch.com/downloads/sphinx-0.9.9.tar.gz",
@@ -18,8 +18,8 @@ Capistrano::Configuration.instance(:must_exist).load do
       
       desc "install Sphinx Search Engine"
       task :install, :roles => :sphinx do
-        deprec2.download_src(SRC_PACKAGES[:sphinx], src_dir)
-        deprec2.install_from_src(SRC_PACKAGES[:sphinx], src_dir)
+        deprec2.download_src(SRC_PACKAGES[:thinking_sphinx], src_dir)
+        deprec2.install_from_src(SRC_PACKAGES[:thinking_sphinx], src_dir)
       end
     
       SYSTEM_CONFIG_FILES[:sphinx] = []

data/lib/deprec/recipes/sphinx/ultrasphinx.rb

@@ -3,7 +3,7 @@ Capistrano::Configuration.instance(:must_exist).load do
   namespace :deprec do 
     namespace :ultrasphinx do
       
-      SRC_PACKAGES[:sphinx] = {
+      SRC_PACKAGES[:ultrasphinx] = {
         :filename => 'sphinx-0.9.8-rc2.tar.gz',   
         :dir => 'sphinx-0.9.8-rc2',  
         :url => "http://www.sphinxsearch.com/downloads/sphinx-0.9.8-rc2.tar.gz",
@@ -18,8 +18,8 @@ Capistrano::Configuration.instance(:must_exist).load do
       
       desc "install Sphinx Search Engine"
       task :install, :roles => :sphinx do
-        deprec2.download_src(SRC_PACKAGES[:sphinx], src_dir)
-        deprec2.install_from_src(SRC_PACKAGES[:sphinx], src_dir)
+        deprec2.download_src(SRC_PACKAGES[:ultrasphinx], src_dir)
+        deprec2.install_from_src(SRC_PACKAGES[:ultrasphinx], src_dir)
       end
     
       # install dependencies for sphinx

data/lib/deprec/recipes/syslog/syslog_ng.rb

@@ -124,12 +124,12 @@ Capistrano::Configuration.instance(:must_exist).load do
       }
       
       desc "Install syslog-ng"
-      task :install do
+      task :install, :roles => :syslog do
         install_deps
       end
 
       # install dependencies for syslog-ng
-      task :install_deps do
+      task :install_deps, :roles => :syslog do
         apt.install( {:base => %w(syslog-ng)}, :stable )
       end
       
@@ -162,23 +162,23 @@ Capistrano::Configuration.instance(:must_exist).load do
       end
 
       desc "Push Syslog-ng config files to server"
-      task :config do
+      task :config, :roles => :syslog do
         deprec2.push_configs(:syslog_ng, SYSTEM_CONFIG_FILES[:syslog_ng])
         deprec2.push_configs(:syslog, SYSTEM_CONFIG_FILES[:syslog])
       end
 
       desc "Start Syslog-ng"
-      task :start do
+      task :start, :roles => :syslog do
         run "#{sudo} /etc/init.d/syslog-ng start"
       end
       
       desc "Stop Syslog-ng"
-      task :stop do
+      task :stop, :roles => :syslog do
         run "#{sudo} /etc/init.d/syslog-ng stop"
       end
       
       desc "Restart Syslog-ng"
-      task :restart do
+      task :restart, :roles => :syslog do
         run "#{sudo} /etc/init.d/syslog-ng restart"
       end
 

data/lib/deprec/recipes/ubuntu.rb

@@ -5,9 +5,21 @@ Capistrano::Configuration.instance(:must_exist).load do
 
       set :ubuntu_default_term, :linux
       set :ubuntu_packages_to_install, %w(cron nmap nano bind9-host man-db screen dnsutils iptraf apache2-utils makepasswd psmisc)
+      set :ubuntu_apt_preferences, nil # set to a string to upload /etc/apt/preferences
+      set :ubuntu_users_remove_admin_group, [] # set to one or more users who should be part of sudo group, but not admin group (for /etc/sudoers to work by default)
 
+      SYSTEM_CONFIG_FILES[:ubuntu] = [
+        
+        {:template => "getlibs.erb",
+         :path => '/usr/local/bin/getlibs',
+         :mode => 0755,
+         :owner => 'root:root'}
+         
+      ]
+      
       desc "apt-get update. Resynchronize the package index files from their sources."
       task :update do
+        top.deprec.ubuntu.upload_apt_preferences
         apt.update
       end
       
@@ -16,6 +28,15 @@ Capistrano::Configuration.instance(:must_exist).load do
         apt.install( {:base => ubuntu_packages_to_install}, :stable )
       end
       
+      desc "Install 32 bit library support"
+      task :install_32bit_libs_support do
+        # support 32-bit builds on 64-bit
+        apt.install( {:base => %w(gcc-multilib libc6-i386 libc6-dev-i386)}, :stable )
+        SYSTEM_CONFIG_FILES[:ubuntu].each do |file|
+          deprec2.render_template(:ubuntu, file.merge(:remote => true))
+        end
+      end
+      
       desc "apt-get upgrade. Install the newest versions of all packages currently
                  installed on the system from the sources enumerated in /etc/apt/sources.list.."
       task :upgrade do
@@ -38,6 +59,20 @@ Capistrano::Configuration.instance(:must_exist).load do
         # XXX There's one more - add it!
       end
       
+      task :remove_admin_group_from_users do
+        ([ubuntu_users_remove_admin_group] || []).flatten.each do |user|
+          sudo "perl -p -i -e 's/^(admin:x:[0-9]+:)([^,]+,)*#{user}(,[^,]+)*/$1/' /etc/group"
+        end
+      end
+      
+      task :upload_apt_preferences do
+        if ubuntu_apt_preferences
+          put ubuntu_apt_preferences, "/tmp/preferences", :mode => 0644
+          sudo "chown root:root /tmp/preferences"
+          sudo "mv /tmp/preferences /etc/apt/"
+        end
+      end
+
       namespace :utils do
         
         namespace :bash do