rubber 2.2.4 → 2.3.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: da3f085ebdc37b989578576bdb4a58416229704a
+  data.tar.gz: 121a3118cdf6321dc57b3408e7e549c8d5f17c25
+SHA512:
+  metadata.gz: 15d26dc76976a8d1568e9dfdafd72a92d2bc670f97c75b62d77300811f8a66505d0c472bef0738e2f3bcb132fe7f83f2b17c6cd6f7242b3c4a4446be7bba883c
+  data.tar.gz: faf33dcca62169c86969185337761478654efdf6780a73477b25d7701fae0ef4d783f12e2447e1e25df4568909b52fc695f12c88e345fb65c8c1365d9885f53d

data/CHANGELOG

@@ -1,3 +1,49 @@
+2.3.0 (05/11/2013)
+------------------
+
+New Features:
+============
+
+[core] Added a --fakeroot option to rake rubber:config task to aid in debbugging rubber templates. <20e3fb0>
+[collectd] Added a :status task to check the status of a remote service. <55f593a>
+[graphite] Added a :status task to check the status of a remote service. <55f593a>
+[memcached] Added a :status task to check the status of a remote service. <55f593a>
+[mongodb] Added a :status task to check the status of a remote service. <55f593a>
+[monit] Added a :status task to check the status of a remote service. <55f593a>
+[nginx] Added a :status task to check the status of a remote service. <55f593a>
+[unicorn] Added a :status task to check the status of a remote service. <55f593a>
+
+Improvements:
+============
+
+[base] Upgraded from ruby-build 20130222 to 20130501. <4ea28f8>
+[base] Configure Capistrano to compile assets on the `app` role, not the `web` one, in order to better match a typical Rubber project layout. <9c8096e>
+[core] Allow customizing Capistrano config that rubber has traditionally taken ownership of. <ff69b52>
+[graphite] Removed redundant ping check. <9950dc4>
+[memcached] Added a rotate_logs cron job for memached. <f4d49ac>
+[mongodb] Added a rotate_logs cron job for MongoDB. <b93665d>
+[nginx] Allow configuration of the nginx log directory. <f4ef26f>
+[nginx] Removed "text/html" from the gzip config to get rid of a warning message. <2429a7d>
+[passenger_nginx] Upgraded to Passenger 3.0.19 and nginx 1.2.8. <48fd214, 9a8d81c>
+[passenger_nginx] Added HTTP_X_QUEUE_START CGI param to work better with NewRelic. <48fd214>
+[redis] Upgrade to redis 2.6.13 <9fb33e2>
+
+Bug Fixes:
+=========
+
+[base] Fixed a typo in the cloud storage example configuration. <409137b>
+[core] Honor the `host` option in the rubber:config rake task. <9477b8b>
+[core] Fixed an issue with `symbolize_keys` and nested hashes that was resulting in broken MX record requests for Route 53. <13fdffd>
+[core] Fixed an issue with vulcanizing multiple templates at once. <abca6e3>
+[core] Fixed a problem with newer Capistrano/HighLine causing role names to be serialized incorrectly in an instance file. <9ea1fa6>
+[elasticsearch] The upstart script lies about the service status, causing us to think the service is running when it isn't and thus preventing proper start up. <81aab0e>
+[graphite] The upstart script lies about the service status, causing us to think the service is running when it isn't and thus preventing proper start up. <d92f077>
+[mongodb] The upstart script lies about the service status, causing us to think the service is running when it isn't and thus preventing proper start up. <d92f077>
+[mysql] Maatkit is now part of percona-tools, so our package name was outdated. <2e8d5f6>
+[redis] The upstart script lies about the service status, causing us to think the service is running when it isn't and thus preventing proper start up. <d92f077>
+[torquebox] The upstart script lies about the service status, causing us to think the service is running when it isn't and thus preventing proper start up. <d92f077>
+
+
 2.2.4 (03/05/2013)
 ------------------
 

data/lib/rubber/commands/config.rb

@@ -23,15 +23,17 @@ module Rubber
       option ["--file", "-p"], "FILE", "Only generate files matching the given pattern"
       option ["--no_post", "-n"], :flag, "Skip running post commands"
       option ["--force", "-f"], :flag, "Overwrite files that already exist"
+      option ["--fakeroot", "-k"], "FAKEROOT", "Prefix generated files with fakeroot. Useful\nfor debugging with an environment and host"
       
       def execute
         cfg = Rubber::Configuration.get_configuration(Rubber.env)
-        instance_alias = cfg.environment.current_host
+        instance_alias = host || cfg.environment.current_host 
         instance = cfg.instance[instance_alias]
         if instance
           role_names = instance.role_names
           env = cfg.environment.bind(role_names, instance_alias)
           gen = Rubber::Configuration::Generator.new("#{Rubber.root}/config/rubber", role_names, instance_alias)
+          gen.fake_root = fakeroot if fakeroot
         elsif ['development', 'test'].include?(Rubber.env)
           instance_alias = host || instance_alias
           role_names = roles || cfg.environment.known_roles
@@ -48,7 +50,7 @@ module Rubber
           instance.internal_ip = "127.0.0.1"
           cfg.instance.add(instance)
           gen = Rubber::Configuration::Generator.new("#{Rubber.root}/config/rubber", role_names, instance_alias)
-          gen.fake_root ="#{Rubber.root}/tmp/rubber"
+          gen.fake_root = fakeroot || "#{Rubber.root}/tmp/rubber"
         else
           puts "Instance not found for host: #{instance_alias}"
           exit 1

data/lib/rubber/commands/vulcanize.rb

@@ -50,7 +50,7 @@ module Rubber
       option ["-s", "--skip"], :flag, "Skip files that already exist"
       
       parameter "TEMPLATE ...", "rubber template(s)" do |arg|
-        invalid = arg - VulcanizeThor.valid_templates
+        invalid = [arg].flatten - VulcanizeThor.valid_templates
         if invalid.size == 0
           arg
         else

data/lib/rubber/dns/base.rb

@@ -68,6 +68,10 @@ module Rubber
           actual_opts = default_opts.merge(Rubber::Util::symbolize_keys(opts))
         end
 
+        if actual_opts.has_key?(:data) && actual_opts[:data].is_a?(Array) && actual_opts[:data].first.is_a?(Hash)
+          actual_opts[:data] = actual_opts[:data].collect { |x| Rubber::Util.symbolize_keys(x) }
+        end
+
         required.each do |r|
           raise "Missing required options: #{r}" unless actual_opts[r]
         end

data/lib/rubber/recipes/rubber.rb

@@ -55,9 +55,9 @@ namespace :rubber do
     # Disable connecting to any Windows instance.
     # pass -l to bash in :shell to that run also gets full env
     # use a pty so we don't get "stdin: is not a tty" error output
-    default_run_options[:pty] = true
-    default_run_options[:shell] = "/bin/bash -l"
-    default_run_options[:except] = { :platform => 'windows' }
+    default_run_options[:pty] = true if default_run_options[:pty].nil?
+    default_run_options[:shell] = "/bin/bash -l" if default_run_options[:shell].nil?
+    default_run_options[:except] ||= { :platform => 'windows' }
 
     set :cloud, Rubber.cloud(self)
 

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

@@ -191,7 +191,9 @@ namespace :rubber do
     value = Capistrano::CLI.ui.ask(msg) unless value
     value = value.size == 0 ? default : value
     fatal "#{name} is required, pass using environment or enter at prompt" if required && ! value
-    return value
+
+    # Explicitly convert to a String to avoid weird serialization issues with Psych.
+    value.to_s
   end
 
   def fatal(msg, code=1)

data/lib/rubber/version.rb

@@ -1,3 +1,3 @@
 module Rubber
-  VERSION = "2.2.4"
+  VERSION = "2.3.0"
 end

data/rubber.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.authors = ["Matt Conway", "Kevin Menard"]
   s.email       = ["matt@conwaysplace.com", "nirvdrum@gmail.com"]
-  s.homepage = "http://github.com/wr0ngway/rubber"
+  s.homepage = "https://github.com/rubber/rubber"
   s.summary = "A capistrano plugin for managing multi-instance deployments to the cloud (ec2)"
   s.description = <<-DESC
     The rubber plugin enables relatively complex multi-instance deployments of RubyOnRails applications to

data/templates/base/config/deploy.rb

@@ -7,6 +7,7 @@ on :load do
   set :runner,      rubber_env.app_user
   set :deploy_to,   "/mnt/#{application}-#{Rubber.env}"
   set :copy_exclude, [".git/*", ".bundle/*", "log/*", ".rvmrc", ".rbenv-version"]
+  set :assets_role, [:app]
 end
 
 # Use a simple directory tree copy here to make demo easier.

data/templates/base/config/rubber/rubber-ruby.yml

@@ -11,7 +11,7 @@
 packages: [build-essential, git-core, subversion, curl, autoconf, bison, ruby, zlib1g-dev, libssl-dev, libreadline6-dev, libxml2-dev, libyaml-dev]
 
 # REQUIRED: The version of ruby-build to use for building ruby.
-ruby_build_version: 20130222
+ruby_build_version: 20130501
 
 # REQUIRED: Set to the version string for the ruby version you wish to use
 # Run "ruby-build --definitions" to see the list of possible options

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

@@ -118,7 +118,7 @@ cloud_provider: aws
 # 
 # Allowed forms are:
 # filesystem: "file:#{Rubber.root}/config/rubber/instance-#{Rubber.env}.yml"
-# cloud storage (s3): "storage:#{cloud_provider.aws.backup_bucket}/RubberInstances_#{app_name}/instance-#{Rubber.env}.yml"
+# cloud storage (s3): "storage:#{cloud_providers.aws.backup_bucket}/RubberInstances_#{app_name}/instance-#{Rubber.env}.yml"
 # cloud table (simpledb): "table:RubberInstances_#{app_name}_#{Rubber.env}"
 #
 # If you need to port between forms, load the rails console then:

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

@@ -43,6 +43,12 @@ namespace :rubber do
       rsudo "pkill -fn #{rubber_env.rubber_collectd_runner.sub(/./, '[\0]')} ; exit 0"
     end
 
+    desc "Display status of collectd system monitoring"
+    task :status, :roles => :collectd do
+      rsudo "service collectd status || true"
+      rsudo "ps -eopid,user,fname | grep [c]ollectd || true"
+    end
+
   end
 
 end

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

@@ -34,7 +34,7 @@ namespace :rubber do
     end
 
     task :start, :roles => :elasticsearch do
-      rsudo "service elasticsearch status || service elasticsearch start"
+      rsudo "service elasticsearch start"
     end
 
     task :stop, :roles => :elasticsearch do

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

@@ -116,7 +116,7 @@ namespace :rubber do
 
       desc "Start graphite system monitoring"
       task :start, :roles => :graphite_server do
-        rsudo "service graphite-server status || service graphite-server start"
+        rsudo "service graphite-server start"
       end
 
       desc "Stop graphite system monitoring"
@@ -129,6 +129,14 @@ namespace :rubber do
         stop
         start
       end
+
+      desc "Display status of graphite system monitoring"
+      task :status, :roles => :graphite_server do
+        rsudo "service graphite-server status || true"
+        rsudo "ps -eopid,user,cmd | grep [c]arbon || true"
+        rsudo "sudo netstat -tupln | grep [p]ython || true"
+      end
+
     end
 
     namespace :web do
@@ -189,22 +197,29 @@ EOF
         end
       end
 
-      desc "Start graphite system monitoring"
+      desc "Start graphite web server"
       task :start, :roles => :graphite_web do
-        rsudo "service graphite-web status || service graphite-web start"
+        rsudo "service graphite-web start"
       end
 
-      desc "Stop graphite system monitoring"
+      desc "Stop graphite web server"
       task :stop, :roles => :graphite_web do
         rsudo "service graphite-web stop || true"
       end
 
-      desc "Restart graphite system monitoring"
+      desc "Restart graphite web server"
       task :restart, :roles => :graphite_web do
         stop
         start
       end
 
+      desc "Display status of graphite web server"
+      task :status, :roles => :graphite_web do
+        rsudo "service graphite-web status || true"
+        rsudo "ps -eopid,user,cmd | grep '[g]raphite/conf/uwsgi.ini' || true"
+        rsudo "netstat -tupln | grep uwsgi || true"
+      end
+
     end
 
   end

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

@@ -0,0 +1,15 @@
+
+namespace :rubber do
+  
+  namespace :memcached do
+
+    desc "Display status of memcached shared memory"
+    task :status, :roles => :memcached do
+      rsudo "service memcached status || true"
+      rsudo "ps -eopid,user,cmd | grep [m]emcached || true"
+      rsudo "netstat -tulpn | grep memcached || true"
+    end
+
+  end
+
+end

data/templates/memcached/config/rubber/role/memcached/crontab

@@ -0,0 +1,8 @@
+<%
+  @read_cmd = 'crontab -l'
+  @write_cmd = 'crontab -'
+  @additive = ["# rubber-memcached-start", "# rubber-memcached-end"]
+%>
+
+# Roll the memcached logs at midnight
+0 0 * * * <%= Rubber.root %>/script/rubber cron --task util:rotate_logs --directory=<%= rubber_env.memcached_log_dir %>

data/templates/memcached/config/rubber/role/memcached/memcached.conf

@@ -14,7 +14,7 @@
 -d
 
 # Log memcached's output to /var/log/memcached
-logfile /var/log/memcached.log
+logfile <%= rubber_env.memcached_log_dir %>/memcached.log
 
 # Be verbose
  -v

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

@@ -1,5 +1,7 @@
 # Sets up memcached server and client as dalli
 
+memcached_log_dir: /var/log/memcached
+
 gems: [dalli]
 
 roles:

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

@@ -33,7 +33,7 @@ namespace :rubber do
       Starts the mongodb daemon
     DESC
     task :start, :roles => :mongodb do
-      rsudo "service mongodb status || service mongodb start"
+      rsudo "service mongodb start"
     end
     
     desc <<-DESC
@@ -50,7 +50,16 @@ namespace :rubber do
       stop
       start
     end
-    
+
+    desc <<-DESC
+      Display status of the mongodb daemon
+    DESC
+    task :status, :roles => :mongodb do
+      rsudo "service mongodb status || true"
+      rsudo "ps -eopid,user,cmd | grep [m]ongod || true"
+      rsudo "netstat -tupan | grep mongod || true"
+    end
+
   end
 
 end

data/templates/mongodb/config/rubber/role/mongodb/crontab

@@ -0,0 +1,8 @@
+<%
+  @read_cmd = 'crontab -l'
+  @write_cmd = 'crontab -'
+  @additive = ["# rubber-mongodb-start", "# rubber-mongodb-end"]
+%>
+
+# Roll the mongodb logs at midnight
+0 0 * * * <%= Rubber.root %>/script/rubber cron --task util:rotate_logs --directory=<%= rubber_env.mongodb_log_dir %>

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

@@ -27,7 +27,14 @@ namespace :rubber do
       stop
       start
     end
-  
+
+    desc "Display status of monit daemon monitoring"
+    task :status, :roles => :monit do
+      rsudo "service monit status || true"
+      rsudo "ps -eopid,user,fname | grep [m]onit || true"
+      rsudo "netstat -tulpn | grep monit || true"
+    end
+
   end
 
 end

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

@@ -42,5 +42,5 @@ roles:
   mysql:
     packages: [
                 mysql-server,
-                maatkit # useful mysql tools for replication
+                percona-tools # useful mysql tools for replication
               ]

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

@@ -52,7 +52,14 @@ namespace :rubber do
     task :reload, :roles => :nginx do
       serial_reload
     end
-  
+
+    desc "Display status of the nginx web server"
+    task :status, :roles => :nginx do
+      rsudo "service nginx status || true"
+      rsudo "ps -eopid,user,fname | grep [n]ginx || true"
+      rsudo "netstat -tulpn | grep nginx || true"
+    end
+
   end
 
 end

data/templates/nginx/config/rubber/role/nginx/crontab

@@ -5,5 +5,5 @@
 %>
 
 # Roll the nginx logs at midnight
-0 0 * * * <%= Rubber.root %>/script/rubber cron --task util:rotate_logs --directory=/mnt/nginx/logs
+0 0 * * * <%= Rubber.root %>/script/rubber cron --task util:rotate_logs --directory=<%= rubber_env.nginx_log_dir %>
 

data/templates/nginx/config/rubber/role/nginx/nginx.conf

@@ -1,6 +1,6 @@
 <%
   @path = "/etc/nginx/nginx.conf"
-  @post = "mkdir -p /mnt/nginx/logs"
+  @post = "mkdir -p #{rubber_env.nginx_log_dir}"
 %>
 
 user www-data;
@@ -26,7 +26,7 @@ http
   gzip_http_version 1.0;
   gzip_comp_level   2;
   gzip_proxied      any;
-  gzip_types        text/plain text/html text/css application/x-javascript text/xml application/xml application/xml+rss text/javascript;
+  gzip_types        text/plain text/css application/x-javascript text/xml application/xml application/xml+rss text/javascript;
 
   # configure log format like to Apache's "combined" log format
   log_format        main
@@ -35,8 +35,8 @@ http
                       '"$http_user_agent" "$http_cookie"';
 
   # default log files
-  error_log         /mnt/nginx/logs/error.log notice;
-  access_log        /mnt/nginx/logs/access.log main;
+  error_log         <%= rubber_env.nginx_log_dir %>/error.log notice;
+  access_log        <%= rubber_env.nginx_log_dir %>/access.log main;
 
   include /etc/nginx/rubber/*.conf;
 }

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

@@ -5,6 +5,8 @@
 # Uses from rubber-complete.yml
 # web_tools_port: 8080
 
+nginx_log_dir: /mnt/nginx/logs
+
 roles:
   nginx:
     packages: [nginx]

data/templates/passenger_nginx/config/rubber/role/passenger_nginx/application.conf

@@ -4,8 +4,8 @@
 
 server_name  <%= [ rubber_env.domain, rubber_env.web_aliases ].flatten.compact.join(" ") %>;
 passenger_enabled on;
-
 passenger_min_instances 1;
+passenger_set_cgi_param HTTP_X_QUEUE_START "t=${msec}000";
 
 root <%= Rubber.root + "/public" %>;