deprec 1.2.1 → 1.2.2

data/lib/deprec/capistrano_extensions/deprec_extensions.rb

@@ -28,8 +28,7 @@ module Deprec
   
   # create new user account on target system
   def useradd(user)
-    puts run_method
-    send(run_method, "grep '^#{user}:' /etc/passwd || /usr/sbin/useradd -m #{user}")
+    send(run_method, "grep '^#{user}:' /etc/passwd || sudo /usr/sbin/useradd -m #{user}")
   end
   
   # create a new group on target system

data/lib/deprec/generators/deprec/templates/deploy.rb

@@ -25,7 +25,8 @@ role :db,  domain, :primary => true
 set :application, "<%= singular_name %>"
 set :deploy_to, "/var/www/apps/#{application}"
 
-set :user, ENV['USER']
+# XXX we may not need this - it doesn't work on windows
+# XXX set :user, ENV['USER']
 set :repository, "svn+ssh://#{user}@#{domain}#{deploy_to}/repos/trunk"
 set :rails_env, "production"
 
@@ -47,6 +48,8 @@ set :apache_server_name, domain
 # set :apache_ssl_enabled, false
 # set :apache_ssl_ip, "127.0.0.1"
 # set :apache_ssl_forward_all, false
+# set :apache_ssl_chainfile, false
+
 
 # =============================================================================
 # MONGREL OPTIONS

data/lib/deprec/recipes.rb

@@ -103,18 +103,11 @@ Capistrano.configuration(:must_exist).load do
     sudo "chmod -R g+w #{deploy_to}"
   end
   
-  task :create_user do
-    newuser=user
-    user='root'
-    # run "useradd -m #{newuser}"
-    run "ls"
-    user=newuser
-  end
-  
   task :install_gems do
     gem.install 'rails'                 # gem lib makes installing gems fun
     gem.select 'mongrel'                # mongrel requires we select a version
     gem.install 'mongrel_cluster'
+    gem.install 'builder'
   end
   
   desc "create deployment group and add current user to it"
@@ -150,7 +143,6 @@ Capistrano.configuration(:must_exist).load do
       :make => 'make;',
       :install => 'make install;',
       :post_install => 'install -b support/apachectl /etc/init.d/httpd;'
-      # XXX use 'install' command instead
     }
     deprec.download_src(src_package, src_dir)
     deprec.install_from_src(src_package, src_dir)
@@ -187,7 +179,8 @@ Capistrano.configuration(:must_exist).load do
   task :setup_admin_account do
     user = Capistrano::CLI.password_prompt "Enter userid for new user:" 
     deprec.useradd(user)
-    run_with_input("passwd #{user}", /UNIX password/) # ??? how many  versions of the prompt are there?
+    puts "Setting pasword for new account"
+    sudo_with_input("passwd #{user}", /UNIX password/) # ??? how many  versions of the prompt are there?
     deprec.groupadd('admin')
     deprec.add_user_to_group(user, 'admin')
     deprec.append_to_file_if_missing('/etc/sudoers', '%admin ALL=(ALL) ALL')

data/lib/deprec/recipes/cache_svn.rb

@@ -28,14 +28,14 @@ class Capistrano::SCM::Subversion
 
   def setup_repository_cache(actor)
     params =  ""
-    params << "--username #{configuration.svn_username}" if configuration.svn_username
-    command = "#{svn} co -q -v #{params} #{configuration.repository} #{configuration.repository_cache} &&"
+    params << "--username #{configuration[:svn_username]}" if configuration[:svn_username]
+    command = "#{svn} co -q #{params} #{configuration[:repository]} #{configuration[:repository_cache]} &&"
     configuration.logger.debug "Caching SVN repository on remote servers..."
     run_checkout(actor, command, &svn_stream_handler(actor)) 
   end
 
   def update_repository_cache(actor)
-    command = "#{svn} up -q #{configuration.repository_cache} &&"
+    command = "#{svn} up -q #{configuration[:repository_cache]} &&"
     run_update(actor, command, &svn_stream_handler(actor)) 
   end
 

data/lib/deprec/recipes/ubuntu.rb

@@ -25,6 +25,22 @@ Capistrano.configuration(:must_exist).load do
     apt.update
   end
   
+  desc "enable multiverse repositories"
+  task :enable_multiverse do
+    # ruby is not installed by default or else we'd use 
+    # sudo "ruby -pi.bak -e \"gsub(/#\s?(.*universe$)/, '\1')\" sources.list"
+    sudo 'perl -pi -e \'s/#\s?(deb.* multiverse$)/\1/g\' /etc/apt/sources.list'
+    apt.update
+  end
+  
+  desc "disable universe repositories"
+  task :disable_multiverse do
+    # ruby is not installed by default or else we'd use 
+    # sudo "ruby -pi.bak -e \"gsub(/#\s?(.*universe$)/, '\1')\" sources.list"
+    sudo 'perl -pi -e \'s/^([^#]*multiverse)/#\1/g\' /etc/apt/sources.list'
+    apt.update
+  end
+  
   desc "disable cdrom as a source of packages"
   task :disable_cdrom_install do
     # ruby is not installed by default so we use perl
@@ -32,12 +48,13 @@ Capistrano.configuration(:must_exist).load do
     apt.update
   end
   
-  desc "enable cdrom as a source of packages"
-  task :enable_cdrom_install do
-    # ruby is not installed by default so we use perl
-    sudo 'perl -pi -e \'s/^[# ]*(deb cdrom)/\1/g\' /etc/apt/sources.list'
-    apt.update
-  end
+  # XXX we need to run 'sudo apt-cdrom' to add a cdrom
+  # desc "enable cdrom as a source of packages"
+  # task :enable_cdrom_install do
+  #   # ruby is not installed by default so we use perl
+  #   sudo 'perl -pi -e \'s/^[# ]*(deb cdrom)/\1/g\' /etc/apt/sources.list'
+  #   apt.update
+  # end
   
   desc "installs packages required for a rails box"
   task :install_packages_for_rails do
@@ -54,8 +71,8 @@ Capistrano.configuration(:must_exist).load do
     apt.install({:base => ['postfix']}, :stable)
   end
   
-  desc "write network config to server"
-  task :network_configure do
+  # desc "write network config to server"
+  # task :network_configure do
     # set :ethernet_interfaces,  [{
     #                        :num => 0, 
     #                        :type => 'static', 
@@ -66,8 +83,8 @@ Capistrano.configuration(:must_exist).load do
     #                        :dns2 => '4.2.2.1'
     #                        }]
                           
-    deprec.render_template_to_file('interfaces.rhtml', '/etc/network/interfaces')
-  end
+  #   deprec.render_template_to_file('interfaces.rhtml', '/etc/network/interfaces')
+  # end
   
   # desc "configure hostname on server"
   # task :hostname_configure do

data/lib/deprec/recipes/vmware.rb

@@ -2,20 +2,35 @@ Capistrano.configuration(:must_exist).load do
   set :vm_dir, '/var/vm'
   set :stemserver, 'stemserver_ubuntu_6.06.1'
   
-  # currently only for CentOS
+  task :install_my_package do
+    packages = {:base => %w{build-essential libdb2 xinetd}}
+    packages[:base] << 'linux-headers-$(uname -r)'
+    apt.install(packages, :stable)
+  end
+  
   task :install_vmware_server do
-    version = 'VMware-server-1.0.1-29996.i386'
+    version = 'VMware-server-1.0.1-29996'
     set :src_package, {
-      :file => version + '.rpm',
-      :url => "http://10.0.100.45/download/vmware/#{version}.rpm",
-      :install => "rpm -i #{File.join(src_dir, version + '.rpm')};"
+      :file => version + '.tar.gz',
+      :dir => 'vmware-server-distrib',  
+      :url => "http://10.0.100.45/download/vmware/#{version}.tar.gz",
+      :unpack => "tar zxf #{version}.tar.gz;",
     }
+    # pre-requisites on Ubuntu
+    disable_cdrom_install
+    enable_universe
+    packages = {:base => %w{build-essential libdb2 xinetd}}
+    packages[:base] << 'linux-headers-$(uname -r)'
+    apt.install(packages, :stable)
+    
+    
+    # sudo apt-get install build-essential x-window-system-core
+    
     deprec.download_src(src_package, src_dir)
-    sudo src_package[:install]
-    sudo "yum install gcc" # when you select the develpment packages on CentOS it doesn't give you gcc!
-    # XXX work out how to do this interactive through capistrano
-    puts
+    deprec.install_from_src(src_package, src_dir)
+    puts    
     puts "IMPORTANT"
+    puts "manually run the following command:"
     puts "sudo /usr/bin/vmware-config.pl"
     puts
   end
@@ -33,11 +48,49 @@ Capistrano.configuration(:must_exist).load do
     deprec.unpack_src(src_package, src_dir)
     # XXX work out how to do this interactive through capistrano
     puts
-    puts "IMPORTANT - you need to log in and run"
-    puts "cd /usr/local/src/vmware-mui-distrib && sudo ./vmware-install.pl"
+    puts "IMPORTANT - you need to log in and run the following commands"
+    puts "cd /usr/local/src/vmware-server-distrib && sudo ./vmware-install.pl"
+    puts "cd /etc/vmware/ssl/ && sudo touch rui.key rui.crt"
+    puts "sudo /usr/bin/vmware-config.pl"
     puts
   end
   
+  # # currently only for CentOS
+  # task :install_vmware_server do
+  #   version = 'VMware-server-1.0.1-29996.i386'
+  #   set :src_package, {
+  #     :file => version + '.rpm',
+  #     :url => "http://10.0.100.45/download/vmware/#{version}.rpm",
+  #     :install => "rpm -i #{File.join(src_dir, version + '.rpm')};"
+  #   }
+  #   deprec.download_src(src_package, src_dir)
+  #   sudo src_package[:install]
+  #   sudo "yum install gcc" # when you select the develpment packages on CentOS it doesn't give you gcc!
+  #   # XXX work out how to do this interactive through capistrano
+  #   puts
+  #   puts "IMPORTANT"
+  #   puts "sudo /usr/bin/vmware-config.pl"
+  #   puts
+  # end
+  # 
+  # task :install_vmware_mui do
+  #   version = 'VMware-mui-1.0.1-29996'
+  #   src_package = {
+  #     :file => version + '.tar.gz',
+  #     :dir => 'vmware-mui-distrib',  
+  #     :url => "http://10.0.100.45/download/vmware/#{version}.tar.gz",
+  #     :unpack => "tar zxf #{version}.tar.gz;",
+  #     :install => './vmware-install.pl;'
+  #   }
+  #   deprec.download_src(src_package, src_dir)
+  #   deprec.unpack_src(src_package, src_dir)
+  #   # XXX work out how to do this interactive through capistrano
+  #   puts
+  #   puts "IMPORTANT - you need to log in and run"
+  #   puts "cd /usr/local/src/vmware-mui-distrib && sudo ./vmware-install.pl"
+  #   puts
+  # end
+  
   task :replicate_stemserver do
     sudo <<-SUDO
     sh -c '

data/lib/deprec/third_party/railsmachine/recipes/apache.rb

@@ -12,6 +12,7 @@ Capistrano.configuration(:must_exist).load do
   set :apache_ssl_enabled, false
   set :apache_ssl_ip, nil
   set :apache_ssl_forward_all, false
+  set :apache_ssl_chainfile, false
   
   task :setup_apache, :roles => :web do
     set :apache_path, '/usr/local/apache2'

data/lib/deprec/third_party/railsmachine/recipes/templates/httpd-ssl.conf

@@ -63,9 +63,11 @@ SSLCertificateFile /usr/local/apache2/conf/ssl.crt/<%= domain %>.crt
 # Server Private Key
 SSLCertificateKeyFile /usr/local/apache2/conf/ssl.key/<%= domain %>.key
 
-# XXX put this into deploy.rb
-## Intermediate keys
-# SSLCertificateChainFile /usr/local/apache2/conf/ssl.crt/<%= domain %>-chainfile.crt
+<% if apache_ssl_chainfile %>
+# Intermediate keys
+SSLCertificateChainFile /usr/local/apache2/conf/ssl.crt/<%= domain %>-chainfile.crt
+<% end %>
+
 
 BrowserMatch ".*MSIE.*" \
          nokeepalive ssl-unclean-shutdown \

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: deprec
 version: !ruby/object:Gem::Version 
-  version: 1.2.1
-date: 2006-12-27 00:00:00 +11:00
+  version: 1.2.2
+date: 2007-01-27 00:00:00 +11:00
 summary: deployment recipes for capistrano
 require_paths: 
 - lib
@@ -100,12 +100,3 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.2.0
     version: 
-- !ruby/object:Gem::Dependency 
-  name: termios
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.9.4
-    version: