andyh-deprec 1.99.26 → 1.99.27

data/CHANGELOG

@@ -1,5 +1,32 @@
-== SVN
+== git
  
+* Restricted tasks to roles. [mbailey]
+  http://github.com/mbailey/deprec/commit/d103dda7ee3f7696007d230c76c7739dd57115ec
+
+* Extend capistrano_extensions.rb to allow install from git sources. [jasherai]
+
+* Updated git to 1.6.0.1 [thornysun]
+ 
+== 1.99.27 (August 27, 2008)
+
+* Bugfix: Add configure and make options to src_package for rubygems to 
+  override defaults. [jasherai]
+
+* Change: We now setup postfix as a satellite mail server. This is designed 
+  to listen only on the local network interface and non-local mail to a relay
+  host. [mbailey]
+
+== 1.99.26 (August 22, 2008)
+
+* added vnstat recipes - measure and report traffic on interface counters [mbailey]
+* upgrade ruby to 1.8.6-p287 [Isaac Kearse] 
+* upgrade to rubygems 1.2.0 - addresses memory utilization issues on
+  low-memory boxes (half-gig or less) [thewoolleyman]
+* deprec:rails:install_stack now installs mysql  [mbailey]
+* turned tcp_nopush back on [mbailey]
+* Correctly handle tarballs with .tgz extension [mbailey]
+* Generate default remote config on install [mbailey]
+
 == 1.99.24 (July  7, 2008)
 
 * I've rejigged things to make it easier to install a service without having

data/lib/deprec/capistrano_extensions.rb

@@ -4,12 +4,24 @@ require 'fileutils'
 
 module Deprec2
   
-  # Temporarly set ROLES to something different
+  # Temporarily modify ROLES if HOSTS not set
+  # Capistrano's default behaviour is for HOSTS to override ROLES
   def for_roles(roles)
     old_roles = ENV['ROLES']
-    ENV['ROLES'] = roles
+    ENV['ROLES'] = roles.to_s unless ENV['HOSTS']
+    yield
+    ENV['ROLES'] = old_roles.to_s unless ENV['HOSTS']
+  end
+  
+  # Temporarily ignore ROLES and HOSTS
+  def ignoring_roles_and_hosts
+    old_roles = ENV['ROLES']
+    old_hosts = ENV['HOSTS']
+    ENV['ROLES'] = nil
+    ENV['HOSTS'] = nil
     yield
     ENV['ROLES'] = old_roles
+    ENV['HOSTS'] = old_hosts
   end
   
   DEPREC_TEMPLATES_BASE = File.join(File.dirname(__FILE__), 'templates')
@@ -242,35 +254,63 @@ module Deprec2
     if defined?(src_package[:md5sum])
       md5_clause = " && echo '#{src_package[:md5sum]}' | md5sum -c - "
     end
-    apt.install( {:base => %w(wget)}, :stable )
-    # XXX replace with invoke_command
-    run "cd #{src_dir} && test -f #{src_package[:filename]} #{md5_clause} || #{sudo} wget --quiet --timestamping #{src_package[:url]}"
+    case src_package[:download_method]
+      # when getting source with git
+      when :git
+        # ensure git is installed
+        apt.install( {:base => %w(git-core)}, :stable) #TODO fix this to test ubuntu version <hardy might need specific git version for full git submodules support
+        package_dir = File.join(src_dir, src_package[:dir])
+        run "if [ -d #{package_dir} ]; then cd #{package_dir} && #{sudo} git pull && #{sudo} git submodule init && #{sudo} git submodule update; else #{sudo} git clone #{src_package[:url]} #{package_dir} && cd #{package_dir} && #{sudo} git submodule init && #{sudo} git submodule update ; fi"
+	# Checkout the revision wanted if defined
+	invoke_command "cd #{package_dir} && git co #{src_package[:version]}", :via => :via if src_package[:version]
+      # when getting source with wget
+      when :http
+        # ensure wget is installed
+        apt.install( {:base => %w(wget)}, :stable )
+        # XXX replace with invoke_command
+        run "cd #{src_dir} && test -f #{src_package[:filename]} #{md5_clause} || #{sudo} wget --quiet --timestamping #{src_package[:url]}"
+      else
+        puts "DOWNLOAD SRC: Download method not recognised. src_package[:download_method]: #{src_package[:download_method]}"
+    end
   end
 
   # unpack src and make it writable by the group
   def unpack_src(src_package, src_dir)
     set_package_defaults(src_package)
     package_dir = File.join(src_dir, src_package[:dir])
-    # XXX replace with invoke_command
+    case src_package[:download_method]
+      # when unpacking git sources - nothing to do
+      when :git
+        puts "UNPACK SRC: nothing to do for git installs"
+      when :http
+        sudo <<-EOF
+        bash -c '
+        cd #{src_dir};
+        test -d #{package_dir}.old && rm -fr #{package_dir}.old;
+        test -d #{package_dir} && mv #{package_dir} #{package_dir}.old;
+        #{src_package[:unpack]}
+        '
+        EOF
+      else
+        puts "UNPACK SRC: Download method not recognised. src_package[:download_method]: #{src_package[:download_method]} "
+    end
     sudo <<-EOF
     bash -c '
     cd #{src_dir};
-    test -d #{package_dir}.old && rm -fr #{package_dir}.old;
-    test -d #{package_dir} && mv #{package_dir} #{package_dir}.old;
-    #{src_package[:unpack]}
     chgrp -R #{group} #{package_dir};  
     chmod -R g+w #{package_dir};
     '
     EOF
   end
-  
+
   def set_package_defaults(pkg)
-      pkg[:filename] ||= File.basename(pkg[:url])  
-      pkg[:dir] ||= pkg[:filename].sub(/(\.tgz|\.tar\.gz)/,'')  
-      pkg[:unpack] ||= "tar zxf #{pkg[:filename]};"
-      pkg[:configure] ||= './configure ;'
-      pkg[:make] ||= 'make;'
-      pkg[:install] ||= 'make install;'
+    pkg[:filename] ||= File.basename(pkg[:url])
+    pkg[:dir] ||= pkg[:filename].sub(/(\.tgz|\.tar\.gz)/,'')
+    pkg[:download_method] ||= :http
+    pkg[:unpack] ||= "tar zxf #{pkg[:filename]};"
+    pkg[:configure] ||= './configure ;'
+    pkg[:make] ||= 'make;'
+    pkg[:install] ||= 'make install;'
   end
 
   # install package from source
@@ -388,4 +428,4 @@ module Deprec2
   
 end
 
-Capistrano.plugin :deprec2, Deprec2
+Capistrano.plugin :deprec2, Deprec2

data/lib/deprec/recipes.rb

@@ -32,6 +32,8 @@ require "#{File.dirname(__FILE__)}/recipes/sphinx"
 require "#{File.dirname(__FILE__)}/recipes/logrotate"
 require "#{File.dirname(__FILE__)}/recipes/utils"
 require "#{File.dirname(__FILE__)}/recipes/git"
+require "#{File.dirname(__FILE__)}/recipes/apt_mirror"
 # require "#{File.dirname(__FILE__)}/recipes/pdns"
 require "#{File.dirname(__FILE__)}/recipes/gitosis"
+require "#{File.dirname(__FILE__)}/recipes/wordpress"
 require "#{File.dirname(__FILE__)}/recipes/ar_sendmail"

data/lib/deprec/recipes/aoe.rb

@@ -2,75 +2,74 @@
 Capistrano::Configuration.instance(:must_exist).load do 
 
   SRC_PACKAGES[:aoe] = {
-    :filename => 'aoe6-56.tar.gz',   
-    :md5sum => "93689aaad32f647a788c15c82bd0158e  aoe6-56.tar.gz", 
-    :dir => 'aoe6-56',  
-    :url => "http://www.coraid.com/support/linux/aoe6-56.tar.gz",
-    :unpack => "tar zxf aoe6-56.tar.gz;",
-    :make => 'make;',
-    :install => 'make install;'
+    :url => "http://support.coraid.com/support/linux/aoe6-64.tar.gz",
+    :md5sum => "c5e1ebb734e3b29c0a3d886a700ca44a  aoe6-64.tar.gz",
+    :configure => ''
+  }
+  
+  SRC_PACKAGES[:cec] = {
+    :url => "http://easynews.dl.sourceforge.net/sourceforge/aoetools/cec-8.tgz",
+    :md5sum => "7899dc549f9a368e532f9c39ed819f71  cec-8.tgz",
+    :configure => '',
+    :install => "test -f /usr/sbin/cec && rm /usr/sbin/cec; make install;"
+  }
+  
+  SRC_PACKAGES[:ddt] = {
+    :url => "http://support.coraid.com/support/sr/ddt-8.tgz",
+    :md5sum => "256a58aba5e05f9995fb9de6aadadf92  ddt-8.tgz"
+  }
+  
+  SRC_PACKAGES[:aoemask] = {
+    :url => "http://support.coraid.com/support/sr/aoemask-1.tgz",
+    :md5sum => "379461a28d511e269f4593b846bd1288  aoemask-1.tgz"
   }
     
   namespace :deprec do
     namespace :aoe do
-
+      
       desc "Install aoe drivers required to mount Coraid block devices"
-      task :install do
+      task :install, :roles => :aoe do
         install_deps
         deprec2.download_src(SRC_PACKAGES[:aoe], src_dir)
         deprec2.install_from_src(SRC_PACKAGES[:aoe], src_dir)
       end
 
-      task :install_deps do
+      task :install_deps, :roles => :aoe do
         apt.install( {:base => %w(build-essential linux-headers-$(uname -r) vblade aoetools)}, :stable )
       end
-
+      
+      desc "Install all AoE related software"
+      task :install_all, :roles => :aoe do
+        top.deprec.aoe.install
+        top.deprec.cec.install
+        top.deprec.ddt.install
+        top.deprec.aoemask.install
+      end
+      
     end
 
-    
-    SRC_PACKAGES[:cec] = {
-      :url => "http://easynews.dl.sourceforge.net/sourceforge/aoetools/cec-8.tgz",
-      :md5sum => "7899dc549f9a368e532f9c39ed819f71  cec-8.tgz"
-    }
-    
     namespace :cec do
-  
       desc "install CEC (Coraid Ethernet Console)"
-      task :install do
+      task :install, :roles => :aoe do
         deprec2.download_src(SRC_PACKAGES[:cec], src_dir)
         deprec2.install_from_src(SRC_PACKAGES[:cec], src_dir)
       end
-      
     end
     
-    SRC_PACKAGES[:ddt] = {
-      :url => "http://support.coraid.com/support/sr/ddt-6.tgz",
-      :md5sum => "5e1e8a58a8621b93440be605113f7bc0  ddt-6.tgz"
-    }
-    
     namespace :ddt do
-  
       desc "install DDT (tool for testing performance)"
-      task :install do
+      task :install, :roles => :aoe do
         deprec2.download_src(SRC_PACKAGES[:ddt], src_dir)
         deprec2.install_from_src(SRC_PACKAGES[:ddt], src_dir)
       end
-      
     end
     
-    SRC_PACKAGES[:aoemask] = {
-      :url => "http://support.coraid.com/support/sr/aoemask-1.tgz",
-      :md5sum => "379461a28d511e269f4593b846bd1288  aoemask-1.tgz"
-    }
-    
     namespace :aoemask do
-  
       desc "install aoemask"
-      task :install do
+      task :install, :roles => :aoe do
         deprec2.download_src(SRC_PACKAGES[:aoemask], src_dir)
         deprec2.install_from_src(SRC_PACKAGES[:aoemask], src_dir)
       end
-      
     end
         
   end

data/lib/deprec/recipes/ar_sendmail.rb

@@ -4,12 +4,12 @@ Capistrano::Configuration.instance(:must_exist).load do
     namespace :ar_sendmail do
       
       desc "Install ar_mailer"
-      task :install do
+      task :install, :roles => :app do
         gem2.install 'ar_mailer'
       end
 
-      # install dependencies for nginx
-      task :install_deps do
+      # install dependencies for ar_sendmail
+      task :install_deps, :roles => :app do
         #pass
       end
       
@@ -30,12 +30,14 @@ Capistrano::Configuration.instance(:must_exist).load do
         config_gen_project
       end
       
+      desc "Generate configuration file(s) for ar_sendmail from template(s)"
       task :config_gen_project do
         PROJECT_CONFIG_FILES[:ar_sendmail].each do |file|
           deprec2.render_template(:ar_sendmail, file)
         end
       end
       
+      desc "Push ar_sendmail config files to server"
       task :config, :roles => :app do
         config_project
       end

data/lib/deprec/recipes/git.rb

@@ -10,8 +10,8 @@ Capistrano::Configuration.instance(:must_exist).load do
       set :git_root, '/var/git'
 
       SRC_PACKAGES[:git] = {
-        :url => "http://kernel.org/pub/software/scm/git/git-1.5.5.4.tar.gz",
-        :md5sum => "8255894042c8a6db07227475b8b4622f  git-1.5.5.4.tar.gz"
+        :url => "http://kernel.org/pub/software/scm/git/git-1.6.0.1.tar.gz",
+        :md5sum => "7096bac44acbb73f916d3089aa3fdee6  git-1.6.0.1.tar.gz"
       }
 
       desc "Install git"
@@ -94,4 +94,4 @@ Capistrano::Configuration.instance(:must_exist).load do
 
     end 
   end
-end
+end

data/lib/deprec/recipes/mongrel.rb

@@ -21,7 +21,7 @@ Capistrano::Configuration.instance(:must_exist).load do
       # Install 
       
       desc "Install mongrel"
-      task :install do
+      task :install, :roles => :app do
         gem2.install 'mongrel'
         gem2.install 'mongrel_cluster'
         gem2.install 'swiftiply'
@@ -32,11 +32,11 @@ Capistrano::Configuration.instance(:must_exist).load do
         activate_system
       end
       
-      task :symlink_mongrel_rails do
+      task :symlink_mongrel_rails, :roles => :app do
         sudo "ln -sf /usr/local/bin/mongrel_rails /usr/bin/mongrel_rails"
       end
       
-      task :symlink_logrotate_config do
+      task :symlink_logrotate_config, :roles => :app do
         sudo "ln -sf #{deploy_to}/mongrel/logrotate.conf /etc/logrotate.d/mongrel-#{application}"
       end
     
@@ -142,16 +142,16 @@ Capistrano::Configuration.instance(:must_exist).load do
         send(run_method, "mongrel_rails cluster::restart --clean -C #{mongrel_conf}")
       end
       
-      task :activate, :roles => :app do
+      task :activate do
         activate_system        
         activate_project
       end  
       
-      task :activate_system, :roles => :app do
+      task :activate_system do
         send(run_method, "update-rc.d mongrel_cluster defaults")
       end
       
-      task :activate_project, :roles => :app do
+      task :activate_project do
         symlink_mongrel_cluster
         symlink_monit_config
       end

data/lib/deprec/recipes/mysql.rb

@@ -6,22 +6,22 @@ Capistrano::Configuration.instance(:must_exist).load do
       # Installation
       
       desc "Install mysql"
-      task :install do
+      task :install, :roles => :db do
         install_deps
-        symlink_mysql_sockfile # XXX still needed?
+        # symlink_mysql_sockfile # XXX still needed?
       end
       
       # Install dependencies for Mysql
-      task :install_deps do
+      task :install_deps, :roles => :db do
         apt.install( {:base => %w(mysql-server mysql-client)}, :stable )
       end
       
-      task :symlink_mysql_sockfile, :roles => :db do
-        # rails puts "socket: /tmp/mysql.sock" into config/database.yml
-        # this is not the location for our ubuntu's mysql socket file
-        # so we create this link to make deployment using rails defaults simpler
-        sudo "ln -sf /var/run/mysqld/mysqld.sock /tmp/mysql.sock"
-      end
+      # task :symlink_mysql_sockfile, :roles => :db do
+      #   # rails puts "socket: /tmp/mysql.sock" into config/database.yml
+      #   # this is not the location for our ubuntu's mysql socket file
+      #   # so we create this link to make deployment using rails defaults simpler
+      #   sudo "ln -sf /var/run/mysqld/mysqld.sock /tmp/mysql.sock"
+      # end
       
       # Configuration
       

data/lib/deprec/recipes/nginx.rb

@@ -17,7 +17,7 @@ Capistrano::Configuration.instance(:must_exist).load do
       }
 
       desc "Install nginx"
-      task :install do
+      task :install, :roles => :web do
         install_deps
         deprec2.download_src(SRC_PACKAGES[:nginx], src_dir)
         deprec2.install_from_src(SRC_PACKAGES[:nginx], src_dir)
@@ -30,20 +30,15 @@ Capistrano::Configuration.instance(:must_exist).load do
       end
 
       # install dependencies for nginx
-      task :install_deps do
+      task :install_deps, :roles => :web do
         apt.install( {:base => %w(libpcre3 libpcre3-dev libpcrecpp0 libssl-dev zlib1g-dev)}, :stable )
         # do we need libgcrypt11-dev?
       end
 
-      task :create_nginx_user do
+      task :create_nginx_user, :roles => :web do
         deprec2.groupadd(nginx_group)
         deprec2.useradd(nginx_user, :group => nginx_group, :homedir => false)
       end
-      
-      task :rename_index_page, :roles => :web do
-        index_file = '/usr/local/nginx/html/index.html'
-        sudo "test -f #{index_file} && sudo mv #{index_file} #{index_file}.orig || exit 0"
-      end
 
       SYSTEM_CONFIG_FILES[:nginx] = [
 
@@ -89,11 +84,11 @@ Capistrano::Configuration.instance(:must_exist).load do
       Activate nginx start scripts on server.
       Setup server to start nginx on boot.
       DESC
-      task :activate do
+      task :activate, :roles => :web do
         activate_system
       end
 
-      task :activate_system do
+      task :activate_system, :roles => :web do
         send(run_method, "update-rc.d nginx defaults")
       end
 
@@ -101,11 +96,10 @@ Capistrano::Configuration.instance(:must_exist).load do
       Dectivate nginx start scripts on server.
       Setup server to start nginx on boot.
       DESC
-      task :deactivate do
+      task :deactivate, :roles => :web do
         send(run_method, "update-rc.d -f nginx remove")
       end
 
-
       # Control
 
       desc "Start Nginx"
@@ -138,6 +132,12 @@ Capistrano::Configuration.instance(:must_exist).load do
       task :restore, :roles => :web do
         # there's nothing to store for nginx
       end
+      
+      # Helper task to get rid of pesky "it works" page - not called by deprec tasks
+      task :rename_index_page, :roles => :web do
+        index_file = '/usr/local/nginx/html/index.html'
+        sudo "test -f #{index_file} && sudo mv #{index_file} #{index_file}.orig || exit 0"
+      end
 
     end 
   end

data/lib/deprec/recipes/php.rb

@@ -5,14 +5,11 @@ Capistrano::Configuration.instance(:must_exist).load do
       
       desc "Install PHP from source"
       task :install do
-        version = 'php-5.2.4'
         set :src_package, {
-          :file => version + '.tar.gz',
-          :md5sum => '0826e231c3148b29fd039d7a8c893ad3  php-5.2.4.tar.gz', 
-          :dir => version,
-          :url => "http://www.php.net/distributions/#{version}.tar.gz",
-          :unpack => "tar zxf #{version}.tar.gz;",
+          :md5sum => '1720f95f26c506338f0dba3a51906bbd  php-5.2.6.tar.gz', 
+          :url => "http://www.php.net/distributions/php-5.2.6.tar.gz",
           :configure => %w(
+            export CFLAGS=-O2;
             ./configure 
             --prefix=/usr/local/php
             --with-apxs2=/usr/local/apache2/bin/apxs
@@ -34,13 +31,9 @@ Capistrano::Configuration.instance(:must_exist).load do
             --enable-mbstring
             --with-curl==/usr/lib 
             ;
-            ).reject{|arg| arg.match '#'}.join(' '),
-          :make => 'make;',
-          :install => 'make install;',
-          :post_install => ""
+            ).reject{|arg| arg.match '#'}.join(' ')
         }
         install_deps
-        run "export CFLAGS=-O2;"
         deprec2.download_src(src_package, src_dir)
         deprec2.install_from_src(src_package, src_dir)
         deprec2.append_to_file_if_missing('/usr/local/apache2/conf/httpd.conf', 'AddType application/x-httpd-php .php')
@@ -48,7 +41,6 @@ Capistrano::Configuration.instance(:must_exist).load do
       
       # install dependencies for php
       task :install_deps do
-        puts "This function should be overridden by your OS plugin!"
         apt.install( {:base => %w(zlib1g-dev zlib1g openssl libssl-dev 
           flex libcurl3 libcurl3-dev libmcrypt-dev libmysqlclient15-dev libncurses5-dev 
           libxml2-dev libjpeg62-dev libpng12-dev)}, :stable )

data/lib/deprec/recipes/postfix.rb

@@ -4,16 +4,24 @@ Capistrano::Configuration.instance(:must_exist).load do
   namespace :deprec do
     namespace :postfix do
       
+      set(:postfix_relayhost) { Capistrano::CLI.ui.ask "What host should we relay mail through?" } 
       desc "Install Postfix"
-      task :install, :roles => :web do
+      task :install, :roles => :mail do
         install_deps
       end
       
       # Install dependencies for Postfix
       task :install_deps do
-        apt.install( {:base => %w(postfix)}, :stable )
+        # mutt and mailx are useful tools for testing mail
+        # e.g. echo test | mail test@gmail.com
+        apt.install( {:base => %w(postfix mutt mailx)}, :stable )
       end
       
+      # This is my default Postfix setup on servers that 
+      # aren't my main outgoing mailserver.
+      # It accepts mail from localhost only and relays
+      # all mail to a master mailserver for delivery.
+      #
       SYSTEM_CONFIG_FILES[:postfix] = [
         
         {:template => "main.cf.erb",
@@ -38,17 +46,18 @@ Capistrano::Configuration.instance(:must_exist).load do
          
       ]
       
-      desc "Generate configuration file(s) for XXX from template(s)"
+      desc 'Generate configuration files(s) for postfix' 
       task :config_gen do
         SYSTEM_CONFIG_FILES[:postfix].each do |file|
           deprec2.render_template(:postfix, file)
         end
       end
       
-      desc 'Deploy configuration files(s) for XXX' 
-      task :config, :roles => :mail do
+      desc 'Deploy configuration files(s) for postfix' 
+      task :config, :roles => :mail, :except => { :master => true } do
         deprec2.push_configs(:postfix, SYSTEM_CONFIG_FILES[:postfix])
         send(run_method, "/usr/bin/newaliases")
+        reload
       end
       
       desc "Start Postfix"

data/lib/deprec/recipes/rails.rb

@@ -61,10 +61,9 @@ Capistrano::Configuration.instance(:must_exist).load do
         top.deprec.ruby.install      
         top.deprec.rubygems.install
         
-        deprec2.for_roles('web') do
-          top.deprec.nginx.install        
-        end
+        top.deprec.nginx.install        
         
+        # XXX check this out before removing - Mike
         deprec2.for_roles('app') do
           top.deprec.svn.install
           top.deprec.git.install     
@@ -73,15 +72,10 @@ Capistrano::Configuration.instance(:must_exist).load do
           top.deprec.rails.install
         end
         
-        deprec2.for_roles('web,app') do
-          top.deprec.logrotate.install        
-        end
+        top.deprec.logrotate.install        
         
-        # Install database separately 
-        deprec2.for_roles('db') do
-          top.deprec.mysql.install
-          top.deprec.mysql.start      
-        end
+        top.deprec.mysql.install
+        top.deprec.mysql.start      
 
       end
       
@@ -90,7 +84,7 @@ Capistrano::Configuration.instance(:must_exist).load do
         install_stack
       end
       
-      task :install_gems_for_project do
+      task :install_gems_for_project, :roles => :app do
           if gems_for_project
             gems_for_project.each { |gem| gem2.install(gem) }
           end
@@ -122,23 +116,23 @@ Capistrano::Configuration.instance(:must_exist).load do
         deprec2.push_configs(:nginx, PROJECT_CONFIG_FILES[:nginx])
         top.deprec.mongrel.config_project
         symlink_nginx_vhost
-        symlink_logrotate_config
+        symlink_nginx_logrotate_config
       end
 
       task :symlink_nginx_vhost, :roles => :web do
         sudo "ln -sf #{deploy_to}/nginx/rails_nginx_vhost.conf #{nginx_vhost_dir}/#{application}.conf"
       end
       
-      task :symlink_logrotate_config, :roles => :web do
+      task :symlink_nginx_logrotate_config, :roles => :web do
         sudo "ln -sf #{deploy_to}/nginx/logrotate.conf /etc/logrotate.d/nginx-#{application}"
       end
 
-      task :create_config_dir do
+      task :create_config_dir, :roles => :app do
         deprec2.mkdir("#{shared_path}/config", :group => group, :mode => 0775, :via => :sudo)
       end
       
       desc "Create deployment group and add current user to it"
-      task :setup_user_perms do
+      task :setup_user_perms, :roles => [:app, :web] do
         deprec2.groupadd(group)
         deprec2.add_user_to_group(user, group)
         deprec2.groupadd(mongrel_group)
@@ -160,7 +154,7 @@ Capistrano::Configuration.instance(:must_exist).load do
       end
 
       # setup extra paths required for deployment
-      task :setup_paths, :roles => :app do
+      task :setup_paths, :roles => [:app, :web] do
         deprec2.mkdir(deploy_to, :mode => 0775, :group => group, :via => :sudo)
         deprec2.mkdir(shared_path, :mode => 0775, :group => group, :via => :sudo)
       end
@@ -285,4 +279,4 @@ Capistrano::Configuration.instance(:must_exist).load do
 
   end
   
-end
+end

data/lib/deprec/recipes/ruby.rb

@@ -5,11 +5,11 @@ Capistrano::Configuration.instance(:must_exist).load do
     namespace :ruby do
             
       SRC_PACKAGES[:ruby] = {
-        :filename => 'ruby-1.8.6-p110.tar.gz',   
-        :md5sum => "5d9f903eae163cda2374ef8fdba5c0a5  ruby-1.8.6-p110.tar.gz", 
-        :dir => 'ruby-1.8.6-p110',  
-        :url => "ftp://ftp.ruby-lang.org/pub/ruby/1.8/ruby-1.8.6-p110.tar.gz",
-        :unpack => "tar zxf ruby-1.8.6-p110.tar.gz;",
+        :filename => 'ruby-1.8.6-p287.tar.gz',   
+        :md5sum => "f6cd51001534ced5375339707a757556  ruby-1.8.6-p287.tar.gz", 
+        :dir => 'ruby-1.8.6-p287',  
+        :url => "ftp://ftp.ruby-lang.org/pub/ruby/1.8/ruby-1.8.6-p287.tar.gz",
+        :unpack => "tar zxf ruby-1.8.6-p287.tar.gz;",
         :configure => %w(
           ./configure
           --with-readline-dir=/usr/local
@@ -38,10 +38,12 @@ Capistrano::Configuration.instance(:must_exist).load do
   
       SRC_PACKAGES[:rubygems] = {
         :filename => 'rubygems-1.2.0.tgz',   
-        :md5sum => "b77a4234360735174d1692e6fc598402  rubygems-1.0.1.tgz", 
+        :md5sum => "b77a4234360735174d1692e6fc598402  rubygems-1.2.0.tgz", 
         :dir => 'rubygems-1.2.0',  
         :url => "http://rubyforge.org/frs/download.php/38646/rubygems-1.2.0.tgz",
         :unpack => "tar zxf rubygems-1.2.0.tgz;",
+      	:configure => "",
+      	:make =>  "",
         :install => 'ruby setup.rb;'
       }
       

data/lib/deprec/recipes/sphinx.rb

@@ -80,4 +80,7 @@ Capistrano::Configuration.instance(:must_exist).load do
 
     end 
   end
-end
+end
+
+# ultrasphinx deployment notes
+# http://blog.evanweaver.com/files/doc/fauna/ultrasphinx/files/DEPLOYMENT_NOTES.html

data/lib/deprec/recipes/utils.rb

@@ -28,8 +28,7 @@ Capistrano::Configuration.instance(:must_exist).load do
         end
      
         task :net do
-          apps = %w(lynx nmap netcat
-                    vim-full)
+          apps = %w(lynx nmap netcat mailx mutt telnet vim-full dnsutils)
           apt.install( {:base => apps}, :stable )
         end
         

data/lib/deprec/recipes/xen.rb

@@ -60,7 +60,7 @@ Capistrano::Configuration.instance(:must_exist).load do
         enable_hardy_domu
       end
       
-      task :install_deps do
+      task :install_deps, :roles => :dom0 do
         # for amd64 version of ubuntu 7.10
         apt.install( {:base => %w(linux-image-xen bridge-utils libxen3.1 python-xen-3.1 xen-docs-3.1 xen-hypervisor-3.1 xen-ioemu-3.1 xen-tools xen-utils-3.1 lvm2)}, :stable )
         # alternatively, for x86 version of ubuntu:
@@ -75,7 +75,7 @@ Capistrano::Configuration.instance(:must_exist).load do
       end
       
       desc "Push Xen config files to server"
-      task :config do
+      task :config, :roles => :dom0 do
         deprec2.push_configs(:xen, SYSTEM_CONFIG_FILES[:xen])
       end
       
@@ -86,30 +86,30 @@ Capistrano::Configuration.instance(:must_exist).load do
       # xm create -c /etc/xen/x1.cfg
       
       desc "Start Xen"
-      task :start do
+      task :start, :roles => :dom0 do
         send(run_method, "/etc/init.d/xend start")
       end
 
       desc "Stop Xen"
-      task :stop do
+      task :stop, :roles => :dom0 do
         send(run_method, "/etc/init.d/xend stop")
       end
 
       desc "Restart Xen"
-      task :restart do
+      task :restart, :roles => :dom0 do
         send(run_method, "/etc/init.d/xend restart")
       end
 
       desc "Reload Xen"
-      task :reload do
+      task :reload, :roles => :dom0 do
         send(run_method, "/etc/init.d/xend reload")
       end
       
-      task :list do
+      task :list, :roles => :dom0 do
         sudo "xm list"
       end
       
-      task :info do
+      task :info, :roles => :dom0 do
         sudo "xm info"
       end
 

data/lib/deprec/templates/mongrel/logrotate.conf.erb

@@ -1,4 +1,4 @@
-<%= shared_path %>/log/production.log <%= shared_path %>/log/mongrel.*.log {
+<%= shared_path %>/log/<%= rails_env %>.log <%= shared_path %>/log/mongrel.*.log {
   daily
   rotate 14
   dateext

data/lib/deprec/templates/postfix/main.cf.erb

@@ -1,9 +1,10 @@
 # See /usr/share/postfix/main.cf.dist for a commented, more complete version
 
+
 # Debian specific:  Specifying a file name will cause the first
 # line of that file to be used as the name.  The Debian default
 # is /etc/mailname.
-#myorigin = /etc/mailname
+myorigin = /etc/mailname
 
 smtpd_banner = $myhostname ESMTP $mail_name (Ubuntu)
 biff = no
@@ -24,18 +25,12 @@ smtp_tls_session_cache_database = btree:${queue_directory}/smtp_scache
 # See /usr/share/doc/postfix/TLS_README.gz in the postfix-doc package for
 # information on enabling SSL in the smtp client.
 
-myhostname = dn.blocksglobal.com
+# myhostname = 
 alias_maps = hash:/etc/aliases
 alias_database = hash:/etc/aliases
-myorigin = /etc/mailname
-
-# deprec - XXX add something like this to template file
-# 
-# mydestination = <%# postfix_destination_domains * ', ' %>, localhost.localdomain, localhost
-mydestination = dn.blocksglobal.com, localhost.blocksglobal.com, , localhost
-
-relayhost = 
+mydestination = $myhostname localhost.$mydomain $myorigin
+relayhost = <%= postfix_relayhost %>
 mynetworks = 127.0.0.0/8
 mailbox_size_limit = 0
 recipient_delimiter = +
-inet_interfaces = all
+inet_interfaces = loopback-only

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: andyh-deprec
 version: !ruby/object:Gem::Version 
-  version: 1.99.26
+  version: 1.99.27
 platform: ruby
 authors: 
 - Mike Bailey
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-08-13 00:00:00 -07:00
+date: 2008-10-09 00:00:00 -07:00
 default_executable: depify
 dependencies: 
 - !ruby/object:Gem::Dependency