rubber 2.10.2 → 2.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 239ffc8c689608d6456d4f1b4a83f2e319c0afc7
-  data.tar.gz: 33b446fe43afa51d206ba2114eb4531d384ee6cb
+  metadata.gz: cb719c42daba4da22b9c9566bb445e3077b198b0
+  data.tar.gz: 7fb644c6a3d571ee6019ac55fc2afae3aa0766f0
 SHA512:
-  metadata.gz: c09382ca073d53e14fed8c14f6f27a0309fd647cd7ad6f982d6ed6fa2fcdb01ea32a588dc856963067fd94f870a43fb37c3b07f989e3d90b4ad68b18225e0b0c
-  data.tar.gz: 8f4f463f2ad97308e1684dda9fe2b52004d80d2e9077f81c6301eecd48b91c74aaa405da28cc6f5d0dbdefb63338129cb1fe06650ada213430163760d306b92d
+  metadata.gz: bfcc3023241d63d494a98f1e441fc048e98800db6c2c390ee8c700c2572d551167a72de4e9e138dbbff121e0deaf6a164ac0c464a8900bfe5bd8d714c6bc6bdf
+  data.tar.gz: e753355f2ea865547888732ccc864e0480a294a9f4094c126f768b4dcf17e0ece7f0350ce18bba47f735192ce370f452db2be938c5d5d2c6c7410075af244983

data/CHANGELOG

@@ -1,3 +1,28 @@
+2.11.0 (08/07/2014)
+
+New Features:
+============
+
+[passenger] Upgraded to Passenger 4. <09c7e64>
+
+Improvements:
+============
+
+[core] Print an error if trying to mount a volume that is mounted under a different device in /etc/fstab. <855fc4c>
+[passenger_nginx] Lock the Passenger version number down for more reliable provisioning. <1ca742a>
+[passenger_nginx] Cleaned up the stock config a bit. <46b5abb, 31de467, e7bdc80>
+[postgresql] Reduced shared_buffers size in PostgreSQL so it'll work out of the box on a 512 MB Digital Ocean droplet. <e032b3a>
+
+Bug Fixes:
+=========
+
+[base] Update the regions with private networking in Digital Ocean. <0d96318>
+[base] Make sure we load deploy-* files in lexicographic order. <332b69e>
+[core] We need to expand the SSH key filename before checking if it exists. <f9db7c4>
+[core] Fixed a problem with loading Rubber via git in bundler on older releases of RubyGems (e.g., the ones that shipped with Ruby 1.9.3). <869d3d4>
+[graylog] Fixed bootstrapping graylog by removing bad config. <ea5a9b4>
+
+
 2.10.2 (07/07/2014)
 
 Improvements:

data/lib/rubber/cloud/digital_ocean.rb

@@ -29,8 +29,9 @@ module Rubber
         super(env, capistrano)
       end
 
-      # Currently New York 2 (id 4) supports private networking
-      REGIONS_WITH_PRIVATE_NETWORKING = [4]
+      # As of July 2014 Digital Ocean supports private networking in
+      # New York 2 (id 4), Amsterdam 2 (id 5), Singapore 1 (id 6) and London 1 (id 7)
+      REGIONS_WITH_PRIVATE_NETWORKING = [4, 5, 6, 7]
 
       def create_instance(instance_alias, image_name, image_type, security_groups, availability_zone, region)
         do_region = compute_provider.regions.find { |r| r.name == region }

data/lib/rubber/recipes/rubber.rb

@@ -105,7 +105,7 @@ namespace :rubber do
 
     # Check that the configuration not only exists, but is also valid.
     normalized_ssh_keys.each do |key|
-      unless File.exists?(key)
+      unless File.exists?(File.expand_path(key))
         fatal "Invalid SSH key path '#{key}': File does not exist.\nPlease check your cloud provider's 'key_file' setting for correctness."
       end
     end

data/lib/rubber/recipes/rubber/volumes.rb

@@ -159,6 +159,13 @@ namespace :rubber do
               #{('yes | mkfs -t ' + vol_spec['filesystem'] + ' ' + '$device') if created}
               #{("mkdir -p '#{vol_spec['mount']}'") if vol_spec['mount']}
               #{("mount '#{vol_spec['mount']}'") if vol_spec['mount']}
+
+            elif ! grep -q '#{vol_spec['mount']}' /etc/fstab | grep -q '#{vol_spec['device']}'; then
+              echo 'You already have #{vol_spec['mount']} mounted as a different device in /etc/fstab'
+              echo 'Please choose a different mount point or manually edit /etc/fstab'
+              echo 'and re-run cap rubber:setup_volumes'
+
+              exit 1
             fi
           ENDSCRIPT
         end

data/lib/rubber/version.rb

@@ -1,3 +1,3 @@
 module Rubber
-  VERSION = '2.10.2'.freeze
+  VERSION = '2.11.0'.freeze
 end

data/rubber.gemspec

@@ -6,7 +6,7 @@ require 'rubber/version'
 Gem::Specification.new do |s|
 
   s.name = "rubber"
-  s.version     = Rubber::VERSION
+  s.version     = Rubber::VERSION.dup
   s.platform    = Gem::Platform::RUBY
   s.authors = ["Matt Conway", "Kevin Menard"]
   s.email       = ["matt@conwaysplace.com", "nirvdrum@gmail.com"]

data/templates/base/config/deploy.rb

@@ -71,7 +71,7 @@ namespace :deploy do
 end
 
 # load in the deploy scripts installed by vulcanize for each rubber module
-Dir["#{File.dirname(__FILE__)}/rubber/deploy-*.rb"].each do |deploy_file|
+Dir["#{File.dirname(__FILE__)}/rubber/deploy-*.rb"].sort.each do |deploy_file|
   load deploy_file
 end
 

data/templates/graylog/config/rubber/role/graylog_server/graylog2.conf

@@ -52,7 +52,7 @@ rest_transport_uri = http://<%= rubber_instances[rubber_env.host].internal_ip %>
 
 # Embedded elasticsearch configuration file
 # pay attention to the working directory of the server, maybe use an absolute path here
-elasticsearch_config_file = /etc/graylog2-elasticsearch.yml
+#elasticsearch_config_file = /etc/graylog2-elasticsearch.yml
 
 elasticsearch_max_docs_per_index = 20000000
 

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

@@ -5,14 +5,11 @@ namespace :rubber do
 
     rubber.allow_optional_tasks(self)
 
-    after "rubber:install_gems", "rubber:passenger:custom_install"
-
-    task :custom_install, :roles => :passenger do
-      rubber.sudo_script 'install_passenger', <<-ENDSCRIPT
-        passenger_lib=$(find #{rubber_env.ruby_path} -path "*/passenger-#{rubber_env.passenger_version}/*/mod_passenger.so" 2> /dev/null)
-        if [[ -z $passenger_lib ]]; then
-          echo -en "\n\n\n\n" | passenger-install-apache2-module
-        fi
+    before "rubber:install_packages", "rubber:passenger:setup_apt_sources"
+    task :setup_apt_sources do
+      rubber.sudo_script 'configure_passenger_nginx_repository', <<-ENDSCRIPT
+        apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 561F9B9CAC40B2F7
+        add-apt-repository -y https://oss-binaries.phusionpassenger.com/apt/passenger
       ENDSCRIPT
     end
     

data/templates/passenger/config/rubber/role/passenger/passenger-apache-vhost.conf

@@ -26,7 +26,7 @@ Listen <%= port %>
   # Don't show haproxy checks in access log (see also apache2.conf)
   SetEnvIf Request_URI "^/httpchk.txt$" dontlog
 
-  RailsEnv  <%= Rubber.env %>
+  PassengerAppEnv  <%= Rubber.env %>
 
   XSendFile on
 

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

@@ -2,44 +2,41 @@
   @path = '/etc/apache2/mods-available/passenger.conf'
   @post = 'cd /etc/apache2/mods-enabled && ln -fs ../mods-available/passenger.conf'
 %>
-LoadModule passenger_module <%= rubber_env.passenger_lib %>
-PassengerRoot <%= rubber_env.passenger_root %>
-PassengerRuby <%= rubber_env.passenger_ruby %>
-PassengerUseGlobalQueue on
+<IfModule mod_passenger.c>
+  PassengerRoot /usr/lib/ruby/vendor_ruby/phusion_passenger/locations.ini
+  PassengerDefaultRuby <%= rubber_env.passenger_ruby %>
 
-PassengerUserSwitching on
-PassengerUser <%= rubber_env.app_user %>
-PassengerGroup <%= rubber_env.app_user %>
+  PassengerUserSwitching on
+  PassengerUser <%= rubber_env.app_user %>
+  PassengerGroup <%= rubber_env.app_user %>
 
-# max number of rails instances per appserver
-PassengerMaxPoolSize <%= rubber_env.max_app_connections %>
+  # max number of rails instances per appserver
+  PassengerMaxPoolSize <%= rubber_env.max_app_connections %>
 
-# min number of rails instances per appserver (by setting this as the max, we make sure we only wait for workers to spawn on the first request)
-PassengerMinInstances <%= rubber_env.max_app_connections %>
+  # min number of rails instances per appserver (by setting this as the max, we make sure we only wait for workers to spawn on the first request)
+  PassengerMinInstances <%= rubber_env.max_app_connections %>
 
-# Use PassengerMaxPoolSize for limit as we only have 1 app
-PassengerMaxInstancesPerApp 0
+  # 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 rails instances when idle
+  PassengerPoolIdleTime 0
 
-# For performances sake, never shutdown a rails instance after N requests
-PassengerMaxRequests 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' %>
+  # 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
+  # Turning this on breaks mod_rewrite
+  PassengerHighPerformance off
 
-# Cache framework code per application
-RailsSpawnMethod smart-lv2
+  # Cache framework code per application
+  PassengerSpawnMethod smart
 
-# For performances sake, don't ever unload framework spawner
-RailsFrameworkSpawnerIdleTime 0
+  # For performances sake, don't ever unload app spawner
+  PassengerMaxPreloaderIdleTime 0
 
-# For performances sake, don't ever unload app spawner
-RailsAppSpawnerIdleTime 0
-
-# Don't show the friendly error pages in production because it could leak information the public shouldn't see.
-PassengerFriendlyErrorPages <%= Rubber.env == 'production' ? 'off' : 'on' %>
+  # Don't show the friendly error pages in production because it could leak information the public shouldn't see.
+  PassengerFriendlyErrorPages <%= Rubber.env == 'production' ? 'off' : 'on' %>
+</IfModule>

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

@@ -1,7 +1,5 @@
-passenger_version: 3.0.19
-passenger_root: "#{`bash -l -c 'find #{ruby_path} -name passenger-#{passenger_version}'`.strip}"
+passenger_version: '1:4.0.48-1~`lsb_release -sc`1'
 passenger_ruby: "#{ruby_path}/bin/ruby"
-passenger_lib: "#{passenger_root}/ext/apache2/mod_passenger.so"
 passenger_listen_port: 7000
 passenger_listen_ssl_port: 7001
 max_app_connections: 20
@@ -11,8 +9,7 @@ role_dependencies:
 
 roles:
   passenger:
-    packages: [apache2-mpm-prefork, apache2-prefork-dev, libcurl4-openssl-dev, libapache2-mod-xsendfile]
-    gems: [fastthread, rack, [passenger, "#{passenger_version}"]]
+    packages: [apache2-mpm-prefork, apache2-prefork-dev, libcurl4-openssl-dev, libapache2-mod-xsendfile, [libapache2-mod-passenger, "#{passenger_version}"]]
     rolling_restart_port: "#{passenger_listen_port}"
 
   web_tools:

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

@@ -47,7 +47,7 @@ http
   error_log         <%= rubber_env.nginx_log_dir %>/error.log notice;
   access_log        <%= rubber_env.nginx_log_dir %>/access.log main;
 
-  passenger_root <%= rubber_env.passenger_root %>;
+  passenger_root /usr/lib/ruby/vendor_ruby/phusion_passenger/locations.ini;
   passenger_ruby <%= rubber_env.passenger_ruby %>;
 
   passenger_max_pool_size <%= rubber_env.max_app_connections %>;
@@ -55,11 +55,12 @@ http
   passenger_max_instances_per_app 0;
   passenger_pool_idle_time 0;
   passenger_max_preloader_idle_time 0;
-  rails_env <%= Rubber.env %>;
+  passenger_app_env <%= Rubber.env %>;
   passenger_friendly_error_pages <%= Rubber.env == 'production' ? 'off' : 'on' %>;
   
   passenger_user <%= rubber_env.app_user %>;
-  
+  passenger_group <%= rubber_env.app_user %>;
+
   include /etc/nginx/rubber/passenger_nginx.conf;
   <% if rubber_instances[rubber_env.host].role_names.include?('web_tools') %> 
     include /etc/nginx/rubber/tools.conf;

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

@@ -1,4 +1,4 @@
-passenger_root: "/usr/lib/ruby/vendor_ruby/phusion_passenger/locations.ini"
+passenger_version: '1:4.0.48-1~`lsb_release -sc`1'
 passenger_ruby: "#{ruby_path}/bin/ruby"
 nginx_log_dir: /mnt/nginx/logs
 passenger_listen_port: 7000
@@ -14,4 +14,4 @@ use_ssl_key: false
 
 roles:
   passenger_nginx:
-    packages: [libcurl4-openssl-dev, libpcre3-dev, nginx-extras, passenger]
+    packages: [libcurl4-openssl-dev, libpcre3-dev, nginx-extras, [passenger, "#{passenger_version}"]

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

@@ -109,7 +109,7 @@ unix_socket_directory = '/var/run/postgresql'		# (change requires restart)
 
 # - Memory -
 
-shared_buffers = 384MB			# min 128kB
+shared_buffers = 28MB			# min 128kB
 					# (change requires restart)
 #temp_buffers = 8MB			# min 800kB
 #max_prepared_transactions = 0		# zero disables the feature

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubber
 version: !ruby/object:Gem::Version
-  version: 2.10.2
+  version: 2.11.0
 platform: ruby
 authors:
 - Matt Conway
@@ -9,176 +9,176 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-07-07 00:00:00.000000000 Z
+date: 2014-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: capistrano
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.12'
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.12'
+  name: capistrano
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: net-ssh
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '2.12'
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.6'
+  name: net-ssh
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: thor
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.6'
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+  name: thor
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: clamp
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+  name: clamp
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: open4
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+  name: open4
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: fog
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '0'
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.6'
+  name: fog
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: json
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.6'
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+  name: json
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: rake
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+  name: rake
   prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: test-unit
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+  name: test-unit
   prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: shoulda-context
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+  name: shoulda-context
   prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: mocha
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+  name: mocha
   prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: awesome_print
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+  name: awesome_print
   prerelease: false
   type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: |2
       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