rubber 1.12.2 → 1.13.0

data/CHANGELOG

@@ -1,3 +1,13 @@
+1.13.0
+-----
+
+Forgot target roles for start/stop/restart <9b916e8> [Alex Kremer]
+Fix enabling multiverse on newer canonical AMIs (ie Maverick) <dcf81fa> [Alex Kremer]
+Initial commit of MongoDB Template <c4f7640> [Alex Kremer]
+allow FORCE on destroy_all <0db9347> [Matt Conway]
+Removing a function that wasn't meant to be committed :( <8538041> [Jordan Brock]
+Added support for changing the region end point, using the EC2 gem "server" key. <326448f> [Jordan Brock]
+
 1.12.2
 -----
 

data/VERSION

@@ -1 +1 @@
-1.12.2
+1.13.0

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

@@ -48,6 +48,17 @@ domain: foo.com
 #
 cloud_providers:
   aws:
+    # REQUIRED The endpoint for the region server that you want to use.
+    # 
+    # Options include
+    # us-east-1.ec2.amazonaws.com
+    # eu-west-1.ec2.amazonaws.com
+    # ap-northeast-1.ec2.amazonaws.com
+    # ap-southeast-1.ec2.amazonaws.com
+    # ap-southeast-2.ec2.amazonaws.com
+    #
+    server_endpoint: us-east-1.ec2.amazonaws.com
+    
     # REQUIRED The amazon keys and account ID (digits only, no dashes) used to access the AWS API
     #
     access_key: XXX

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

@@ -0,0 +1,49 @@
+
+namespace :rubber do
+  
+  namespace :mongodb do
+    
+    rubber.allow_optional_tasks(self)
+    
+    before "rubber:install_packages", "rubber:mongodb:install"
+    after "rubber:install_packages", "rubber:mongodb:setup_paths"
+  
+    task :install, :roles => :mongodb do
+      # Setup apt sources to mongodb from 10gen
+      sources = <<-SOURCES
+        deb http://downloads-distro.mongodb.org/repo/ubuntu-upstart dist 10gen
+      SOURCES
+      sources.gsub!(/^ */, '')
+      put(sources, "/etc/apt/sources.list.d/mongodb.list") 
+      rsudo "apt-key adv --keyserver keyserver.ubuntu.com --recv 7F0CEB10"
+    end
+    
+    task :setup_paths, :roles => :mongodb do
+      rsudo "mkdir -p #{rubber_env.mongodb_data_dir}"
+      rsudo "chown -R mongodb:mongodb #{rubber_env.mongodb_data_dir}"
+    end
+    
+    desc <<-DESC
+      Starts the mongodb daemon
+    DESC
+    task :start, :roles => :mongodb do
+      rsudo "service mongodb start"
+    end
+    
+    desc <<-DESC
+      Stops the mongodb daemon
+    DESC
+    task :stop, :roles => :mongodb do
+      rsudo "service mongodb stop"
+    end
+    
+    desc <<-DESC
+      Restarts the mongodb daemon
+    DESC
+    task :restart, :roles => :mongodb do
+      rsudo "service mongodb restart"
+    end
+    
+  end
+
+end

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

@@ -0,0 +1,89 @@
+<%
+  @path = "/etc/mongodb.conf"
+  @post = "service mongodb restart"
+%>
+# mongodb.conf
+
+# Where to store the data.
+
+# Note: if you run mongodb as a non-root user (recommended) you may
+# need to create and set permissions for this directory manually,
+# e.g., if the parent directory isn't mutable by the mongodb user.
+dbpath=<%= rubber_env.mongodb_data_dir %>
+
+#where to log
+logpath=<%= rubber_env.mongodb_log %>
+
+logappend=true
+
+port = 27017
+
+# Enables periodic logging of CPU utilization and I/O wait
+#cpu = true
+
+# Turn on/off security.  Off is currently the default
+#noauth = true
+#auth = true
+
+# Verbose logging output.
+#verbose = true
+
+# Inspect all client data for validity on receipt (useful for
+# developing drivers)
+#objcheck = true
+
+# Enable db quota management
+#quota = true
+
+# Set oplogging level where n is
+#   0=off (default)
+#   1=W
+#   2=R
+#   3=both
+#   7=W+some reads
+#diaglog = 0
+# Diagnostic/debugging option
+#nocursors = true
+
+# Ignore query hints
+#nohints = true
+
+# Disable the HTTP interface (Defaults to localhost:27018).
+#nohttpinterface = true
+
+# Turns off server-side scripting.  This will result in greatly limited
+# functionality
+#noscripting = true
+
+# Turns off table scans.  Any query that would do a table scan fails.
+#notablescan = true
+
+# Disable data file preallocation.
+#noprealloc = true
+
+# Specify .ns file size for new databases.
+# nssize = <size>
+
+# Accout token for Mongo monitoring server.
+#mms-token = <token>
+
+# Server name for Mongo monitoring server.
+#mms-name = <server-name>
+
+# Ping interval for Mongo monitoring server.
+#mms-interval = <seconds>
+
+# Replication Options
+
+# in master/slave replicated mongo databases, specify here whether
+# this is a slave or master
+#slave = true
+#source = master.example.com
+# Slave only: specify a single database to replicate
+#only = master.example.com
+# or
+#master = true
+#source = slave.example.com
+
+# in replica set configuration, specify the name of the replica set
+# replSet = setname 

data/generators/vulcanize/templates/mongodb/config/rubber/role/mongodb/monit-mongodb.cnf

@@ -0,0 +1,10 @@
+<%
+  @path = '/etc/monit/monit.d/monit-mongodb.conf'
+%>
+
+check process mongodb with pidfile <%= rubber_env.mongodb_pid %>
+   group mongodb-<%= RUBBER_ENV %>
+   start program = "/usr/bin/env service mongodb start"
+   stop program = "/usr/bin/env service mongodb stop"
+   if failed port 27017 then restart
+   if 5 restarts within 5 cycles then timeout

data/generators/vulcanize/templates/mongodb/config/rubber/rubber-mongodb.yml

@@ -0,0 +1,8 @@
+mongodb_data_dir: /mnt/mongodb
+mongodb_log_dir: /var/log/mongodb
+mongodb_log: "#{mongodb_log_dir}/mongodb.log"
+mongodb_pid: "#{mongodb_data_dir}/mongod.lock"
+
+roles:
+  mongodb:
+    packages: [mongodb-10gen]

data/generators/vulcanize/templates/mongodb/templates.yml

@@ -0,0 +1,3 @@
+description: MongoDB module
+dependent_templates:
+  - base

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

@@ -48,6 +48,17 @@ domain: foo.com
 #
 cloud_providers:
   aws:
+    # REQUIRED The endpoint for the region server that you want to use.
+    # 
+    # Options include
+    # us-east-1.ec2.amazonaws.com
+    # eu-west-1.ec2.amazonaws.com
+    # ap-northeast-1.ec2.amazonaws.com
+    # ap-southeast-1.ec2.amazonaws.com
+    # ap-southeast-2.ec2.amazonaws.com
+    #
+    server_endpoint: us-east-1.ec2.amazonaws.com
+    
     # REQUIRED The amazon keys and account ID (digits only, no dashes) used to access the AWS API
     #
     access_key: XXX

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

@@ -0,0 +1,49 @@
+
+namespace :rubber do
+  
+  namespace :mongodb do
+    
+    rubber.allow_optional_tasks(self)
+    
+    before "rubber:install_packages", "rubber:mongodb:install"
+    after "rubber:install_packages", "rubber:mongodb:setup_paths"
+  
+    task :install, :roles => :mongodb do
+      # Setup apt sources to mongodb from 10gen
+      sources = <<-SOURCES
+        deb http://downloads-distro.mongodb.org/repo/ubuntu-upstart dist 10gen
+      SOURCES
+      sources.gsub!(/^ */, '')
+      put(sources, "/etc/apt/sources.list.d/mongodb.list") 
+      rsudo "apt-key adv --keyserver keyserver.ubuntu.com --recv 7F0CEB10"
+    end
+    
+    task :setup_paths, :roles => :mongodb do
+      rsudo "mkdir -p #{rubber_env.mongodb_data_dir}"
+      rsudo "chown -R mongodb:mongodb #{rubber_env.mongodb_data_dir}"
+    end
+    
+    desc <<-DESC
+      Starts the mongodb daemon
+    DESC
+    task :start, :roles => :mongodb do
+      rsudo "service mongodb start"
+    end
+    
+    desc <<-DESC
+      Stops the mongodb daemon
+    DESC
+    task :stop, :roles => :mongodb do
+      rsudo "service mongodb stop"
+    end
+    
+    desc <<-DESC
+      Restarts the mongodb daemon
+    DESC
+    task :restart, :roles => :mongodb do
+      rsudo "service mongodb restart"
+    end
+    
+  end
+
+end

data/lib/generators/vulcanize/templates/mongodb/config/rubber/role/mongodb/mongodb.conf

@@ -0,0 +1,89 @@
+<%
+  @path = "/etc/mongodb.conf"
+  @post = "service mongodb restart"
+%>
+# mongodb.conf
+
+# Where to store the data.
+
+# Note: if you run mongodb as a non-root user (recommended) you may
+# need to create and set permissions for this directory manually,
+# e.g., if the parent directory isn't mutable by the mongodb user.
+dbpath=<%= rubber_env.mongodb_data_dir %>
+
+#where to log
+logpath=<%= rubber_env.mongodb_log %>
+
+logappend=true
+
+port = 27017
+
+# Enables periodic logging of CPU utilization and I/O wait
+#cpu = true
+
+# Turn on/off security.  Off is currently the default
+#noauth = true
+#auth = true
+
+# Verbose logging output.
+#verbose = true
+
+# Inspect all client data for validity on receipt (useful for
+# developing drivers)
+#objcheck = true
+
+# Enable db quota management
+#quota = true
+
+# Set oplogging level where n is
+#   0=off (default)
+#   1=W
+#   2=R
+#   3=both
+#   7=W+some reads
+#diaglog = 0
+# Diagnostic/debugging option
+#nocursors = true
+
+# Ignore query hints
+#nohints = true
+
+# Disable the HTTP interface (Defaults to localhost:27018).
+#nohttpinterface = true
+
+# Turns off server-side scripting.  This will result in greatly limited
+# functionality
+#noscripting = true
+
+# Turns off table scans.  Any query that would do a table scan fails.
+#notablescan = true
+
+# Disable data file preallocation.
+#noprealloc = true
+
+# Specify .ns file size for new databases.
+# nssize = <size>
+
+# Accout token for Mongo monitoring server.
+#mms-token = <token>
+
+# Server name for Mongo monitoring server.
+#mms-name = <server-name>
+
+# Ping interval for Mongo monitoring server.
+#mms-interval = <seconds>
+
+# Replication Options
+
+# in master/slave replicated mongo databases, specify here whether
+# this is a slave or master
+#slave = true
+#source = master.example.com
+# Slave only: specify a single database to replicate
+#only = master.example.com
+# or
+#master = true
+#source = slave.example.com
+
+# in replica set configuration, specify the name of the replica set
+# replSet = setname 

data/lib/generators/vulcanize/templates/mongodb/config/rubber/role/mongodb/monit-mongodb.cnf

@@ -0,0 +1,10 @@
+<%
+  @path = '/etc/monit/monit.d/monit-mongodb.conf'
+%>
+
+check process mongodb with pidfile <%= rubber_env.mongodb_pid %>
+   group mongodb-<%= RUBBER_ENV %>
+   start program = "/usr/bin/env service mongodb start"
+   stop program = "/usr/bin/env service mongodb stop"
+   if failed port 27017 then restart
+   if 5 restarts within 5 cycles then timeout

data/lib/generators/vulcanize/templates/mongodb/config/rubber/rubber-mongodb.yml

@@ -0,0 +1,8 @@
+mongodb_data_dir: /mnt/mongodb
+mongodb_log_dir: /var/log/mongodb
+mongodb_log: "#{mongodb_log_dir}/mongodb.log"
+mongodb_pid: "#{mongodb_data_dir}/mongod.lock"
+
+roles:
+  mongodb:
+    packages: [mongodb-10gen]

data/lib/generators/vulcanize/templates/mongodb/templates.yml

@@ -0,0 +1,3 @@
+description: MongoDB module
+dependent_templates:
+  - base

data/lib/rubber/cloud/aws.rb

@@ -10,9 +10,9 @@ module Rubber
       def initialize(env, capistrano)
         super(env, capistrano)
         @aws_env = env.cloud_providers.aws
-        @ec2 = AWS::EC2::Base.new(:access_key_id => @aws_env.access_key, :secret_access_key => @aws_env.secret_access_key)
-        @ec2elb = AWS::ELB::Base.new(:access_key_id => @aws_env.access_key, :secret_access_key => @aws_env.secret_access_key)
-        AWS::S3::Base.establish_connection!(:access_key_id => @aws_env.access_key, :secret_access_key => @aws_env.secret_access_key)
+        @ec2 = AWS::EC2::Base.new(:access_key_id => @aws_env.access_key, :secret_access_key => @aws_env.secret_access_key, :server => @aws_env.server_endpoint)
+        @ec2elb = AWS::ELB::Base.new(:access_key_id => @aws_env.access_key, :secret_access_key => @aws_env.secret_access_key, :server => @aws_env.server_endpoint)
+        AWS::S3::Base.establish_connection!(:access_key_id => @aws_env.access_key, :secret_access_key => @aws_env.secret_access_key, :server => @aws_env.server_endpoint)
       end
 
       def create_instance(ami, ami_type, security_groups, availability_zone)

data/lib/rubber/recipes/rubber/instances.rb

@@ -61,7 +61,7 @@ namespace :rubber do
   DESC
   required_task :destroy_all do
     rubber_instances.each do |ic|
-      destroy_instance(ic.name)
+      destroy_instance(ic.name, ENV['FORCE'] == 'true')
     end
   end
 

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

@@ -383,6 +383,8 @@ namespace :rubber 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
+      elif grep -q multiverse /etc/apt/sources.list &> /dev/null; then
+        cat /etc/apt/sources.list | sed -n '/multiverse$/s/^#\s*//p' > /etc/apt/sources.list.d/rubber-multiverse-source.list
       fi
     ENDSCRIPT
   end

metadata

@@ -2,7 +2,7 @@
 name: rubber
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.12.2
+  version: 1.13.0
 platform: ruby
 authors: 
 - Matt Conway
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-31 00:00:00 -04:00
+date: 2011-04-13 00:00:00 -04:00
 default_executable: vulcanize
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -151,6 +151,11 @@ files:
 - generators/vulcanize/templates/memcached/templates.yml
 - generators/vulcanize/templates/minimal_mysql/templates.yml
 - generators/vulcanize/templates/minimal_nodb/templates.yml
+- generators/vulcanize/templates/mongodb/config/rubber/deploy-mongodb.rb
+- generators/vulcanize/templates/mongodb/config/rubber/role/mongodb/mongodb.conf
+- generators/vulcanize/templates/mongodb/config/rubber/role/mongodb/monit-mongodb.cnf
+- generators/vulcanize/templates/mongodb/config/rubber/rubber-mongodb.yml
+- generators/vulcanize/templates/mongodb/templates.yml
 - generators/vulcanize/templates/mongrel/config/rubber/deploy-mongrel.rb
 - generators/vulcanize/templates/mongrel/config/rubber/role/mongrel/mongrel_cluster.yml
 - generators/vulcanize/templates/mongrel/config/rubber/role/mongrel/monit-mongrel.conf
@@ -327,6 +332,11 @@ files:
 - lib/generators/vulcanize/templates/memcached/templates.yml
 - lib/generators/vulcanize/templates/minimal_mysql/templates.yml
 - lib/generators/vulcanize/templates/minimal_nodb/templates.yml
+- lib/generators/vulcanize/templates/mongodb/config/rubber/deploy-mongodb.rb
+- lib/generators/vulcanize/templates/mongodb/config/rubber/role/mongodb/mongodb.conf
+- lib/generators/vulcanize/templates/mongodb/config/rubber/role/mongodb/monit-mongodb.cnf
+- lib/generators/vulcanize/templates/mongodb/config/rubber/rubber-mongodb.yml
+- lib/generators/vulcanize/templates/mongodb/templates.yml
 - lib/generators/vulcanize/templates/mongrel/config/rubber/deploy-mongrel.rb
 - lib/generators/vulcanize/templates/mongrel/config/rubber/role/mongrel/mongrel_cluster.yml
 - lib/generators/vulcanize/templates/mongrel/config/rubber/role/mongrel/monit-mongrel.conf