rubber 2.1.2 → 2.2.0

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

@@ -1,6 +1,6 @@
 
 roles:
   apache:
-    packages: [apache2]
+    packages: [apache2, libapache2-mod-proxy-html, libcurl4-openssl-dev, libapache2-mod-xsendfile]
   web_tools:
-    packages: [libapache2-mod-proxy-html]
+    packages: [apache2, libapache2-mod-proxy-html, libcurl4-openssl-dev, libapache2-mod-xsendfile]

data/templates/base/config/deploy.rb

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

data/templates/base/config/rubber/common/crontab

@@ -4,9 +4,7 @@
 
 %>
 
-# cron clears out environment variables, but Rubber.root/script/rubber uses
-# "rvm do default" to run, so no longer any need to setup ruby env vars here,
-# all we need is PATH
+# cron clears out environment variables. All we need is PATH.
 PATH=<%= ENV['PATH'] %>
 
 MAILTO=<%= rubber_env.admin_email %>

data/templates/base/config/rubber/common/gemrc

@@ -0,0 +1,5 @@
+<%
+  @path = "/etc/gemrc"
+%>
+---
+gem: --no-ri --no-rdoc

data/templates/base/config/rubber/common/rubber.profile

@@ -8,6 +8,3 @@ export RUBBER_ENV=<%= Rubber.env %>
 export RAILS_ENV=<%= Rubber.env %>
 alias current="cd <%= current_path %>"
 alias release="cd <%= Rubber.root %>"
-
-# Always use rubygems
-export RUBYOPT="rubygems"

data/templates/base/config/rubber/common/ruby.profile

@@ -0,0 +1,9 @@
+<%
+  @path = "/etc/profile.d/ruby.sh"
+%>
+
+# Always use rubygems.
+export RUBYOPT="rubygems"
+
+# Use the installed Ruby.
+export PATH="<%= rubber_env.ruby_path %>/bin:$PATH"

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

@@ -1,83 +1,63 @@
 namespace :rubber do
   namespace :base do
-  
+
     rubber.allow_optional_tasks(self)
 
-    before "rubber:setup_gem_sources", "rubber:base:install_rvm"
-    task :install_rvm do
-      rubber.sudo_script "install_rvm", <<-ENDSCRIPT
-        if [[ ! `rvm --version 2> /dev/null` =~ "#{rubber_env.rvm_version}" ]]; then
-          cd /tmp
-          curl -s https://raw.github.com/wayneeseguin/rvm/master/binscripts/rvm-installer -o rvm-installer
-          chmod +x rvm-installer
-          rm -f /etc/rvmrc
-          rvm_path=#{rubber_env.rvm_prefix} ./rvm-installer --version #{rubber_env.rvm_version}
+    before "rubber:setup_gem_sources", "rubber:base:install_ruby_build"
+    task :install_ruby_build do
+      rubber.sudo_script "install_ruby_build", <<-ENDSCRIPT
+      if [[ ! `ruby-build --version 2> /dev/null` =~ "#{rubber_env.ruby_build_version}" ]]; then
+        echo "Installing ruby-build v#{rubber_env.ruby_build_version}"
+        wget -q https://github.com/sstephenson/ruby-build/archive/v#{rubber_env.ruby_build_version}.tar.gz -O /tmp/ruby-build.tar.gz
 
-          # Set up the rubygems version
-          sed -i 's/rubygems_version=.*/rubygems_version=#{rubber_env.rubygems_version}/' #{rubber_env.rvm_prefix}/config/db
+        # Install ruby-build.
+        tar -C /tmp -zxf /tmp/ruby-build.tar.gz
+        cd /tmp/ruby-build-*
+        ./install.sh
 
-          # Set up the rake version
-          sed -i 's/rake.*/rake -v#{rubber_env.rake_version}/' #{rubber_env.rvm_prefix}/gemsets/default.gems
-          sed -i 's/rake.*/rake -v#{rubber_env.rake_version}/' #{rubber_env.rvm_prefix}/gemsets/global.gems
+        # Clean up after ourselves.
+        cd /root
+        rm -rf /tmp/ruby-build-*
+        rm -f /tmp/ruby-build.tar.gz
 
-          # Set up the .gemrc file
-          if [[ ! -f ~/.gemrc ]]; then
-            echo "--- " >> ~/.gemrc
-          fi
+        # Get rid of RVM if this is an older rubber installation.
+        if type rvm &> /dev/null; then
+          rvm implode
 
-          if ! grep -q 'gem: ' ~/.gemrc; then
-            echo "gem: --no-ri --no-rdoc" >> ~/.gemrc
-          fi
+          rm -rf /usr/local/rvm
+          rm -f /usr/bin/rvm*
+          rm -f ~/.gemrc
         fi
+      fi
       ENDSCRIPT
     end
 
-    # ensure that the rvm profile script gets sourced by reconnecting
-    after "rubber:base:install_rvm" do
-      teardown_connections_to(sessions.keys)
-    end
-
-    after "rubber:base:install_rvm", "rubber:base:install_rvm_ruby"
-    task :install_rvm_ruby do
-      opts = get_host_options('rvm_ruby')
-      
-      # sudo_script only takes a single hash with host -> VAR, so combine our
-      # two vars so we can extract them out in the bash script
-      install_opts = get_host_options('rvm_install_options')
-      install_opts.each do |k, v|
-        opts[k] = "#{opts[k]} #{v}"
-      end
-      
-      install_rvm_ruby_script = <<-ENDSCRIPT
-        rvm_ver=$1
-        shift
-        install_opts=$*
-
-        if [[ ! `rvm list default 2> /dev/null` =~ "$rvm_ver" ]]; then
-          echo "RVM is compiling/installing ruby $rvm_ver, this may take a while"
-
-          nohup rvm install $rvm_ver $install_opts &> /tmp/install_rvm_ruby.log &
-          sleep 1
+    after "rubber:base:install_ruby_build", "rubber:base:install_ruby"
+    task :install_ruby do
+      rubber.sudo_script "install_ruby", <<-ENDSCRIPT
+      installed_ruby_ver=`which ruby | cut -d / -f 5`
+      desired_ruby_ver="#{rubber_env.ruby_version}"
+      if [[ ! $installed_ruby_ver =~ $desired_ruby_ver ]]; then
+        echo "Compiling and installing ruby $desired_ruby_ver.  This may take a while ..."
 
-          while true; do
-            if ! ps ax | grep -q "[r]vm install"; then break; fi
-            echo -n .
-            sleep 5
-          done
+        nohup ruby-build #{rubber_env.ruby_version} #{rubber_env.ruby_path} &> /tmp/install_ruby.log &
+        sleep 1
 
-          # need to set default after using once or something in env is broken
-          rvm use $rvm_ver &> /dev/null
-          rvm use $rvm_ver --default
+        while true; do
+          if ! ps ax | grep -q "[r]uby-build"; then break; fi
+          echo -n .
+          sleep 5
+        done
 
-          # Something flaky with $PATH having an entry for "bin" which breaks
-          # munin, the below seems to fix it
-          rvm use $rvm_ver
-          rvm repair environments
-          rvm use $rvm_ver
-        fi
+        echo "export RUBYOPT=rubygems\nexport PATH=#{rubber_env.ruby_path}/bin:$PATH" > /etc/profile.d/ruby.sh
+        echo "--- \ngem: --no-ri --no-rdoc" > /etc/gemrc
+      fi
       ENDSCRIPT
-      opts[:script_args] = '$CAPISTRANO:VAR$'
-      rubber.sudo_script "install_rvm_ruby", install_rvm_ruby_script, opts
+    end
+    
+    # ensure that the profile script gets sourced by reconnecting
+    after "rubber:base:install_ruby" do
+      teardown_connections_to(sessions.keys)
     end
 
     after "rubber:install_packages", "rubber:base:configure_git" if scm == "git"
@@ -90,7 +70,7 @@ namespace :rubber do
         fi
       ENDSCRIPT
     end
-    
+
     # We need a rails user for safer permissions used by deploy.rb
     after "rubber:install_packages", "rubber:base:custom_install"
     task :custom_install do

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

@@ -0,0 +1,21 @@
+# ruby-build needs some extra packages to compile/install ruby runtimes
+# curl is required.
+# patch is required (for ree, some ruby head's).
+# For JRuby (if you wish to use it) you will need:
+#   aptitude install curl sun-java6-bin sun-java6-jre sun-java6-jdk
+# For MRI & ree (if you wish to use it) you will need:
+#   aptitude install curl bison build-essential zlib1g-dev libssl-dev libreadline5-dev libxml2-dev git-core
+# For IronRuby (if you wish to use it) you will need:
+#   aptitude install curl mono-2.0-devel
+
+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: 20130206
+
+# 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
+ruby_version: 1.9.3-p385
+
+# REQUIRED: Installation path for ruby.
+ruby_path: "/usr/local/rubies/#{ruby_version}"

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

@@ -30,6 +30,11 @@ domain: foo.com
 #
 # rubber_secret: "#{File.expand_path('~') + '/.ec2' + (Rubber.env == 'production' ? '' : '_dev') + '/rubber-secret.yml' rescue ''}"
 
+# OPTIONAL: Encryption key that was used to obfuscate the contents of rubber-secret.yml with "rubber util:obfuscation" 
+# Not that much better when stored in here, but you could use a ruby snippet in here to fetch it from a key server or something
+#
+# rubber_secret_key: "XXXyyy=="
+
 # REQUIRED All known cloud providers with the settings needed to configure them
 # There's only one working cloud provider right now - Amazon Web Services
 # To implement another, clone lib/rubber/cloud/aws.rb or make the fog provider 
@@ -52,7 +57,7 @@ cloud_providers:
     #
     access_key: XXX
     secret_access_key: YYY
-    account: ZZZ
+    account: 'ZZZ'
 
     # REQUIRED:  The name of the amazon keypair and location of its private key
     #
@@ -78,8 +83,8 @@ cloud_providers:
     # Ubuntu 12.04 Precise instance-store 64-bit: ami-eafa5883
     #
     # m1.small or m1.large or m1.xlarge
-    image_type: m1.small
-    image_id: ami-eafa5883
+    image_type: c1.medium
+    image_id: ami-d726abbe
 
     # OPTIONAL: EC2 spot instance request support.
     #

data/templates/base/script/rubber

@@ -3,6 +3,10 @@
 export RUBBER_ROOT=`dirname $0`/..
 export BUNDLE_GEMFILE=$RUBBER_ROOT/Gemfile
 
-# run through "rvm do" so we work in crontab - default rvm ruby
-# version is set during bootstrap
-rvm default do bundle exec rubber "$@"
+if type rvm &> /dev/null; then
+  # run through "rvm do" so we work in crontab - default rvm ruby
+  # version is set during bootstrap
+  rvm default do bundle exec rubber "$@"
+else
+  bundle exec rubber "$@"
+fi

data/templates/collectd/config/rubber/role/passenger/collectd-passenger.rb.conf

@@ -36,7 +36,7 @@ INTERVAL = (ENV["COLLECTD_INTERVAL"] || 60).to_i
 loop do
   start_time = Time.now.to_i
 
-  status = `sudo <%= rubber_env.rvm_gem_home %>/bin/passenger-status`
+  status = `sudo <%= rubber_env.ruby_path %>/bin/passenger-status`
   unless $?.success?
     $stderr.puts "failed executing passenger-status"
     exit 1
@@ -59,7 +59,7 @@ loop do
   puts "PUTVAL #{HOSTNAME}/passenger/gauge-total_sessions interval=#{INTERVAL} N:#{total_sessions}"
 
 
-  status = `sudo <%= rubber_env.rvm_gem_home %>/bin/passenger-memory-stats | tail -1`
+  status = `sudo <%= rubber_env.ruby_path %>/bin/passenger-memory-stats | tail -1`
   unless $?.success?
     $stderr.puts "failed executing passenger-memory-stats"
     exit 1

data/templates/collectd/config/rubber/role/passenger/passenger-status-sudoers.conf

@@ -4,5 +4,5 @@
 %>
 Defaults env_keep += GEM_PATH
 
-nobody  ALL=(ALL) NOPASSWD: <%= rubber_env.rvm_gem_home %>/bin/passenger-status
-nobody  ALL=(ALL) NOPASSWD: <%= rubber_env.rvm_gem_home %>/bin/passenger-memory-stats
+nobody  ALL=(ALL) NOPASSWD: <%= rubber_env.ruby_path %>/bin/passenger-status
+nobody  ALL=(ALL) NOPASSWD: <%= rubber_env.ruby_path %>/bin/passenger-memory-stats

data/templates/complete_unicorn_nginx/config/rubber/rubber-complete.yml

@@ -1,7 +1,6 @@
 role_dependencies:
-  web: [haproxy]
-  app: [unicorn_nginx]
-  web_tools: [unicorn_nginx]
+  app: [unicorn]
+  web_tools: [nginx]
 
 web_port: 80
 web_ssl_port: 443

data/templates/complete_unicorn_nginx/templates.yml

@@ -1,7 +1,6 @@
 description: A fairly complete and scalable deployment setup using unicorn and nginx
 dependent_templates:
   - base
-  - haproxy
   - nginx
   - unicorn
   - monit

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

@@ -9,7 +9,7 @@ namespace :rubber do
     task :install, :roles => :elasticsearch do
       rubber.sudo_script 'install_elasticsearch', <<-ENDSCRIPT
         if [[ ! -d "#{rubber_env.elasticsearch_dir}" ]]; then
-          wget --no-check-certificate -qNP /tmp https://github.com/downloads/elasticsearch/elasticsearch/elasticsearch-#{rubber_env.elasticsearch_version}.zip
+          wget --no-check-certificate -qNP /tmp http://download.elasticsearch.org/elasticsearch/elasticsearch/elasticsearch-#{rubber_env.elasticsearch_version}.zip
           unzip -d #{rubber_env.elasticsearch_prefix} /tmp/elasticsearch-#{rubber_env.elasticsearch_version}.zip
           rm /tmp/elasticsearch-#{rubber_env.elasticsearch_version}.zip
 

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

@@ -1,4 +1,4 @@
-elasticsearch_version: 0.19.3
+elasticsearch_version: 0.19.12
 elasticsearch_prefix: /usr/local
 elasticsearch_dir: "#{elasticsearch_prefix}/elasticsearch-#{elasticsearch_version}"
 elasticsearch_data_dir: "/mnt/elasticsearch/data"

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

@@ -1,8 +1,8 @@
 
 namespace :rubber do
-  
+
   namespace :graphite do
-    
+
     rubber.allow_optional_tasks(self)
 
     after "rubber:install_packages", "rubber:graphite:install_collectd_graphite_plugin"
@@ -21,53 +21,6 @@ namespace :rubber do
       ENDSCRIPT
     end
 
-    # graphite collectd plugin needs newer collectd (>= 4.9)
-    before "rubber:install_packages", "rubber:graphite:setup_apt_backport_of_collectd"
-
-    task :setup_apt_backport_of_collectd do
-      sources = <<-EOF
-        deb http://gb.archive.ubuntu.com/ubuntu/ maverick main universe
-        deb-src http://gb.archive.ubuntu.com/ubuntu/ maverick main universe
-      EOF
-      sources.gsub!(/^[ \t]*/, '')
-
-      prefs = <<-EOF
-        Package: *
-        Pin: release a=maverick
-        Pin-Priority: 400
-
-        Package: libxml2
-        Pin: release a=maverick
-        Pin-Priority: 900
-
-        Package: libxml2-dev
-        Pin: release a=maverick
-        Pin-Priority: 900
-
-        Package: collectd-core
-        Pin: release a=maverick
-        Pin-Priority: 900
-
-        Package: collectd-utils
-        Pin: release a=maverick
-        Pin-Priority: 900
-
-        Package: collectd
-        Pin: release a=maverick
-        Pin-Priority: 900
-      EOF
-      prefs.gsub!(/^[ \t]*/, '')
-
-      rubber.sudo_script 'setup_apt_backport_of_collectd', <<-ENDSCRIPT
-        release=`lsb_release -sr`
-        needs_backport=`echo "$release <= 10.04" | bc`
-        if [[ $needs_backport == 1 && ! -f /etc/apt/preferences.d/rubber-collectd ]]; then
-          echo -e #{sources.inspect} > /etc/apt/sources.list.d/rubber-collectd.list
-          echo -e #{prefs.inspect} > /etc/apt/preferences.d/rubber-collectd
-        fi
-      ENDSCRIPT
-    end
-
     task :install_graphite_from_repo, :roles => [:graphite_server, :graphite_web] do
       rubber.sudo_script 'install_graphite_from_repo', <<-ENDSCRIPT
         if [[ ! -d "/opt/graphite" ]]; then
@@ -142,6 +95,10 @@ namespace :rubber do
             cd /tmp/#{rubber_env.graphite_carbon_package_url.gsub(/.*\//, '').gsub('.tar.gz', '')}
             python setup.py install
 
+            rm -rf /opt/graphite/storage
+            mkdir #{rubber_env.graphite_storage_dir}
+            chown www-data:www-data #{rubber_env.graphite_storage_dir}
+            ln -s #{rubber_env.graphite_storage_dir} /opt/graphite/storage
           fi
         ENDSCRIPT
       end
@@ -183,7 +140,7 @@ namespace :rubber do
       else
         after "rubber:graphite:server:install", "rubber:graphite:web:install"
       end
-      
+
       after "rubber:graphite:server:bootstrap", "rubber:graphite:web:bootstrap"
 
       desc <<-DESC
@@ -234,12 +191,12 @@ EOF
 
       desc "Start graphite system monitoring"
       task :start, :roles => :graphite_web do
-        rsudo "service apache2 start"
+        rsudo "service graphite-web start"
       end
 
       desc "Stop graphite system monitoring"
       task :stop, :roles => :graphite_web do
-        rsudo "service apache2 stop || true"
+        rsudo "service graphite-web stop || true"
       end
 
       desc "Restart graphite system monitoring"

data/templates/graphite/config/rubber/role/graphite_server/carbon.conf

@@ -78,7 +78,7 @@ PICKLE_RECEIVER_PORT = 2004
 USE_INSECURE_UNPICKLER = False
 
 CACHE_QUERY_INTERFACE = 0.0.0.0
-CACHE_QUERY_PORT = 7002
+CACHE_QUERY_PORT = <%= rubber_env.graphite_carbon_port %>
 
 # Set this to False to drop datapoints received after the cache
 # reaches MAX_CACHE_SIZE. If this is True (the default) then sockets

data/templates/graphite/config/rubber/role/graphite_server/graphite-collectd-ping.conf

@@ -0,0 +1,11 @@
+<%
+  @path = '/etc/collectd/conf.d/graphite-ping.conf'
+%>
+
+LoadPlugin ping
+
+<Plugin "ping">
+  <% rubber_instances.each do |ic| %>
+  Host "<%= ic.full_name %>"
+  <% end %>
+</Plugin>