rubber 1.8.0 → 1.9.0

data/CHANGELOG

@@ -1,3 +1,32 @@
+1.8.0
+-----
+
+Regenerate gemspec for version 1.8.0 <1a924f5> [Kevin Menard]
+Bumped the version of Passenger to 3.0.1. <c419f34> [Kevin Menard]
+Bumped the version of RVM. <52c9891> [Kevin Menard]
+Merge branch 'tags_support' <3396ceb> [Kevin Menard]
+Handle Amazon being slow to update. <e89a7ae> [Kevin Menard]
+Added a comment to help people that change their ServerName from the default. <71ce99a> [Kevin Menard]
+We need this perl package for the postgres munin plugins. <4ae9e6c> [Kevin Menard]
+We need a newer amazon-ec2 for tags support. <90b20ba> [Kevin Menard]
+Added support for creating and updating tags on EC2 instances. <d29eda9> [Kevin Menard]
+Merge branch 'master' of github.com:wr0ngway/rubber <5ca9ce0> [Kevin Menard]
+Fixed issue with RVM, ruby 1.9.2, and passenger munin plugins. <623400b> [Kevin Menard]
+Set up munin for PostgreSQL. <4f9874e> [Kevin Menard]
+Fixes for raiding ephemeral drives <7a0c0d2> [Matt Conway]
+Watch attachment status for more reliable ebs mounts <44ebdae> [Matt Conway]
+Updated config for PostgreSQL 9. <9ade749> [Kevin Menard]
+Don't show Passenger 3 friendly error pages in production. <126093a> [Kevin Menard]
+Updated config for redis 2.0. <f4ed84a> [Kevin Menard]
+Support installation of redis 2.0. <e340091> [Kevin Menard]
+Merge branch 'master' of https://github.com/caike/rubber <4269178> [Kevin Menard]
+Fixed bug with RVM ruby location and updated to the latest version. <bd8805b> [Kevin Menard]
+Improved passenger 3 setup. <b72c5c0> [Kevin Menard]
+Changes passenger generator to use version 3.0.0 and removes deprecated option. <b64f623> [Kristopher Murata]
+Skipping SSL certificate check on wget to github due to wget bug. More info: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=409938 <3d0562e> [caike souza]
+Merge branch 'master' of github.com:wr0ngway/rubber <48269b5> [Matt Conway]
+allow rubber:config in test as well as dev <8954cd6> [Matt Conway]
+
 1.7.2
 -----
 

data/VERSION

@@ -1 +1 @@
-1.8.0
+1.9.0

data/generators/vulcanize/templates/base/config/rubber/deploy-util.rb

@@ -59,7 +59,7 @@ namespace :rubber do
         # Use database.yml to get connection params
         db = YAML::load(ERB.new(IO.read(File.join(File.dirname(__FILE__), '..','database.yml'))).result)[RUBBER_ENV]
         user = db['username']
-        pass = db['passsword']
+        pass = db['password']
         pass = nil if pass and pass.strip.size == 0
         host = db['host']
         name = db['database']

data/generators/vulcanize/templates/base/config/rubber/rubber.yml

@@ -58,8 +58,8 @@ cloud_providers:
     #
     # NOTE: for some reason Capistrano requires you to have both the public and
     # the private key in the same folder, the public key should have the
-    # extension ".pub".  The easiest (only?) way to get your hand on this is to
-    # create an instance, ssh into it, and copy the file /mnt/openssh_id.pub
+    # extension ".pub".  The easiest way to get your hand on this is to create the
+    # public key from the private key: ssh-keygen -y -f gsg-keypair > gsg-keypair.pub
     #
     key_name: gsg-keypair
     key_file: "#{Dir[(File.expand_path('~') rescue '/root') + '/.ec2/*' + cloud_providers.aws.key_name].first}"

data/generators/vulcanize/templates/postgresql/config/rubber/deploy-postgresql.rb

@@ -7,7 +7,7 @@ namespace :rubber do
 
     before "rubber:install_packages", "rubber:postgresql:setup_apt_sources"
 
-    task :setup_apt_sources, :roles => :redis do
+    task :setup_apt_sources, :roles => [:postgresql_master, :postgresql_save] do
       rsudo "add-apt-repository ppa:pitti/postgresql"
     end
 

data/generators/vulcanize/templates/sphinx/config/rubber/deploy-sphinx.rb

@@ -17,7 +17,7 @@ namespace :rubber do
 
     task :custom_install, :roles => :sphinx do
       # install sphinx from source
-      ver = "0.9.8.1"
+      ver = "0.9.9"
       rubber.sudo_script 'install_sphinx', <<-ENDSCRIPT
         # check if already installed
         if [ -x /usr/local/bin/searchd ]
@@ -32,7 +32,7 @@ namespace :rubber do
         TMPDIR=`mktemp -d` || exit 1
         cd $TMPDIR
         echo 'Downloading'
-        wget -qN http://www.sphinxsearch.com/downloads/sphinx-#{ver}.tar.gz
+        wget -qN http://www.sphinxsearch.com/files/sphinx-#{ver}.tar.gz
         echo 'Unpacking'
         tar xf sphinx-#{ver}.tar.gz
         cd sphinx-#{ver}

data/lib/generators/vulcanize/templates/base/config/rubber/deploy-util.rb

@@ -59,7 +59,7 @@ namespace :rubber do
         # Use database.yml to get connection params
         db = YAML::load(ERB.new(IO.read(File.join(File.dirname(__FILE__), '..','database.yml'))).result)[RUBBER_ENV]
         user = db['username']
-        pass = db['passsword']
+        pass = db['password']
         pass = nil if pass and pass.strip.size == 0
         host = db['host']
         name = db['database']

data/lib/generators/vulcanize/templates/base/config/rubber/rubber.yml

@@ -58,8 +58,8 @@ cloud_providers:
     #
     # NOTE: for some reason Capistrano requires you to have both the public and
     # the private key in the same folder, the public key should have the
-    # extension ".pub".  The easiest (only?) way to get your hand on this is to
-    # create an instance, ssh into it, and copy the file /mnt/openssh_id.pub
+    # extension ".pub".  The easiest way to get your hand on this is to create the
+    # public key from the private key: ssh-keygen -y -f gsg-keypair > gsg-keypair.pub
     #
     key_name: gsg-keypair
     key_file: "#{Dir[(File.expand_path('~') rescue '/root') + '/.ec2/*' + cloud_providers.aws.key_name].first}"

data/lib/generators/vulcanize/templates/postgresql/config/rubber/deploy-postgresql.rb

@@ -7,7 +7,7 @@ namespace :rubber do
 
     before "rubber:install_packages", "rubber:postgresql:setup_apt_sources"
 
-    task :setup_apt_sources, :roles => :redis do
+    task :setup_apt_sources, :roles => [:postgresql_master, :postgresql_save] do
       rsudo "add-apt-repository ppa:pitti/postgresql"
     end
 

data/lib/generators/vulcanize/templates/sphinx/config/rubber/deploy-sphinx.rb

@@ -17,7 +17,7 @@ namespace :rubber do
 
     task :custom_install, :roles => :sphinx do
       # install sphinx from source
-      ver = "0.9.8.1"
+      ver = "0.9.9"
       rubber.sudo_script 'install_sphinx', <<-ENDSCRIPT
         # check if already installed
         if [ -x /usr/local/bin/searchd ]
@@ -32,7 +32,7 @@ namespace :rubber do
         TMPDIR=`mktemp -d` || exit 1
         cd $TMPDIR
         echo 'Downloading'
-        wget -qN http://www.sphinxsearch.com/downloads/sphinx-#{ver}.tar.gz
+        wget -qN http://www.sphinxsearch.com/files/sphinx-#{ver}.tar.gz
         echo 'Unpacking'
         tar xf sphinx-#{ver}.tar.gz
         cd sphinx-#{ver}

data/lib/rubber/environment.rb

@@ -32,7 +32,12 @@ module Rubber
       def read_config(file)
         Rubber.logger.debug{"Reading rubber configuration from #{file}"}
         if File.exist?(file)
-          @items = Environment.combine(@items, YAML.load_file(file) || {})
+          begin
+            @items = Environment.combine(@items, YAML.load_file(file) || {})
+          rescue Exception => e
+            Rubber.logger.error{"Unable to read rubber configuration from #{file}"}
+            raise
+          end
         end
       end
 

data/lib/rubber/recipes/rubber/volumes.rb

@@ -2,7 +2,7 @@ namespace :rubber do
 
   desc <<-DESC
     Sets up persistent volumes in the cloud
-    All volumes defined in rubber.yml will be created if neccessary, and attached/mounted on their associated instances
+    All volumes defined in rubber.yml will be created if necessary, and attached/mounted on their associated instances
   DESC
   required_task :setup_volumes do
     rubber_instances.filtered.each do |ic|
@@ -31,6 +31,11 @@ namespace :rubber do
         format = raid_spec['source_devices'].all? {|dev| created_vols.include?(dev)}
         setup_raid_volume(ic, raid_spec, format)
       end
+
+      lvm_volume_group_specs = env.lvm_volume_groups || []
+      lvm_volume_group_specs.each do |lvm_volume_group_spec|
+        setup_lvm_group(ic, lvm_volume_group_spec)
+      end
     end
   end
 
@@ -114,8 +119,8 @@ namespace :rubber do
               echo '#{vol_spec['device']} #{vol_spec['mount']} #{vol_spec['filesystem']} noatime 0 0 # rubber volume #{vol_id}' >> /etc/fstab
 
               #{('yes | mkfs -t ' + vol_spec['filesystem'] + ' ' + vol_spec['device']) if created}
-              mkdir -p '#{vol_spec['mount']}'
-              mount '#{vol_spec['mount']}'
+              #{("mkdir -p '#{vol_spec['mount']}'") if vol_spec['mount']}
+              #{("mount '#{vol_spec['mount']}'") if vol_spec['mount']}
             fi
           ENDSCRIPT
         end
@@ -195,7 +200,7 @@ namespace :rubber do
 
   def setup_raid_volume(ic, raid_spec, create=false)
     if create
-      mdadm_init = "yes | mdadm --create #{raid_spec['device']} --level #{raid_spec['raid_level']} --raid-devices #{raid_spec['source_devices'].size} #{raid_spec['source_devices'].sort.join(' ')}"
+      mdadm_init = "yes | mdadm --create #{raid_spec['device']} --metadata=1.1 --level #{raid_spec['raid_level']} --raid-devices #{raid_spec['source_devices'].size} #{raid_spec['source_devices'].sort.join(' ')}"
     else
       mdadm_init = "yes | mdadm --assemble #{raid_spec['device']} #{raid_spec['source_devices'].sort.join(' ')}"
     end
@@ -219,7 +224,8 @@ namespace :rubber do
           # set reconstruction speed
           echo $((30*1024)) > /proc/sys/dev/raid/speed_limit_min
 
-          echo 'DEVICE /dev/hd*[0-9] /dev/sd*[0-9]' > /etc/mdadm/mdadm.conf
+          echo 'MAILADDR #{rubber_env.admin_email}' > /etc/mdadm/mdadm.conf
+          echo 'DEVICE /dev/hd*[0-9] /dev/sd*[0-9]' >> /etc/mdadm/mdadm.conf
           mdadm --detail --scan >> /etc/mdadm/mdadm.conf
 
           mv /etc/rc.local /etc/rc.local.bak
@@ -235,6 +241,97 @@ namespace :rubber do
     _setup_raid_volume
   end
 
+  def setup_lvm_group(ic, lvm_volume_group_spec)
+    physical_volumes = lvm_volume_group_spec['physical_volumes'].kind_of?(Array) ? lvm_volume_group_spec['physical_volumes'] : [lvm_volume_group_spec['physical_volumes']]
+    volume_group_name = lvm_volume_group_spec['name']
+    extent_size = lvm_volume_group_spec['extent_size'] || 32
+
+    volumes = lvm_volume_group_spec['volumes'] || []
+
+    def create_logical_volume_in_bash(volume, volume_group_name)
+      device_name = "/dev/#{volume_group_name}/#{volume['name']}"
+
+      resize_command =
+          case volume['filesystem']
+            when 'xfs'
+              "xfs_growfs '#{volume['mount']}'"
+            when 'reiserfs'
+              "resize_reiserfs -f #{device_name}"
+            when 'jfs'
+              "mount -o remount,resize #{volume['mount']}"
+            when /^ext/
+              <<-RESIZE_COMMAND
+              umount #{device_name}
+              ext2resize #{device_name}
+              mount #{volume['mount']}
+              RESIZE_COMMAND
+            else
+              raise "Do not know how to resize filesystem '#{volume['filesystem']}'"
+          end
+
+      <<-ENDSCRIPT
+        # Add the logical volume mount point to /etc/fstab.
+        if ! grep -q '#{volume['mount']}' /etc/fstab; then
+          if mount | grep -q '#{volume['mount']}'; then
+            umount '#{volume['mount']}'
+          fi
+
+          mv /etc/fstab /etc/fstab.bak
+          cat /etc/fstab.bak | grep -v '#{volume['mount']}' > /etc/fstab
+          echo '#{device_name} #{volume['mount']} #{volume['filesystem']} noatime 0 0 # rubber LVM volume' >> /etc/fstab
+        fi
+
+        # Check if the logical volume exists or not.
+        if ! lvdisplay #{device_name} >> /dev/null 2>&1; then
+          # Create the logical volume.
+          lvcreate -L #{volume['size']}G -i #{volume['stripes'] || 1} -n#{volume['name']} #{volume_group_name}
+
+          # Format the logical volume.
+          yes | mkfs -t #{volume['filesystem']} #{volume['filesystem_opts']} #{device_name}
+
+          # Create the mount point.
+          mkdir -p '#{volume['mount']}'
+
+          # Mount the volume.
+          mount '#{volume['mount']}'
+        else
+          # Try to extend the volume size.
+          if lvextend -L #{volume['size']}G -i #{volume['stripes'] || 1} #{device_name} >> /dev/null 2&>1; then
+
+            # If we actually resized the volume, then we need to resize the filesystem.
+            #{resize_command}
+          fi
+        fi
+      ENDSCRIPT
+    end
+
+    task :_setup_lvm_group, :hosts => ic.external_ip do
+      rubber.sudo_script 'setup_lvm_group', <<-ENDSCRIPT
+        # Check and see if the physical volume is already set up for LVM. If not, initialize it to be so.
+        for device in #{physical_volumes.join(' ')}
+        do
+          if ! pvdisplay $device >> /dev/null 2>&1; then
+            pvcreate $device
+
+            # See if the volume group already exists. If so, add the new physical volume to it.
+            if vgdisplay #{volume_group_name} >> /dev/null 2>&1; then
+              vgextend #{volume_group_name} $device
+            fi
+          fi
+        done
+
+        # If the volume group does not exist yet, construct it with all the physical volumes.
+        if ! vgdisplay #{volume_group_name} >> /dev/null 2>&1; then
+          vgcreate #{volume_group_name} #{physical_volumes.join(' ')} -s #{extent_size}
+        fi
+
+        # Set up each of the logical volumes.
+        #{volumes.collect { |volume| create_logical_volume_in_bash(volume, volume_group_name) }.join("\n\n") }
+      ENDSCRIPT
+    end
+    _setup_lvm_group
+  end
+
   def destroy_volume(volume_id)
 
     logger.info "Detaching volume #{volume_id}"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rubber
 version: !ruby/object:Gem::Version 
-  hash: 55
+  hash: 51
   prerelease: false
   segments: 
   - 1
-  - 8
+  - 9
   - 0
-  version: 1.8.0
+  version: 1.9.0
 platform: ruby
 authors: 
 - Matt Conway
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-07 00:00:00 -05:00
+date: 2011-01-26 00:00:00 -05:00
 default_executable: vulcanize
 dependencies: 
 - !ruby/object:Gem::Dependency