le1t0-deprec 2.1.6.057 → 2.1.6.058

data/lib/deprec/templates/xentools/xm.tmpl.erb

@@ -6,20 +6,19 @@
 #
 #  Kernel + memory size
 #
-{ if ( ( $kernel ) && ( !defined($pygrub)) )
+{ if ( ( $kernel ) && ( !defined($bootloader)) )
   {
-    $OUT.= "kernel      = '$kernel'";
+    $OUT.= "kernel      = '$kernel'\n";
   }
 }
-{ if ( ( $initrd ) && ( !defined($pygrub)) )
+{ if ( ( $initrd ) && ( !defined($bootloader)) )
   {
-    $OUT.= "ramdisk     = '$initrd'";
+    $OUT.= "ramdisk     = '$initrd'\n";
   }
 }
-{
-  if ( $pygrub )
+{ if ( $bootloader )
   {
-    $OUT .= "bootloader = '/usr/bin/pygrub'\n";
+    $OUT .= "bootloader = '$bootloader'\n";
   }
 }
 memory      = '{$memory}'
@@ -27,55 +26,28 @@ memory      = '{$memory}'
 #
 #  Disk device(s).
 #
-{
-  if ( !defined($image_vbd ) )
+{ 
+  $ROOTDISKOUT = "";
+  for ( my $i = 0; $i <= $#PARTITIONS; $i++ )
   {
-    for ( my $i = $#PARTITIONS; $i >= 0 ; $i-- )
-    {
       if ( $PARTITIONS[$i]{'mountpoint'} eq '/' )
       {
+          $ROOTDISKOUT = "                  '$PARTITIONS[$i]{'imagetype'}$PARTITIONS[$i]{'image'},$device" . ( $i + 1 ) .",w',\n";
           $OUT .= "root        = '/dev/$device" . ($i + 1) . " ro'\n";
       }
-    }
-    $OUT .= "disk        = [\n";
-    for ( my $i = $#PARTITIONS; $i >= 0 ; $i-- )
-    {
-      $OUT .= "                  '$PARTITIONS[$i]{'imagetype'}$PARTITIONS[$i]{'image'},$device" . ( $i + 1 ) .",w',\n";
-    }
-    $OUT .= "              ]\n";
   }
+  $OUT .= "disk        = [\n";
+  $OUT .= $ROOTDISKOUT;
+  for ( my $i = 0; $i <= $#PARTITIONS; $i++ )
+  {
+      if ( $PARTITIONS[$i]{'mountpoint'} ne '/' )
+      {
+          $OUT .= "                  '$PARTITIONS[$i]{'imagetype'}$PARTITIONS[$i]{'image'},$device" . ( $i + 1 ) .",w',\n";
+      }
+  }
+  $OUT .= "              ]\n";
 }
 
-#
-#  Physical volumes
-#
-{
-    if ( ( $swap_vbd ) && ( $image_vbd ) )
-    {
-    $OUT .= "root  = '/dev/$device" . "2 ro'\n";
-
-    $OUT .= "disk  = [ ";
-
-    if ( $image_vbd )
-    {
-         $OUT .= "'$image_vbd," . $device . "2,w'";
-
-    }
-
-    if ( $swap_vbd )
-    {
-         if ( $image_vbd )
-         {
-            $OUT .= ",";
-         }
-
-         $OUT .= "'$swap_vbd," . $device . "1,w'";
-    }
-    $OUT .= " ]\n";
-    }
-}
-
-
 #
 #  Hostname
 #

data/lib/deprec.rb

@@ -39,4 +39,18 @@ Capistrano::Configuration.instance.deprec.namespaces.keys.each do |ns_name|
       end
     end
   end
-end
+  unless ns.respond_to?(:check_roles)
+    Capistrano::Configuration.instance.namespace :deprec do
+      namespace ns_name do
+        task :check_roles do
+          user_defined_roles = roles.keys
+          recipe_declared_roles = Capistrano::Configuration.instance.deprec.send(ns_name).tasks.collect { |k,v| v.options.has_key?(:roles) ? v.options[:roles] : nil }.compact.flatten.uniq
+          
+          missing_roles = recipe_declared_roles - user_defined_roles
+          
+          abort "You should define role(s): #{missing_roles.join(', ')}" unless missing_roles.empty?
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: le1t0-deprec
 version: !ruby/object:Gem::Version 
+  hash: 11
   prerelease: false
   segments: 
   - 2
   - 1
   - 6
-  - 57
-  version: 2.1.6.057
+  - 58
+  version: 2.1.6.058
 platform: ruby
 authors: 
 - Le1t0
@@ -15,16 +16,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-13 00:00:00 +02:00
+date: 2010-11-23 00:00:00 +01:00
 default_executable: depify
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: le1t0-capistrano
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 45
         segments: 
         - 2
         - 5
@@ -105,7 +108,7 @@ files:
 - lib/deprec/recipes/redis.rb
 - lib/deprec/recipes/ruby/mri.rb
 - lib/deprec/recipes/ruby/ree.rb
-- lib/deprec/recipes/rvm.rb
+- lib/deprec/recipes/ruby/rvm.rb
 - lib/deprec/recipes/s3utils.rb
 - lib/deprec/recipes/sphinx/thinking_sphinx.rb
 - lib/deprec/recipes/sphinx/ultrasphinx.rb
@@ -164,7 +167,6 @@ files:
 - lib/deprec/templates/integrity/apache_vhost.erb
 - lib/deprec/templates/integrity/config.ru.erb
 - lib/deprec/templates/integrity/config.yml.erb
-- lib/deprec/templates/iptables/firewall-default.erb
 - lib/deprec/templates/iptables/firewall-init.erb
 - lib/deprec/templates/keepalived/keepalived-init.erb
 - lib/deprec/templates/keepalived/keepalived.conf.erb
@@ -246,6 +248,7 @@ files:
 - lib/deprec/templates/trac/tracd-init.erb
 - lib/deprec/templates/trac/users.htdigest.erb
 - lib/deprec/templates/tsung/tsung.xml.erb
+- lib/deprec/templates/ubuntu/getlibs.erb
 - lib/deprec/templates/vnstat/config.php
 - lib/deprec/templates/wordpress/apache2_wordpress_vhost.conf.erb
 - lib/deprec/templates/wordpress/wp-config.php.erb
@@ -254,13 +257,11 @@ files:
 - lib/deprec/templates/xen/xend-config.sxp.erb
 - lib/deprec/templates/xen/xend-init.erb
 - lib/deprec/templates/xen/xendomains.erb
-- lib/deprec/templates/xentools/100-ubuntu-setup
-- lib/deprec/templates/xentools/15-disable-hwclock
-- lib/deprec/templates/xentools/30-disable-gettys
-- lib/deprec/templates/xentools/31-ubuntu-setup
-- lib/deprec/templates/xentools/40-setup-networking
-- lib/deprec/templates/xentools/98-custom
-- lib/deprec/templates/xentools/xen-tools.conf.erb
+- lib/deprec/templates/xentools/01-mount-devpts.erb
+- lib/deprec/templates/xentools/98-custom.erb
+- lib/deprec/templates/xentools/99-devpts-umount.erb
+- lib/deprec/templates/xentools/kernel-img.conf.example.erb
+- lib/deprec/templates/xentools/update-grub-xenu.example.erb
 - lib/deprec/templates/xentools/xm.tmpl.erb
 - lib/deprec.rb
 - lib/deprec_cmd_completion.sh
@@ -285,23 +286,27 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: deployment recipes for capistrano

data/lib/deprec/recipes/rvm.rb

@@ -1,32 +0,0 @@
-# Copyright 2010 by le1t0@github. All rights reserved.
-Capistrano::Configuration.instance(:must_exist).load do 
-  namespace :deprec do
-    namespace :rvm do
-      
-      set :rvm_rubies, %w(ruby-1.8.7-p160) # First ruby will be set as default if rvm_default_ruby is nil or empty
-      set :rvm_default_ruby, nil
-      
-      desc "Install Rvm"
-      task :install do
-        run <<-EOF
-        version=$(curl http://rvm.beginrescueend.com/releases/stable-version.txt) ;
-        mkdir -p ~/.rvm/src/ && curl -O http://rvm.beginrescueend.com/releases/rvm-${version}.tar.gz | tar zxf - && cd rvm-${version} && ./install
-        
-EOF
-      end
-      
-      desc "Install rubies"
-      task :install_rubies do
-        rvm_rubies.each_with_index do |ruby, i|
-          run "rvm install #{ruby}"
-          run "rvm --default #{ruby}" 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}"
-        end
-      end
-      
-    end
-  end
-end

data/lib/deprec/templates/iptables/firewall-default.erb

@@ -1,13 +0,0 @@
-# define tcp ports allowed for the world: "tcp:80,443"
-# define non-tcp/udp/icmp protocols allowed for the world: "pptp"
-# define tcp/udp ports allowed for specific networks/IPs: "tcp:389;udp:514@10.0.1.2,192.168.0.0/24 tcp,udp:22@192.168.0.3"
-# define non-tcp/udp/icmp protocols allowed for specific networks/IPs: "vrrp@192.168.0.0/24"
-# example: allowed="tcp:80,443 udp:138 pptp tcp:21,443@192.168.0.0/24 tcp:389;udp:514@10.0.1.2,10.0.1.5 vrrp@192.168.0.0/24 gre@10.0.1.2"
-allowed="<%= iptables_allowed %>"
-
-# example: forwards="192.168.0.1:8080>192.168.0.2:80;tcp 192.168.0.1:514>192.168.0.2:514;udp"
-forwards="<%= iptables_forwards %>"
-
-DRYRUN="NO" # Set to exactly YES to enable dry runs
-IPTABLES="<%= iptables_binary %>"
-IPTABLES_SAVE="<%= iptables_save_binary %>"

data/lib/deprec/templates/xentools/100-ubuntu-setup

@@ -1,26 +0,0 @@
-#!/bin/sh
-#
-#  This script setups the ubuntu guests up properly.
-#
-
-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
-
-chroot ${prefix} /usr/sbin/update-rc.d -f hwclock.sh remove
-chroot ${prefix} /usr/sbin/update-rc.d -f hwclockfirst.sh remove
-chroot ${prefix} rm -f /etc/udev/rules.d/85-hwclock.rules
-chroot ${prefix} ln -sf /bin/true /sbin/hwclock
-
-#
-#  Change first console setting to xvc0 upstart
-#
-echo "xvc0" >> ${prefix}/etc/securetty
-sed -i "s/tty1/xvc0/" ${prefix}/etc/event.d/tty1

data/lib/deprec/templates/xentools/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/xentools/30-disable-gettys

@@ -1,57 +0,0 @@
-#!/bin/sh
-#
-#  This script comments out all virtual terminals which aren't on the
-# first console - that must remain so that 'xm console ...' works
-# correctly.
-#
-
-
-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
-
-#
-#  Remove the links for upstart
-#
-rm ${prefix}/etc/event.d/tty[!1]
-
-
-#
-#  Are we using an alternative serial device?
-#
-if [ ! -z "${serial_device}" ]; then
-
-    serial_device=`basename ${serial_device}`
-
-    # Let the user know.
-    logMessage "Replacing default serial device (tty1) with ${serial_device}"
-
-	chroot ${prefix} mknod /dev/${serial_device} c 204 191
-
-    # replace existing device.
-    mv ${prefix}/etc/event.d/tty1  ${prefix}/etc/event.d/${serial_device}
-    sed -i -e s/tty1/${serial_device}/ ${prefix}/etc/event.d/${serial_device}
-
-    # make sure that it is allowed to login.
-    echo $serial_device >> ${prefix}/etc/securetty
-fi
-
-
-#
-#  Log our finish
-#
-logMessage Script $0 finished

data/lib/deprec/templates/xentools/31-ubuntu-setup

@@ -1,32 +0,0 @@
-#!/bin/sh
-#
-#  This script setups the ubuntu guests up properly.
-#
-
-
-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
-
-chroot ${prefix} /usr/sbin/update-rc.d -f hwclock.sh remove
-chroot ${prefix} /usr/sbin/update-rc.d -f hwclockfirst.sh remove
-chroot ${prefix} rm -f /etc/udev/rules.d/85-hwclock.rules
-chroot ${prefix} ln -sf /bin/true /sbin/hwclock
-chroot ${prefix} mknod /dev/xvda b 202 0
-chroot ${prefix} mknod /dev/xvdb b 202 16
-chroot ${prefix} mknod /dev/xvdc b 202 32
-chroot ${prefix} mknod /dev/xvdd b 202 48
-
-for i in 1 2 3 4 5 6 7 8 9; do 
-      chroot ${prefix} mknod /dev/xvda$i b 202 $i
-      chroot ${prefix} mknod /dev/xvdb$i b 202 $i
-      chroot ${prefix} mknod /dev/xvdc$i b 202 $i
-      chroot ${prefix} mknod /dev/xvdd$i b 202 $i
-done 

data/lib/deprec/templates/xentools/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