rubber 1.3.0 → 1.3.1

data/CHANGELOG

@@ -1,3 +1,44 @@
+1.3.0
+-----
+
+fix release process <4e1243b> [Matt Conway]
+more tests <6a70bb5> [Matt Conway]
+Merge branch 'master' into zerigo_api_1_1 <9d5fb10> [Matt Conway]
+Merge branch 'master' into canonical_ami <b40f95a> [Matt Conway]
+preserver backwards compatbility with sysklog in older ubuntu images <daf3283> [Matt Conway]
+Bump rubygems version. <60509fb> [Kevin Menard]
+Redis version bump. <89ca8ee> [Kevin Menard]
+Merge branch 'master' into canonical_ami <fc62f2e> [Matt Conway]
+ruby 1.9 fix for to_a (thanks to rlewis) <19fa3c1> [Matt Conway]
+Fixed compatibility issues with Ruby 1.9.x <d037136> [Matt Conway]
+Merge branch 'jrhicks/master' <b28fa6a> [Matt Conway]
+disable debian.cnf copy <fdbbf8c> [Matt Conway]
+prevent backups when generating apparmor config file <2cc50b6> [Matt Conway]
+cleanup remote ruby script execution <86da61e> [Matt Conway]
+fix force flag, add backup flag for disabling backups (e.g. in /etc/*.d directories) <9e749fd> [Matt Conway]
+prevent ubuntu 9.10 ec2-init script from changing hostname <739a495> [Matt Conway]
+fix monit config for new version in ubuntu 9.10 <6df5a33> [Matt Conway]
+move mysql reconfigure to common mysql bootstrap <4ce6255> [Matt Conway]
+fix mysql deploy for new ubuntu <7ef0ae7> [Matt Conway]
+Ubuntu using rsyslog now <904f225> [Matt Conway]
+update to latest rubygems <7722ba6> [Matt Conway]
+use sudo everywhere in case users don't want to run as root <8b19367> [Matt Conway]
+allow root login to canonical amis <d04b7f1> [Matt Conway]
+Switch to canonical AMIs <4cd540e> [Matt Conway]
+fix 404, use zone.id <2219de4> [Matt Conway]
+Merge branch 'zerigo_api_1_1' of github.com:wr0ngway/rubber into zerigo_api_1_1 <23f7b70> [Matt Conway]
+no need for customer id in new zerigo api <e91589a> [Matt Conway]
+using zerigo api v1.1 <1aecee3> [Matt Conway]
+no need for customer id in new zerigo api <45c4258> [Matt Conway]
+using zerigo api v1.1 <8784286> [Matt Conway]
+Only proxy app roles since mongrel may be used by non-app roles. <3dd218d> [Kevin Menard]
+Only proxy app roles since passenger may be used for non-app roles, too. <13a7f49> [Kevin Menard]
+Add capistrano task to move data from deploy client to production server.  cap rubber:mysql:local_to_ec2 <628920d> [Jeffrey Hicks]
+Added mysql cap commands rubber:mysql:backup and rubber:mysql:restore_s3 <2f3c535> [Jeffrey Hicks]
+Added mysql client headers to mysql package to allow compilation of mysql <89c5a38> [Jeffrey Hicks]
+Passenger bump. <d09934e> [Kevin Menard]
+Use full path to ruby in case munin's path doesn't work due to non-login shell. <c9ec151> [Kevin Menard]
+
 1.2.1
 -----
 

data/VERSION

@@ -1 +1 @@
-1.3.0
+1.3.1

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

@@ -29,7 +29,7 @@ namespace :rubber do
                 src="http://rubyforge.org/frs/download.php/68718/ruby-enterprise_#{ver}_i386.deb"
               fi
               src_file="${src##*/}"
-              wget -qP /tmp ${src}
+              wget -qNP /tmp ${src}
               dpkg -i /tmp/${src_file}
             fi
           ENDSCRIPT

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

@@ -140,7 +140,7 @@ ruby_prefix: "#{use_enterprise_ruby ? '/usr/local' : '/usr'}"
 # OPTIONAL: The packages to install on all instances
 # You can install a specific version of a package by using a sub-array of pkg, version
 # For example, packages: [[rake, 0.7.1], irb]
-packages: [postfix, build-essential, ruby-full, ruby1.8-dev, rake, irb, git-core]
+packages: [postfix, build-essential, ruby-full, ruby1.8-dev, rake, irb, git-core, ec2-ami-tools]
 
 # OPTIONAL: gem sources to setup for rubygems
 # gemsources: ["http://rubygems.org", "http://gems.github.com"]

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

@@ -10,7 +10,7 @@ namespace :rubber do
     task :custom_install, :roles => :jetty do
       rubber.sudo_script 'install_jetty', <<-ENDSCRIPT
         if [[ -z `ls #{rubber_env.jetty_prefix}/jetty-hightide-#{rubber_env.jetty_version} 2> /dev/null` ]]; then
-          wget -q http://dist.codehaus.org/jetty/jetty-hightide-7.0.0/jetty-hightide-#{rubber_env.jetty_version}.tar.gz
+          wget -qN http://dist.codehaus.org/jetty/jetty-hightide-7.0.0/jetty-hightide-#{rubber_env.jetty_version}.tar.gz
           tar -zxf jetty-hightide-#{rubber_env.jetty_version}.tar.gz
           
           # Install to appropriate location.

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

@@ -132,8 +132,8 @@ namespace :rubber do
     task :custom_install_munin, :roles => [:mysql_master, :mysql_slave] do
       rubber.sudo_script 'install_munin_mysql', <<-ENDSCRIPT
         if [ ! -f /usr/share/munin/plugins/mysql_ ]; then
-          wget -q -O /usr/share/munin/plugins/mysql_ http://github.com/kjellm/munin-mysql/raw/master/mysql_
-          wget -q -O /etc/munin/plugin-conf.d/mysql_.conf http://github.com/kjellm/munin-mysql/raw/master/mysql_.conf
+          wget -qN -O /usr/share/munin/plugins/mysql_ http://github.com/kjellm/munin-mysql/raw/master/mysql_
+          wget -qN -O /etc/munin/plugin-conf.d/mysql_.conf http://github.com/kjellm/munin-mysql/raw/master/mysql_.conf
         fi
       ENDSCRIPT
     end

data/generators/vulcanize/templates/passenger/config/rubber/role/passenger/passenger.conf

@@ -7,4 +7,29 @@ PassengerRoot <%= rubber_env.passenger_root %>
 PassengerRuby <%= rubber_env.passenger_ruby %>
 PassengerUseGlobalQueue on
 
+# max number of rails instances per appserver
 PassengerMaxPoolSize <%= rubber_env.max_app_connections %>
+
+# Use PassengerMaxPoolSize for limit as we only have 1 app
+PassengerMaxInstancesPerApp 0
+
+# For performances sake, never shutdown rails instances when idle
+PassengerPoolIdleTime 0
+
+# For performances sake, never shutdown a rails instance after N requests
+PassengerMaxRequests 0
+
+# Passenger checks stuff like restart.txt on every request when this is 0
+PassengerStatThrottleRate <%= RUBBER_ENV == 'production' ? '60' : '0' %>
+
+# Turning this on breaks mod_rewrite
+PassengerHighPerformance off
+
+# Cache framework code per application
+RailsSpawnMethod smart-lv2
+
+# For performances sake, don't ever unload framework spawner
+RailsFrameworkSpawnerIdleTime 0
+
+# For performances sake, don't ever unload app spawner
+RailsAppSpawnerIdleTime 0

data/lib/rubber/recipes/rubber/setup.rb

@@ -9,6 +9,7 @@ namespace :rubber do
   task :bootstrap do
     link_bash
     set_timezone
+    enable_multiverse
     upgrade_packages
     install_packages
     setup_volumes
@@ -196,7 +197,7 @@ namespace :rubber do
       # Setup hostname on instance so shell, etcs have nice display
       sudo "sh -c 'echo $CAPISTRANO:HOST$ > /etc/hostname && hostname $CAPISTRANO:HOST$'"
       # Newer ubuntus ec2-init script always resets hostname, so prevent it
-      sudo "sh -c 'echo compat=0 > /etc/ec2-init/is-compat-env'"
+      sudo "sh -c 'mkdir -p/etc/ec2-init && echo compat=0 > /etc/ec2-init/is-compat-env'"
     end
 
     # TODO
@@ -348,6 +349,18 @@ namespace :rubber do
     ENDSCRIPT
   end
   
+  desc <<-DESC
+    Enable the ubuntu multiverse source for getting packages like
+    ec2-ami-tools used for bundling images
+  DESC
+  task :enable_multiverse do
+    sudo_script 'enable_multiverse', <<-ENDSCRIPT
+      if ! grep -qc multiverse /etc/apt/sources.list /etc/apt/sources.list.d/* &> /dev/null; then
+        cat /etc/apt/sources.list | sed 's/main universe/multiverse/' > /etc/apt/sources.list.d/rubber-multiverse-source.list
+      fi
+    ENDSCRIPT
+  end
+  
   def update_dyndns(instance_item)
     env = rubber_cfg.environment.bind(instance_item.role_names, instance_item.name)
     if env.dns_provider
@@ -395,7 +408,7 @@ namespace :rubber do
           src="#{url_base}/#{name}_#{ver}_i386.deb"
         fi
         src_file="${src##*/}"
-        wget -qP /tmp ${src}
+        wget -qNP /tmp ${src}
         dpkg -i /tmp/${src_file}
       fi
     ENDSCRIPT

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 3
-  - 0
-  version: 1.3.0
+  - 1
+  version: 1.3.1
 platform: ruby
 authors: 
 - Matt Conway
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-05 00:00:00 -04:00
+date: 2010-04-12 00:00:00 -04:00
 default_executable: vulcanize
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -82,7 +82,7 @@ dependencies:
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: httparty
+  name: rails
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     requirements: 
@@ -93,18 +93,6 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: rails
-  prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id007
 description: The rubber plugin enables relatively complex multi-instance deployments of RubyOnRails applications to Amazon's Elastic Compute Cloud (EC2).  Like capistrano, rubber is role based, so you can define a set of configuration files for a role and then assign that role to as many concrete instances as needed. One can also assign multiple roles to a single instance. This lets one start out with a single ec2 instance (belonging to all roles), and add new instances into the mix as needed to scale specific facets of your deployment, e.g. adding in instances that serve only as an 'app' role to handle increased app server load.
 email: matt@conwaysplace.com
 executables: