rubber 2.5.0 → 2.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eea69e220cb373705e078eaa52e02f5e90a170d6
-  data.tar.gz: ff4b8c6ed5e32ce6bbbcc40987e11cf675d83af8
+  metadata.gz: 874530599c3fb40c2fdc87aa3d34e0d1ecbad4f1
+  data.tar.gz: 8d8db84373a553fbf15318dda960aef4a9c45dae
 SHA512:
-  metadata.gz: 0402e07cef45eb6e2d109161e7fee64fd1cf81375b4be06a804462855b15828a5236b26aabf8f35863a7bfd69f828f40067c134f902e476327a0c3f36213de3a
-  data.tar.gz: 57b6878e9a38472c947019b9d8283a773b59bf082ea3529ffa80dfb13fd5cda5a2a3b85dc83fb3c35dc71af93bd81f321099be9431f84085cc11babd835083af
+  metadata.gz: cb872b9bb7e8a899c6f442db47a723d93e079155f63757a948e9cc8ab5060ff9fe853145f9970470a312f9da11b3263f1df16a094701d9f5d7d059f20fcbb0a8
+  data.tar.gz: b055e094a5e7077a16ce5626c5433ff70e16cea9cb16426c94f96cbcd17e7312e8bbc5fb4ad515d8888bce2cb71e9a2d834e72f46b4ad5bf624334d1e0474e8a

data/CHANGELOG

@@ -1,3 +1,26 @@
+2.5.1 (06/09/2013)
+-----------------
+
+New Features:
+============
+
+[browsermob_proxy] Added a BrowserMob Proxy template.
+[selenium_grid_hub] Added a Selenium Grid hub template.
+
+Improvements:
+============
+
+[graylog] Use JDK 7 instead of JDK 6.
+[jetty] Use JDK 7 instead of JDK 6.
+
+Bug Fixes:
+=========
+
+[core] Refresh already created instances in Vagrant so firewall rules are adjusted for any modified roles.
+[core] Better handling of serial_tasks when no instances have a defined role.
+[graylog] Fixed loading graylog-web in any environment other than "production."
+
+
 2.5.0 (06/03/2013)
 -----------------
 
@@ -5,6 +28,7 @@ New Features:
 ============
 
 [core] Added support for using Rubber as a Vagrant provisioner.  Now you can run Rubber easily against local VMs.
+[core] Don't pass nil SSH key file entries to Capistrano because it hides the error message and makes things really hard to track down.
 
 
 2.4.2 (06/01/2013)

data/lib/rubber/cloud/fog.rb

@@ -11,13 +11,13 @@ module Rubber
       def initialize(env, capistrano)
         super(env, capistrano)
 
-        compute_credentials = Rubber::Util.symbolize_keys(env.compute_credentials)
+        compute_credentials = Rubber::Util.symbolize_keys(env.compute_credentials) if env.compute_credentials
         storage_credentials = Rubber::Util.symbolize_keys(env.storage_credentials) if env.storage_credentials
 
-        @compute_provider = ::Fog::Compute.new(compute_credentials)
+        @compute_provider = compute_credentials ? ::Fog::Compute.new(compute_credentials) : nil
         @storage_provider = storage_credentials ? ::Fog::Storage.new(storage_credentials) : nil
       end
-      
+
       def storage(bucket)
         return Rubber::Cloud::FogStorage.new(@storage_provider, bucket)
       end

data/lib/rubber/cloud/generic.rb

@@ -1,23 +1,20 @@
-require 'fog'
+require 'rubber/cloud/fog'
 
 module Rubber
   module Cloud
-    class Generic < Base
+    class Generic < Fog
       MUTEX = Mutex.new
 
-      attr_reader :storage_provider
-
       def initialize(env, capistrano)
         # TODO (nirvdrum 05/23/13): This is here until the storage provider stuff is cleaned up.  That's why this class inherits from Base rather than Fog.
         if env.cloud_providers && env.cloud_providers.aws
           storage_credentials = {
-            :provider => 'AWS',
-            :aws_access_key_id => env.cloud_providers.aws.access_key,
-            :aws_secret_access_key => env.cloud_providers.aws.secret_access_key
+              :provider => 'AWS',
+              :aws_access_key_id => env.cloud_providers.aws.access_key,
+              :aws_secret_access_key => env.cloud_providers.aws.secret_access_key
           }
 
           env['storage_credentials'] = storage_credentials
-          @storage_provider = ::Fog::Storage.new(Rubber::Util.symbolize_keys(env.storage_credentials))
         end
 
         super(env, capistrano)

data/lib/rubber/cloud/vagrant.rb

@@ -36,6 +36,8 @@ module Rubber
           instance = {}
           instance[:id] = instance_id
           instance[:state] = state
+          instance[:external_ip] = capistrano.rubber.get_env('EXTERNAL_IP', "External IP address for host '#{instance_id}'", true)
+          instance[:internal_ip] = capistrano.rubber.get_env('INTERNAL_IP', "Internal IP address for host '#{instance_id}'", true, instance[:external_ip])
 
           [instance]
         end

data/lib/rubber/recipes/rubber/utils.rb

@@ -105,6 +105,8 @@ namespace :rubber do
       # have precedence, so the servers show up in that group
       added_servers = []
       serial_roles.each do |rolename|
+        next if servers[rolename].nil?
+
         servers[rolename] -= added_servers
         added_servers << servers[rolename]
         servers[rolename] = servers[rolename].uniq.sort

data/lib/rubber/vagrant/command.rb

@@ -0,0 +1,17 @@
+module VagrantPlugins
+  module Rubber
+    class Command < Vagrant.plugin("2", :command)
+
+      def execute
+        require 'rubber'
+        ::Rubber::initialize(Dir.pwd, 'vagrant')
+
+        require 'rubber/cli'
+        success = ::Rubber::CLI.run(Dir.pwd, @argv)
+
+        success ? 0 : 1
+      end
+
+    end
+  end
+end

data/lib/rubber/vagrant/config.rb

@@ -1,15 +1,17 @@
 module VagrantPlugins
   module Rubber
     class Config < Vagrant.plugin("2", :config)
-      attr_accessor :roles, :rubber_env
+      attr_accessor :roles, :rubber_env, :use_vagrant_ruby
 
       def initialize
         @roles = UNSET_VALUE
         @rubber_env = UNSET_VALUE
+        @use_vagrant_ruby = UNSET_VALUE
       end
 
       def finalize!
         @rubber_env = 'vagrant' if @rubber_env == UNSET_VALUE
+        @use_vagrant_ruby = true if @use_vagrant_ruby == UNSET_VALUE
 
         ::Rubber::initialize(Dir.pwd, @rubber_env)
 
@@ -21,6 +23,10 @@ module VagrantPlugins
           return { 'rubber' => ['rubber_env must be set to the Rubber environment to use for this cluster'] }
         end
 
+        unless [true, false].include?(@use_vagrant_ruby)
+          return { 'rubber' => ['use_vagrant_ruby must be set to a Boolean value'] }
+        end
+
         if @roles.nil?
           return { 'rubber' => ['roles must be set to a list of roles to use for this machine'] }
         end

data/lib/rubber/vagrant/plugin.rb

@@ -4,6 +4,11 @@ module VagrantPlugins
       name 'rubber'
       description 'Provides support for provisioning your virtual machines with Rubber.'
 
+      command(:rubber) do
+        require File.expand_path('../command', __FILE__)
+        Command
+      end
+
       config(:rubber, :provisioner) do
         require File.expand_path('../config', __FILE__)
         Config

data/lib/rubber/vagrant/provisioner.rb

@@ -19,41 +19,73 @@ module VagrantPlugins
       def provision
         @ssh_info = machine.ssh_info
 
-        create
+        create || refresh
         bootstrap && deploy_migrations
       end
 
       private
 
       def create
-        script = <<-ENDSCRIPT
-          unset GEM_HOME;
-          unset GEM_PATH;
-          PATH=#{ENV['PATH'].split(':')[1..-1].join(':')} RUN_FROM_VAGRANT=true RUBBER_ENV=#{config.rubber_env} ALIAS=#{machine.name} ROLES='#{config.roles}' EXTERNAL_IP=#{private_ip} INTERNAL_IP=#{private_ip} RUBBER_SSH_KEY=#{ssh_info[:private_key_path]} bash -c 'bundle exec cap rubber:create -S initial_ssh_user=#{ssh_info[:username]}'
-        ENDSCRIPT
+        if config.use_vagrant_ruby
+          script = "RUN_FROM_VAGRANT=true RUBBER_ENV=#{config.rubber_env} ALIAS=#{machine.name} ROLES='#{config.roles}' EXTERNAL_IP=#{private_ip} INTERNAL_IP=#{private_ip} RUBBER_SSH_KEY=#{ssh_info[:private_key_path]} #{internal_cap_command} rubber:create -S initial_ssh_user=#{ssh_info[:username]}"
+        else
+          script = <<-ENDSCRIPT
+            unset GEM_HOME;
+            unset GEM_PATH;
+            PATH=#{ENV['PATH'].split(':')[1..-1].join(':')} RUN_FROM_VAGRANT=true RUBBER_ENV=#{config.rubber_env} ALIAS=#{machine.name} ROLES='#{config.roles}' EXTERNAL_IP=#{private_ip} INTERNAL_IP=#{private_ip} RUBBER_SSH_KEY=#{ssh_info[:private_key_path]} bash -c 'bundle exec cap rubber:create -S initial_ssh_user=#{ssh_info[:username]}'
+          ENDSCRIPT
+        end
+
+        puts script
+
+        system(script)
+      end
+
+      def refresh
+        if config.use_vagrant_ruby
+          script = "RUN_FROM_VAGRANT=true RUBBER_ENV=#{config.rubber_env} RUBBER_SSH_KEY=#{ssh_info[:private_key_path]} ALIAS=#{machine.name} EXTERNAL_IP=#{private_ip} INTERNAL_IP=#{private_ip} #{internal_cap_command} rubber:refresh -S initial_ssh_user=#{ssh_info[:username]}"
+        else
+          script = <<-ENDSCRIPT
+            unset GEM_HOME;
+            unset GEM_PATH;
+            PATH=#{ENV['PATH'].split(':')[1..-1].join(':')} RUN_FROM_VAGRANT=true RUBBER_ENV=#{config.rubber_env} RUBBER_SSH_KEY=#{ssh_info[:private_key_path]} ALIAS=#{machine.name} EXTERNAL_IP=#{private_ip} INTERNAL_IP=#{private_ip} bash -c 'bundle exec cap rubber:refresh -S initial_ssh_user=#{ssh_info[:username]}'
+          ENDSCRIPT
+        end
 
         system(script)
       end
 
       def bootstrap
-        script = <<-ENDSCRIPT
-          unset GEM_HOME;
-          unset GEM_PATH;
-          PATH=#{ENV['PATH'].split(':')[1..-1].join(':')} RUN_FROM_VAGRANT=true RUBBER_ENV=#{config.rubber_env} RUBBER_SSH_KEY=#{ssh_info[:private_key_path]} FILTER=#{machine.name} bash -c 'bundle exec cap rubber:bootstrap'
-        ENDSCRIPT
+        if config.use_vagrant_ruby
+          script = "RUN_FROM_VAGRANT=true RUBBER_ENV=#{config.rubber_env} RUBBER_SSH_KEY=#{ssh_info[:private_key_path]} FILTER=#{machine.name} #{internal_cap_command} rubber:bootstrap"
+        else
+          script = <<-ENDSCRIPT
+            unset GEM_HOME;
+            unset GEM_PATH;
+            PATH=#{ENV['PATH'].split(':')[1..-1].join(':')} RUN_FROM_VAGRANT=true RUBBER_ENV=#{config.rubber_env} RUBBER_SSH_KEY=#{ssh_info[:private_key_path]} FILTER=#{machine.name} bash -c 'bundle exec cap rubber:bootstrap'
+          ENDSCRIPT
+        end
 
         system(script)
       end
 
       def deploy_migrations
-        script = <<-ENDSCRIPT
-          unset GEM_HOME;
-          unset GEM_PATH;
-          PATH=#{ENV['PATH'].split(':')[1..-1].join(':')} RUN_FROM_VAGRANT=true RUBBER_ENV=#{config.rubber_env} RUBBER_SSH_KEY=#{ssh_info[:private_key_path]} FILTER=#{machine.name} bash -c 'bundle exec cap deploy:migrations'
-        ENDSCRIPT
+        if config.use_vagrant_ruby
+          script = "RUN_FROM_VAGRANT=true RUBBER_ENV=#{config.rubber_env} RUBBER_SSH_KEY=#{ssh_info[:private_key_path]} FILTER=#{machine.name} #{internal_cap_command} deploy:migrations"
+        else
+          script = <<-ENDSCRIPT
+            unset GEM_HOME;
+            unset GEM_PATH;
+            PATH=#{ENV['PATH'].split(':')[1..-1].join(':')} RUN_FROM_VAGRANT=true RUBBER_ENV=#{config.rubber_env} RUBBER_SSH_KEY=#{ssh_info[:private_key_path]} FILTER=#{machine.name} bash -c 'bundle exec cap deploy:migrations'
+          ENDSCRIPT
+        end
 
         system(script)
       end
+
+      def internal_cap_command
+        "ruby -e \"require 'capistrano/cli'; Capistrano::CLI.execute\""
+      end
     end
   end
 end

data/lib/rubber/version.rb

@@ -1,3 +1,3 @@
 module Rubber
-  VERSION = "2.5.0"
+  VERSION = "2.5.1"
 end

data/templates/browsermob_proxy/config/rubber/deploy-browsermob_proxy.rb

@@ -0,0 +1,63 @@
+namespace :rubber do
+
+  namespace :browsermob_proxy do
+
+    rubber.allow_optional_tasks(self)
+
+    after "rubber:install_packages", "rubber:browsermob_proxy:install"
+
+    task :install, :roles => :browsermob_proxy do
+      rubber.sudo_script 'install_browsermob_proxy', <<-ENDSCRIPT
+      # Create the log directory if necessary.
+      if [[ ! -d #{rubber_env.browsermob_proxy_log_dir} ]]; then
+        mkdir -p #{rubber_env.browsermob_proxy_log_dir}
+        chown app:app #{rubber_env.browsermob_proxy_log_dir}
+      fi      
+
+      if [[ ! -d #{rubber_env.browsermob_proxy_dir} ]]; then
+        cd /tmp
+        wget -q https://s3-us-west-1.amazonaws.com/lightbody-bmp/browsermob-proxy-#{rubber_env.browsermob_proxy_version}-bin.zip
+        unzip browsermob-proxy-#{rubber_env.browsermob_proxy_version}-bin.zip
+
+        mv browsermob-proxy-#{rubber_env.browsermob_proxy_version} #{rubber_env.browsermob_proxy_dir}
+        chmod +x #{rubber_env.browsermob_proxy_dir}/bin/browsermob-proxy
+
+        rm browsermob-proxy-#{rubber_env.browsermob_proxy_version}-bin.zip
+      fi
+      ENDSCRIPT
+    end
+
+    after "rubber:bootstrap", "rubber:browsermob_proxy:bootstrap"
+
+    task :bootstrap, :roles => :browsermob_proxy do
+      # After everything installed on machines, we need the source tree
+      # on hosts in order to run rubber:config for bootstrapping the db
+      rubber.update_code_for_bootstrap
+
+      # Gen just the conf for cassandra
+      rubber.run_config(:file => "role/browsermob_proxy", :force => true, :deploy_path => release_path)
+    end
+
+    after "rubber:setup_app_permissions", "rubber:browsermob_proxy:setup_permissions"
+
+    task :setup_permissions, :roles => :browsermob_proxy do
+      rsudo "chown -R #{rubber_env.app_user}:#{rubber_env.app_user} #{rubber_env.browsermob_proxy_dir}"
+    end
+
+    task :restart, :roles => :browsermob_proxy do
+      stop
+      start
+    end
+
+    task :stop, :roles => :browsermob_proxy, :on_error => :continue do
+      rsudo "cat #{rubber_env.browsermob_proxy_dir}/browsermob_proxy.pid | xargs kill; exit 0"
+    end
+
+    task :start, :roles => :browsermob_proxy do
+      rsudo "#{rubber_env.browsermob_proxy_dir}/startup.sh"
+    end
+
+    after "rubber:create", "rubber:setup_dns_records"
+  end
+
+end

data/templates/browsermob_proxy/config/rubber/role/browsermob_proxy/crontab

@@ -0,0 +1,8 @@
+<%
+  @read_cmd = 'crontab -l'
+  @write_cmd = 'crontab -'
+  @additive = ["# rubber-selenium-grid-hub-start", "# rubber-selenium-grid-hub-end"]
+%>
+
+# Rotate the BrowserMob Proxy logs at 2 AM.
+0 2 * * * <%= Rubber.root %>/script/rubber cron --task util:rotate_logs --directory=<%= rubber_env.browsermob_proxy_log_dir %>

data/templates/browsermob_proxy/config/rubber/role/browsermob_proxy/monit-browsermob_proxy.conf

@@ -0,0 +1,15 @@
+<%
+  @path = '/etc/monit/monit.d/monit-browsermob_proxy.conf'
+%>
+
+<%
+  start_program = "/bin/bash -l -c '#{rubber_env.browsermob_proxy_dir}/startup.sh'"
+  stop_program  = "/bin/bash -l -c 'cat #{rubber_env.browsermob_proxy_dir}/browsermob_proxy.pid | xargs kill; exit 0'"
+%>
+
+check process browsermob_proxy with pidfile <%= rubber_env.browsermob_proxy_dir %>/browsermob_proxy.pid
+  group browsermob_proxy
+  start program = "<%= start_program %>"
+  stop program = "<%= stop_program %>"
+
+  if totalmem > <%= rubber_env.browsermob_proxy_max_heap_in_mb.to_i + rubber_env.browsermob_proxy_permgen_in_mb.to_i %>.0 MB for 5 cycles then restart

data/templates/browsermob_proxy/config/rubber/role/browsermob_proxy/startup.sh

@@ -0,0 +1,21 @@
+<%
+  @path = "#{rubber_env.browsermob_proxy_dir}/startup.sh"
+  @perms = 0755
+
+  proxy_server = rubber_instances.for_role("caching_proxy").first
+
+  args = []
+  args << '-Xms256m'
+  args << "-Xmx#{rubber_env.browsermob_proxy_max_heap_in_mb}m"
+  args << "-XX:MaxPermSize=#{rubber_env.browsermob_proxy_permgen_in_mb}m"
+  args << '-Djsse.enableSNIExtension=false'
+
+  if proxy_server
+    args << "-Dhttp.proxyHost=#{proxy_server.internal_ip}"
+    args << "-Dhttp.proxyPort=#{rubber_env.caching_proxy_port}"
+  end
+%>
+#!/bin/bash
+
+ulimit -n 65536
+JAVA_OPTS="<%= args.join(' ') %>" nohup <%= rubber_env.browsermob_proxy_dir %>/bin/browsermob-proxy --port <%= rubber_env.browsermob_proxy_port %> >> <%= rubber_env.browsermob_proxy_log_dir %>/browsermob_proxy.log 2>&1 & echo $! > <%= rubber_env.browsermob_proxy_dir %>/browsermob_proxy.pid

data/templates/browsermob_proxy/config/rubber/rubber-browsermob_proxy.yml

@@ -0,0 +1,10 @@
+browsermob_proxy_version: 2.0-beta-8
+browsermob_proxy_dir: /opt/browsermob_proxy
+browsermob_proxy_log_dir: /mnt/browsermob_proxy/log
+browsermob_proxy_port: 8020
+browsermob_proxy_max_heap_in_mb: 768
+browsermob_proxy_permgen_in_mb: 256
+
+roles:
+  browsermob_proxy:
+    packages: [openjdk-7-jdk]

data/templates/browsermob_proxy/templates.yml

@@ -0,0 +1 @@
+description: The BrowserMob Proxy HTTP proxy and traffic monitoring & manipulation system

data/templates/graylog/config/rubber/role/graylog_web/graylog_web-upstart.conf

@@ -9,7 +9,7 @@ stop on runlevel [016]
 
 script
   cd <%= rubber_env.graylog_web_dir %>
-  exec bash -l -c "bundle exec puma -p <%= rubber_env.graylog_web_port %> <%= rubber_env.graylog_web_dir %>/config.ru"
+  exec bash -l -c "RAILS_ENV=production bundle exec puma -p <%= rubber_env.graylog_web_port %> <%= rubber_env.graylog_web_dir %>/config.ru"
 end script
 
 post-start script

data/templates/graylog/config/rubber/rubber-graylog.yml

@@ -34,7 +34,7 @@ role_dependencies:
 
 roles:
   graylog_server:
-    packages: [openjdk-6-jdk, mongodb-10gen]
+    packages: [openjdk-7-jdk, mongodb-10gen]
   graylog_web:
     packages: [libcurl4-openssl-dev]
     gems: [puma]

data/templates/graylog/templates.yml

@@ -2,4 +2,3 @@ description: The graylog log aggregation and search module
 dependent_templates:
   - mongodb
   - elasticsearch
-  

data/templates/jetty/config/rubber/rubber-jetty.yml

@@ -7,4 +7,4 @@ jetty_jvm_options: -XX:MaxPermSize=128m
 
 roles:
   jetty:
-    packages: [openjdk-6-jdk]
+    packages: [openjdk-7-jdk]

data/templates/redis/config/rubber/deploy-redis.rb

@@ -46,7 +46,7 @@ namespace :rubber do
         # on hosts in order to run rubber:config for bootstrapping the db
         rubber.update_code_for_bootstrap
   
-        # Gen just the conf for cassandra
+        # Gen just the conf for redis.
         rubber.run_config(:file => "role/redis/", :force => true, :deploy_path => release_path)
       
         restart

data/templates/selenium_grid_hub/config/rubber/deploy-selenium-grid-hub.rb

@@ -0,0 +1,66 @@
+namespace :rubber do
+
+  namespace :selenium_grid do
+
+    rubber.allow_optional_tasks(self)
+
+    namespace :hub do
+      rubber.allow_optional_tasks(self)
+
+      after "rubber:install_packages", "rubber:selenium_grid:hub:install"
+
+      task :install, :roles => :selenium_grid_hub do
+        rubber.sudo_script 'install_selenium_grid_hub', <<-ENDSCRIPT
+        # Create the log directory if necessary.
+        if [[ ! -d #{rubber_env.selenium_grid_hub_log_dir} ]]; then
+          mkdir -p #{rubber_env.selenium_grid_hub_log_dir}
+          chown app:app #{rubber_env.selenium_grid_hub_log_dir}
+        fi
+
+        if [[ ! -d #{rubber_env.selenium_grid_hub_dir} ]]; then
+          mkdir -p #{rubber_env.selenium_grid_hub_dir}
+          chown app:app #{rubber_env.selenium_grid_hub_dir}
+        fi
+
+        # Fetch the Selenium Grid 2 JARs.
+        wget -q https://selenium.googlecode.com/files/selenium-server-standalone-#{rubber_env.selenium_grid_hub_version}.jar -O #{rubber_env.selenium_grid_hub_dir}/selenium-server-standalone-#{rubber_env.selenium_grid_hub_version}.jar
+
+        # Fetch the Graylog2 logging JARs.
+        wget -q http://files-staging.mogotest.com.s3.amazonaws.com/gelfj-1.0.jar -O #{rubber_env.selenium_grid_hub_dir}/gelfj.jar
+        wget -q http://files-staging.mogotest.com.s3.amazonaws.com/json-simple-1.1.jar -O #{rubber_env.selenium_grid_hub_dir}/json-simple.jar
+        ENDSCRIPT
+      end
+
+      after "rubber:bootstrap", "rubber:selenium_grid:hub:bootstrap"
+
+      task :bootstrap, :roles => :selenium_grid_hub do
+        # After everything installed on machines, we need the source tree
+        # on hosts in order to run rubber:config for bootstrapping the db
+        rubber.update_code_for_bootstrap
+
+        # Gen just the conf for cassandra
+        rubber.run_config(:file => "role/selenium_grid_hub", :force => true, :deploy_path => release_path)
+      end
+
+      after "rubber:setup_app_permissions", "rubber:selenium_grid:hub:setup_permissions"
+
+      task :setup_permissions, :roles => :selenium_grid_hub do
+        rsudo "chown -R #{rubber_env.app_user}:#{rubber_env.app_user} #{rubber_env.selenium_grid_hub_dir}"
+      end
+
+      task :restart, :roles => :selenium_grid_hub do
+        stop
+        start
+      end
+
+      task :stop, :roles => :selenium_grid_hub, :on_error => :continue do
+        rsudo "cat #{rubber_env.selenium_grid_hub_dir}/hub.pid | xargs kill; exit 0"
+      end
+
+      task :start, :roles => :selenium_grid_hub do
+        rsudo "#{rubber_env.selenium_grid_hub_dir}/startup.sh"
+      end
+    end
+
+  end
+end

data/templates/selenium_grid_hub/config/rubber/role/selenium_grid_hub/crontab

@@ -0,0 +1,8 @@
+<%
+  @read_cmd = 'crontab -l'
+  @write_cmd = 'crontab -'
+  @additive = ["# rubber-selenium-grid-hub-start", "# rubber-selenium-grid-hub-end"]
+%>
+
+# Rotate the Selenium Grid hub logs at 1 AM.
+0 1 * * * <%= Rubber.root %>/script/rubber cron --task util:rotate_logs --directory=<%= rubber_env.selenium_grid_hub_log_dir %>

data/templates/selenium_grid_hub/config/rubber/role/selenium_grid_hub/logging.properties.conf

@@ -0,0 +1,15 @@
+<%
+  @path = "#{rubber_env.selenium_grid_hub_dir}/logging.properties"
+  graylog_server = rubber_instances.for_role("graylog_server").first
+%>
+handlers = org.graylog2.logging.GelfHandler
+
+.level = ALL
+
+<% if graylog_server %>
+org.graylog2.logging.GelfHandler.graylogHost = <%= graylog_server.full_name %>
+org.graylog2.logging.GelfHandler.graylogPort = <%= rubber_env.graylog_server_port %>
+org.graylog2.logging.GelfHandler.originHost = <%= rubber_env.host %>
+org.graylog2.logging.GelfHandler.extractStacktrace = true
+org.graylog2.logging.GelfHandler.facility = selenium
+<% end %>

data/templates/selenium_grid_hub/config/rubber/role/selenium_grid_hub/monit-selenium_grid_hub.conf

@@ -0,0 +1,15 @@
+<%
+  @path = '/etc/monit/monit.d/monit-selenium_grid_hub.conf'
+%>
+
+<%
+  start_program = "/bin/bash -l -c '#{rubber_env.selenium_grid_hub_dir}/startup.sh'"
+  stop_program  = "/bin/bash -l -c 'cat #{rubber_env.selenium_grid_hub_dir}/hub.pid | xargs kill; exit 0'"
+%>
+
+check process selenium_grid_hub with pidfile <%= rubber_env.selenium_grid_hub_dir %>/hub.pid
+  group selenium_grid_hub
+  start program = "<%= start_program %>"
+  stop program = "<%= stop_program %>"
+
+  if totalmem > <%= rubber_env.selenium_grid_hub_max_heap_in_mb.to_i + rubber_env.selenium_grid_hub_permgen_in_mb.to_i %>.0 MB for 5 cycles then restart

data/templates/selenium_grid_hub/config/rubber/role/selenium_grid_hub/startup.sh

@@ -0,0 +1,23 @@
+<%
+  @path = "#{rubber_env.selenium_grid_hub_dir}/startup.sh"
+  @perms = 0755
+
+  args = []
+  args << '-Xms256m'
+  args << "-Xmx#{rubber_env.selenium_grid_hub_max_heap_in_mb}m"
+  args << '-XX:MaxPermSize=#{rubber_env.selenium_grid_hub_permgen_in_mb}m'
+  args << '-server'
+  args << '-Xdebug'
+  args << '-Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005'
+  args << "-cp #{rubber_env.selenium_grid_hub_dir}/selenium-server-standalone-#{rubber_env.selenium_grid_hub_version}.jar:#{rubber_env.selenium_grid_hub_dir}/json-simple.jar:#{rubber_env.selenium_grid_hub_dir}/gelfj.jar"
+  args << "-Djava.util.logging.config.file=#{rubber_env.selenium_grid_hub_dir}/logging.properties"
+  args << "org.openqa.grid.selenium.GridLauncher"
+  args << "-role hub"
+  args << "-throwOnCapabilityNotPresent false"
+  args << "-browserTimeout 60"
+  args << "-log #{rubber_env.selenium_grid_hub_log_dir}/hub.log"
+%>
+#!/bin/bash
+
+ulimit -n 65536
+nohup java <%= args.join(' ') %> >> <%= rubber_env.selenium_grid_hub_log_dir %>/hub.log 2>&1 & echo $! > <%= rubber_env.selenium_grid_hub_dir %>/hub.pid

data/templates/selenium_grid_hub/config/rubber/rubber-selenium-grid-hub.yml

@@ -0,0 +1,15 @@
+selenium_grid_hub_version: 2.33.0
+selenium_grid_hub_log_dir: /mnt/selenium_grid_hub/log
+selenium_grid_hub_dir: /opt/selenium_grid_hub
+selenium_grid_hub_max_heap_in_mb: 768
+selenium_grid_hub_permgen_in_mb: 256
+
+roles:
+  selenium_grid_hub:
+    packages: [openjdk-7-jdk]
+
+web_tools_proxies:
+  hub:
+    role: selenium_grid_hub
+    port: 4444
+    path: /

data/templates/selenium_grid_hub/templates.yml

@@ -0,0 +1 @@
+description: The Selenium Grid hub for the Selenium browser automation system

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubber
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.5.1
 platform: ruby
 authors:
 - Matt Conway
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-03 00:00:00.000000000 Z
+date: 2013-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -247,6 +247,7 @@ files:
 - lib/rubber/tag.rb
 - lib/rubber/thread_safe_proxy.rb
 - lib/rubber/util.rb
+- lib/rubber/vagrant/command.rb
 - lib/rubber/vagrant/config.rb
 - lib/rubber/vagrant/plugin.rb
 - lib/rubber/vagrant/provisioner.rb
@@ -282,6 +283,12 @@ files:
 - templates/base/script/rubber
 - templates/base/templates.rb
 - templates/base/templates.yml
+- templates/browsermob_proxy/config/rubber/deploy-browsermob_proxy.rb
+- templates/browsermob_proxy/config/rubber/role/browsermob_proxy/crontab
+- templates/browsermob_proxy/config/rubber/role/browsermob_proxy/monit-browsermob_proxy.conf
+- templates/browsermob_proxy/config/rubber/role/browsermob_proxy/startup.sh
+- templates/browsermob_proxy/config/rubber/rubber-browsermob_proxy.yml
+- templates/browsermob_proxy/templates.yml
 - templates/cassandra/config/rubber/deploy-cassandra.rb
 - templates/cassandra/config/rubber/role/cassandra/0-collectd-rsyslog-filter.conf
 - templates/cassandra/config/rubber/role/cassandra/cassandra.in.sh
@@ -563,6 +570,13 @@ files:
 - templates/resque_scheduler/lib/tasks/resque-scheduler.rake
 - templates/resque_scheduler/templates.rb
 - templates/resque_scheduler/templates.yml
+- templates/selenium_grid_hub/config/rubber/deploy-selenium-grid-hub.rb
+- templates/selenium_grid_hub/config/rubber/role/selenium_grid_hub/crontab
+- templates/selenium_grid_hub/config/rubber/role/selenium_grid_hub/logging.properties.conf
+- templates/selenium_grid_hub/config/rubber/role/selenium_grid_hub/monit-selenium_grid_hub.conf
+- templates/selenium_grid_hub/config/rubber/role/selenium_grid_hub/startup.sh
+- templates/selenium_grid_hub/config/rubber/rubber-selenium-grid-hub.yml
+- templates/selenium_grid_hub/templates.yml
 - templates/sidekiq/config/rubber/deploy-sidekiq.rb
 - templates/sidekiq/config/rubber/role/sidekiq/monit-sidekiq.conf
 - templates/sidekiq/config/rubber/rubber-sidekiq.yml