isaac-deprec 1.99.30 → 1.99.32

data/lib/deprec/recipes/ree.rb

@@ -1,30 +1,31 @@
 # Copyright 2006-2008 by Mike Bailey. All rights reserved.
 Capistrano::Configuration.instance(:must_exist).load do 
 
+  set :ree_version, "ruby-enterprise-1.8.6-20090113"
+  set :ree_install_dir, "/opt/ree"
+  set :ree_filename, "#{ree_version}.tar.gz"
+
   namespace :deprec do
     namespace :ree do
 
-      set :ree_version, "ruby-enterprise-1.8.6-20081217"
-      set :ree_install_dir, "/opt/#{ree_version}"
-      set :ree_filename, "#{ree_version}.tar.gz"
-
       SRC_PACKAGES[:ree] = {
-        :md5sum => "8d04b48e33a485280b86d6cdb156eebe  #{ree_filename}", 
-        :url => "http://github.com/isaac/rubyenterpriseedition/raw/release/#{ree_filename}",
+        :filename => ree_filename,   
+        :md5sum => "e8d796a5bae0ec1029a88ba95c5d901d  #{ree_filename}", 
+        :url => "http://rubyforge.org/frs/download.php/50087/#{ree_filename}",
         :unpack => "tar xzvf #{ree_filename};",
         :configure => '',
         :make => '',
         :install => "./installer --auto #{ree_install_dir}"
       }
-  
+
       task :install do
         install_deps
-        deprec2.download_src(SRC_PACKAGES[:ree], ree_install_dir)
-        deprec2.install_from_src(SRC_PACKAGES[:ree], ree_install_dir)
+        deprec2.download_src(SRC_PACKAGES[:ree], src_dir)
+        deprec2.install_from_src(SRC_PACKAGES[:ree], src_dir)
       end
       
       task :install_deps do
-        apt.install({:base => %w(zlib1g-dev libssl-dev libmysqlclient15-dev libreadline5-dev)}, :stable)
+        apt.install({:base => %w(libssl-dev libmysqlclient15-dev libreadline5-dev)}, :stable)
       end
 
     end

data/lib/deprec/recipes/ruby.rb

@@ -5,18 +5,9 @@ Capistrano::Configuration.instance(:must_exist).load do
     namespace :ruby do
             
       SRC_PACKAGES[:ruby] = {
-        :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
-          ;
-          ).reject{|arg| arg.match '#'}.join(' '),
-        :make => 'make;',
-        :install => 'make install;'
+        :md5sum => "5e5b7189674b3a7f69401284f6a7a36d  ruby-1.8.7-p72.tar.gz", 
+        :url => "ftp://ftp.ruby-lang.org/pub/ruby/1.8/ruby-1.8.7-p72.tar.gz",
+        :configure => "./configure --with-readline-dir=/usr/local;"
       }
   
       task :install do
@@ -59,7 +50,7 @@ Capistrano::Configuration.instance(:must_exist).load do
       task :install_deps do
       end
       
-    end 
+    end
+    
   end
-  
 end

data/lib/deprec/recipes/utils.rb

@@ -27,12 +27,31 @@ Capistrano::Configuration.instance(:must_exist).load do
           
         end
       
-        desc "Install some handy network utils"
+        desc "Install some useful network utils"
         task :net do
-          apps = %w(lynx nmap netcat mailx mutt telnet vim-full dnsutils rsync)
+          apps = %w(lynx nmap netcat telnet dnsutils rsync curl wget)
           apt.install( {:base => apps}, :stable )
         end
         
+        desc "Install some useful mail utils"
+        task :mail do
+          apps = %w(mailx mutt)
+          apt.install( {:base => apps}, :stable )
+        end
+        
+        desc "Install some useful utils"
+        task :other do
+          apps = %w(vim-full)
+          apt.install( {:base => apps}, :stable )
+        end
+        
+        desc "Install handy utils"
+        task :handy do
+          net
+          mail
+          other
+        end
+        
     end 
   end
 end

data/lib/deprec/recipes/wordpress.rb

@@ -22,9 +22,6 @@ Capistrano::Configuration.instance(:must_exist).load do
   namespace :deprec do 
     namespace :wordpress do
           
-      # We're using the lambda because we want wordpress_install_dir to
-      # pick up on the value for :application if it's overridden in deploy.rb
-      #
       SRC_PACKAGES[:wordpress] =
         {
         :url => "http://wordpress.org/latest.tar.gz",
@@ -88,7 +85,7 @@ Capistrano::Configuration.instance(:must_exist).load do
       task :create_database, :roles => lambda { db_host } do
         run <<-EOF
           mysql -u root -e 'create database #{DB_NAME}'
-          mysql -u root -e 'grant all on sct_blog.* to '#{DB_USER}'@'%' identified by '#{DB_PASSWORD}'
+          mysql -u root -e 'grant all on #{DB_NAME}.* to '#{DB_USER}'@'%' identified by '#{DB_PASSWORD}'
           mysql -u root -e 'flush privileges'
         EOF
       end
@@ -96,4 +93,4 @@ Capistrano::Configuration.instance(:must_exist).load do
     end
   end
   
-end
+end

data/lib/deprec/recipes/xen.rb

@@ -12,66 +12,63 @@ Capistrano::Configuration.instance(:must_exist).load do
       
       # ref: http://www.eadz.co.nz/blog/article/xen-gutsy.html
       
+      desc "Install Xen"
+      task :install, :roles => :dom0 do
+        install_deps
+        disable_apparmour
+        disable_tls
+        enable_hardy_domu
+        initial_config
+      end
+      
+      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:
+        # apt-get install ubuntu-xen-server libc6-xen lvm2    
+      end
+      
+      task :disable_apparmour, :roles => :dom0 do
+        sudo '/etc/init.d/apparmor stop'
+        sudo 'update-rc.d -f apparmor remove'
+      end
+      
+      task :disable_tls, :roles => :dom0 do
+        sudo 'mv /lib/tls /lib/tls.disabled'
+      end
+      
       SYSTEM_CONFIG_FILES[:xen] = [
                 
         {:template => "xend-config.sxp.erb",
         :path => '/etc/xen/xend-config.sxp',
         :mode => 0644,
         :owner => 'root:root'},
-        
-        {:template => "xen-tools.conf.erb",
-         :path => '/etc/xen-tools/xen-tools.conf',
-         :mode => 0644,
-         :owner => 'root:root'},
-         
-        {:template => "xm.tmpl.erb",
-         :path => '/etc/xen-tools/xm.tmpl',
-         :mode => 0644,
-         :owner => 'root:root'},
          
         {:template => "xendomains.erb",
          :path => '/etc/default/xendomains',
          :mode => 0755,
          :owner => 'root:root'},
          
-        # This one is a bugfix for gutsy 
-        {:template => "15-disable-hwclock",
-         :path => '/usr/lib/xen-tools/gutsy.d/15-disable-hwclock',
-         :mode => 0755,
-         :owner => 'root:root'},
-         
-        # This one is a bugfix for gutsy: domU -> domU networking is screwy
-        # http://lists.xensource.com/archives/html/xen-users/2006-05/msg00818.html
-        {:template => "40-setup-networking",
-         :path => '/usr/lib/xen-tools/gutsy.d/40-setup-networking',
+        # This gives you a second network bridge on second ethernet device  
+        {:template => "network-bridge-wrapper",
+         :path => '/etc/xen/scripts/network-bridge-wrapper',
          :mode => 0755,
          :owner => 'root:root'},
          
-        # So is this - xendomains fails to shut down domains on system shutdown
+        # Bugfix for gutsy - xendomains fails to shut down domains on system shutdown
         {:template => "xend-init.erb",
          :path => '/etc/init.d/xend',
          :mode => 0755,
-         :owner => 'root:root'},
-          
-        # This gives you a second network bridge on second ethernet device  
-        {:template => "network-bridge-wrapper",
-         :path => '/etc/xen/scripts/network-bridge-wrapper',
-         :mode => 0755,
          :owner => 'root:root'}
          
       ]
       
-      desc "Install Xen"
-      task :install, :roles => :dom0 do
-        install_deps
-        enable_hardy_domu
-      end
-      
-      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:
-        # apt-get install ubuntu-xen-server libc6-xen    
+      desc "Push Xen config files to server"
+      task :initial_config, :roles => :dom0 do
+        # Non-standard! We're pushing these straight out
+        SYSTEM_CONFIG_FILES[:xen].each do |file|
+          deprec2.render_template(:xen, file.merge(:remote => true))
+        end      
       end
       
       desc "Generate configuration file(s) for Xen from template(s)"
@@ -132,7 +129,6 @@ Capistrano::Configuration.instance(:must_exist).load do
         build_slice_from_tarball
       end
 
-
       task :copy_disk do
         mnt_dir = "/mnt/#{xen_slice}-disk"
       	tarball = "/tmp/#{xen_slice}-disk.tar"
@@ -187,8 +183,9 @@ Capistrano::Configuration.instance(:must_exist).load do
         sudo "rmdir #{mnt_dir}", :hosts => xen_new_host
       end
       
-      desc "Enable hardy heron domU's on gutsy dom0"
+      desc "Enable hardy heron domU's on gutsy dom0. (Note required on hardy)"
       task :enable_hardy_domu, :roles => :dom0 do
+        # Note, hardy keeps debootrap in /usr/share/debootstrap/scripts/
         # create debootstrap symlink
         sudo "ln -sf /usr/lib/debootstrap/scripts/gutsy /usr/lib/debootstrap/scripts/hardy"
         # link xen-tools hooks
@@ -200,6 +197,7 @@ Capistrano::Configuration.instance(:must_exist).load do
       end
       
     end
+    
   end
 end
 

data/lib/deprec/templates/apache/index.html.erb

@@ -25,13 +25,6 @@
 			
 		</dl>
 		
-		<dl>
-			<p>Installation options</p>
-			<% SRC_PACKAGES[:apache].each do |key, val| %>
-				<dt><%= key %></dt>
-				<dd><%= val %></dd>
-			<% end %>
-		</dl>
 	</div>
 </body>
 </html>

data/lib/deprec/templates/mongrel/mongrel_cluster.yml.erb

@@ -1,10 +1,10 @@
 --- 
-user: <%= mongrel_user %>
-group: <%= mongrel_group %>
+user: <%= app_user %>
+group: <%= app_group %>
 cwd: <%= current_path %>
 log_file: <%= mongrel_log_dir %>/mongrel.log
 port: "<%= mongrel_port.to_s %>"
 environment: <%= mongrel_environment %>
 address: <%= mongrel_address %>
 pid_file: <%= mongrel_pid_dir %>/mongrel.pid
-servers: <%= mongrel_servers.to_s %>
+servers: <%= mongrel_servers.to_s %>

data/lib/deprec/templates/passenger/apache_vhost.erb

@@ -1,10 +1,21 @@
-<VirtualHost *:80>
-  ServerName <%= domain %>
-  DocumentRoot "<%= passenger_document_root %>"
-  RailsEnv <%= rails_env %>
-  RailsAllowModRewrite <%= passenger_rails_allow_mod_rewrite %>
-  <directory "<%= passenger_document_root %>">
-    Order allow,deny
-    Allow from all
-  </directory>
-</VirtualHost>
+# Don't cause the server to break if Passenger module not loaded
+<IfModule passenger_module>
+	<VirtualHost *:80>
+	  ServerName <%= domain %>
+	  DocumentRoot "<%= passenger_document_root %>"
+	  RailsEnv <%= rails_env %>
+	  # RailsAllowModRewrite <%= passenger_rails_allow_mod_rewrite %>
+	  #
+	  # Check for maintenance file and redirect all requests
+	  RewriteEngine On
+	  RewriteCond %{REQUEST_URI} !\.(css|jpg|png|gif)$
+	  RewriteCond %{DOCUMENT_ROOT}/system/maintenance.html -f
+	  RewriteCond %{SCRIPT_FILENAME} !maintenance.html
+      RewriteRule ^.*$ /system/maintenance.html [L]
+	  <Directory "<%= passenger_document_root %>">
+	    Order allow,deny
+	    Allow from all
+	  </Directory>
+	</VirtualHost>
+</IfModule>
+

data/lib/deprec/templates/ssh/ssh_config.erb

@@ -17,7 +17,7 @@
 # ssh_config(5) man page.
 
 Host *
-#   ForwardAgent no
+    ForwardAgent yes
 #   ForwardX11 no
 #   ForwardX11Trusted yes
 #   RhostsRSAAuthentication no

data/lib/deprec/templates/xen/xend-config.sxp.erb

@@ -60,7 +60,7 @@
 #(xend-tcp-xmlrpc-server no)
 #(xend-unix-xmlrpc-server yes)
 #(xend-relocation-server no)
-(xend-relocation-server yes)
+(xend-relocation-server no)
 
 #(xend-unix-path /var/lib/xend/xend-socket)
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: isaac-deprec
 version: !ruby/object:Gem::Version 
-  version: 1.99.30
+  version: 1.99.32
 platform: ruby
 authors: 
 - Mike Bailey
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-19 00:00:00 -08:00
+date: 2009-01-04 00:00:00 -08:00
 default_executable: depify
 dependencies: 
 - !ruby/object:Gem::Dependency 

data/lib/deprec/templates/passenger/passenger.erb

@@ -1,20 +0,0 @@
-# http://www.modrails.com/documentation/Users%20guide.html#_configuring_phusion_passenger
-
-LoadModule passenger_module <%= passenger_install_dir %>/ext/apache2/mod_passenger.so
-PassengerRoot <%= passenger_install_dir %>
-PassengerLogLevel <%= passenger_log_level %>
-PassengerRuby /usr/local/bin/ruby
-PassengerUserSwitching <%= passenger_user_switching %>
-PassengerDefaultUser <%= passenger_default_user %>
-PassengerMaxPoolSize <%= passenger_max_pool_size %>
-PassengerMaxInstancesPerApp <%= passenger_max_instances_per_app %>
-PassengerPoolIdleTime <%= passenger_pool_idle_time %>
-
-# Ruby on Rails Options
-
-RailsAutoDetect <%= passenger_rails_autodetect %>
-RailsSpawnMethod <%= passenger_rails_spawn_method %>
-
-<IfModule passenger_module>
-  NameVirtualHost *:80
-</IfModule>

data/lib/deprec/templates/xen/15-disable-hwclock

@@ -1,40 +0,0 @@
-#!/bin/sh
-#
-#  This script disables the hardware clock.
-#
-# Steve
-# --
-# http://www.steve.org.uk/
-
-
-prefix=$1
-
-
-#
-#  Source our common functions
-#
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
-else
-    . ./hooks/common.sh
-fi
-
-
-#
-# Log our start
-#
-logMessage Script $0 starting
-
-
-#
-#  Disable the startup scripts from all runlevels.
-#
-chroot ${prefix} /usr/sbin/update-rc.d -f hwclock.sh remove
-chroot ${prefix} /usr/sbin/update-rc.d -f hwclockfirst.sh remove
-rm -f ${prefix}/etc/init.d/hwclock.sh ${prefix}/etc/init.d/hwclockfirst.sh ${prefix}/etc/udev/rules.d/85-hwclock.rules
-
-#
-# Log our finish
-#
-logMessage Script $0 finished.
-

data/lib/deprec/templates/xen/40-setup-networking

@@ -1,145 +0,0 @@
-#!/bin/sh
-#
-#  This script sets up the /etc/network/interface file for the new
-# image.
-#
-# Steve
-# --
-# http://www.steve.org.uk/
-
-
-prefix=$1
-
-#
-#  Source our common functions
-#
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
-else
-    . ./hooks/common.sh
-fi
-
-
-#
-# Log our start
-#
-logMessage Script $0 starting
-
-
-#
-#  Make sure we have an /etc/network directory.
-#
-mkdir -p ${prefix}/etc/network
-
-
-#
-#  A function to setup DHCP for our new image.
-#
-setupDynamicNetworking ()
-{
-    #
-    # The host is using DHCP.
-    #
-    cat <<E_O_DHCP > ${prefix}/etc/network/interfaces
-# This file describes the network interfaces available on your system
-# and how to activate them. For more information, see interfaces(5).
-
-# The loopback network interface
-auto lo
-iface lo inet loopback
-
-# The primary network interface
-auto eth0
-iface eth0 inet dhcp
-post-up ethtool -K eth0 tx off
-
-#
-# The commented out line above will disable TCP checksumming which
-# might resolve problems for some users.  It is disabled by default
-#
-E_O_DHCP
-}
-
-
-
-#
-#  A function to setup static IP addresses for our new image.
-#
-setupStaticNetworking ()
-{
-    #
-    # broadcast address?
-    #
-    bcast='';
-    if [ ! -z "${broadcast}" ]; then
-      bcast=" broadcast ${broadcast}"
-    fi
-
-    #
-    # We have a static IP address
-    #
-    cat <<E_O_STATIC >${prefix}/etc/network/interfaces
-# This file describes the network interfaces available on your system
-# and how to activate them. For more information, see interfaces(5).
-
-# The loopback network interface
-auto lo
-iface lo inet loopback
-
-# The primary network interface
-auto eth0
-iface eth0 inet static
- address ${ip1}
- gateway ${gateway}
- netmask ${netmask}
- ${bcast}
- post-up  ethtool -K eth0 tx off
-
-#
-# The commented out line above will disable TCP checksumming which
-# might resolve problems for some users.  It is disabled by default
-#
-E_O_STATIC
-
-    interface=1
-    count=2
-
-    while [ "${count}" -le "${ip_count}" ]; do
-
-        value=\$ip${count}
-        value=`eval echo $value`
-
-        logMessage Adding etho:${interface}
-
-        cat <<E_O_STATIC >>${prefix}/etc/network/interfaces
-auto eth0:${interface}
-iface eth0:${interface} inet static
- address ${value}
- netmask ${netmask}
- post-up  ethtool -K eth0 tx off
-E_O_STATIC
-        count=`expr $count + 1`
-        interface=`expr $interface + 1`
-    done
-}
-
-
-
-
-#
-#  Call the relevant function
-#
-if [ -z "${dhcp}" ]; then
-    logMessage "Setting up static networking"
-    setupStaticNetworking
-
-else
-    logMessage "Setting up DHCP networking"
-    setupDynamicNetworking
-fi
-
-
-#
-#  Log our finish
-#
-logMessage Script $0 finished