rubber 1.5.9 → 1.5.10

Sign up to get free protection for your applications and to get access to all the features.
Files changed (15) hide show
  1. data/CHANGELOG +5 -0
  2. data/VERSION +1 -1
  3. data/generators/vulcanize/templates/base/config/rubber/rubber-rvm.yml +5 -0
  4. data/generators/vulcanize/templates/passenger/config/rubber/role/passenger/munin-passenger-memory.conf +1 -1
  5. data/generators/vulcanize/templates/passenger/config/rubber/role/passenger/munin-passenger-sudoers.conf +2 -2
  6. data/generators/vulcanize/templates/passenger/config/rubber/role/passenger/munin-passenger.conf +1 -1
  7. data/generators/vulcanize/templates/passenger/config/rubber/role/passenger/passenger.conf +3 -3
  8. data/generators/vulcanize/templates/passenger/config/rubber/rubber-passenger.yml +1 -1
  9. data/lib/generators/vulcanize/templates/base/config/rubber/rubber-rvm.yml +5 -0
  10. data/lib/generators/vulcanize/templates/passenger/config/rubber/role/passenger/munin-passenger-memory.conf +1 -1
  11. data/lib/generators/vulcanize/templates/passenger/config/rubber/role/passenger/munin-passenger-sudoers.conf +2 -2
  12. data/lib/generators/vulcanize/templates/passenger/config/rubber/role/passenger/munin-passenger.conf +1 -1
  13. data/lib/generators/vulcanize/templates/passenger/config/rubber/role/passenger/passenger.conf +3 -3
  14. data/lib/generators/vulcanize/templates/passenger/config/rubber/rubber-passenger.yml +1 -1
  15. metadata +2 -2
data/CHANGELOG CHANGED
@@ -1,3 +1,8 @@
1
+ 1.5.9
2
+ -----
3
+
4
+ fix find to handle filenames with spaces, prune bundle from permissions change <56b72ae> [Matt Conway]
5
+
1
6
  1.5.8
2
7
  -----
3
8
 
data/VERSION CHANGED
@@ -1 +1 @@
1
- 1.5.9
1
+ 1.5.10
data/generators/vulcanize/templates/base/config/rubber/rubber-rvm.yml CHANGED
@@ -26,3 +26,8 @@ rvm_prefix: /usr/local/rvm
26
26
 
27
27
  # lets us setup global envoronment to use rvm (also needed when running sudo)
28
28
  rvm_prepare: "source #{rvm_prefix}/scripts/rvm"
29
+
30
+ # dirty hack to get the rvm gem home rather than bundler gem home
31
+ # When we run rubber:config it loads rails/bundler, which forces the bundler gem home, yet deployment only gems
32
+ # like passenger need to be installed in rvm gem home rather than bundler
33
+ rvm_gem_home: "#{$rubber_rvm_gem_home ||= `unset GEM_HOME; bash -l -c 'rvm gemdir'`.strip}"
data/generators/vulcanize/templates/passenger/config/rubber/role/passenger/munin-passenger-memory.conf CHANGED
@@ -18,7 +18,7 @@ END
18
18
  end
19
19
 
20
20
  def output_values
21
- status = `sudo <%= ENV['GEM_HOME'] %>/bin/passenger-memory-stats | tail -1`
21
+ status = `sudo <%= rubber_env.rvm_gem_home %>/bin/passenger-memory-stats | tail -1`
22
22
  unless $?.success?
23
23
  $stderr.puts "failed executing passenger-memory-stats"
24
24
  exit 1
data/generators/vulcanize/templates/passenger/config/rubber/role/passenger/munin-passenger-sudoers.conf CHANGED
@@ -3,5 +3,5 @@
3
3
  @additive = ["# munin passenger start", "# munin passenger end"]
4
4
  %>
5
5
 
6
- nobody ALL=(ALL) NOPASSWD: <%= ENV['GEM_HOME'] %>/bin/passenger-status
7
- nobody ALL=(ALL) NOPASSWD: <%= ENV['GEM_HOME'] %>/bin/passenger-memory-stats
6
+ nobody ALL=(ALL) NOPASSWD: <%= rubber_env.rvm_gem_home %>/bin/passenger-status
7
+ nobody ALL=(ALL) NOPASSWD: <%= rubber_env.rvm_gem_home %>/bin/passenger-memory-stats
data/generators/vulcanize/templates/passenger/config/rubber/role/passenger/munin-passenger.conf CHANGED
@@ -21,7 +21,7 @@ END
21
21
  end
22
22
 
23
23
  def output_values
24
- status = `sudo <%= ENV['GEM_HOME'] %>/bin/passenger-status`
24
+ status = `sudo <%= rubber_env.rvm_gem_home %>/bin/passenger-status`
25
25
  unless $?.success?
26
26
  $stderr.puts "failed executing passenger-status"
27
27
  exit 1
data/generators/vulcanize/templates/passenger/config/rubber/role/passenger/passenger.conf CHANGED
@@ -2,9 +2,9 @@
2
2
  @path = '/etc/apache2/mods-available/passenger.conf'
3
3
  @post = 'cd /etc/apache2/mods-enabled && ln -fs ../mods-available/passenger.conf'
4
4
  %>
5
- LoadModule passenger_module <%= `echo #{rubber_env.passenger_lib}` %>
6
- PassengerRoot <%= `echo #{rubber_env.passenger_root}` %>
7
- PassengerRuby <%= `echo #{rubber_env.passenger_ruby}` %>
5
+ LoadModule passenger_module <%= rubber_env.passenger_lib %>
6
+ PassengerRoot <%= rubber_env.passenger_root %>
7
+ PassengerRuby <%= rubber_env.passenger_ruby %>
8
8
  PassengerUseGlobalQueue on
9
9
 
10
10
  # max number of rails instances per appserver
data/generators/vulcanize/templates/passenger/config/rubber/rubber-passenger.yml CHANGED
@@ -1,5 +1,5 @@
1
1
  passenger_version: 2.2.11
2
- passenger_root: "$GEM_HOME/gems/passenger-#{passenger_version}"
2
+ passenger_root: "#{rvm_gem_home}/gems/passenger-#{passenger_version}"
3
3
  passenger_ruby: "#{ruby_prefix}/bin/passenger_ruby"
4
4
  passenger_lib: "#{passenger_root}/ext/apache2/mod_passenger.so"
5
5
  passenger_listen_port: 7000
data/lib/generators/vulcanize/templates/base/config/rubber/rubber-rvm.yml CHANGED
@@ -26,3 +26,8 @@ rvm_prefix: /usr/local/rvm
26
26
 
27
27
  # lets us setup global envoronment to use rvm (also needed when running sudo)
28
28
  rvm_prepare: "source #{rvm_prefix}/scripts/rvm"
29
+
30
+ # dirty hack to get the rvm gem home rather than bundler gem home
31
+ # When we run rubber:config it loads rails/bundler, which forces the bundler gem home, yet deployment only gems
32
+ # like passenger need to be installed in rvm gem home rather than bundler
33
+ rvm_gem_home: "#{$rubber_rvm_gem_home ||= `unset GEM_HOME; bash -l -c 'rvm gemdir'`.strip}"
data/lib/generators/vulcanize/templates/passenger/config/rubber/role/passenger/munin-passenger-memory.conf CHANGED
@@ -18,7 +18,7 @@ END
18
18
  end
19
19
 
20
20
  def output_values
21
- status = `sudo <%= ENV['GEM_HOME'] %>/bin/passenger-memory-stats | tail -1`
21
+ status = `sudo <%= rubber_env.rvm_gem_home %>/bin/passenger-memory-stats | tail -1`
22
22
  unless $?.success?
23
23
  $stderr.puts "failed executing passenger-memory-stats"
24
24
  exit 1
data/lib/generators/vulcanize/templates/passenger/config/rubber/role/passenger/munin-passenger-sudoers.conf CHANGED
@@ -3,5 +3,5 @@
3
3
  @additive = ["# munin passenger start", "# munin passenger end"]
4
4
  %>
5
5
 
6
- nobody ALL=(ALL) NOPASSWD: <%= ENV['GEM_HOME'] %>/bin/passenger-status
7
- nobody ALL=(ALL) NOPASSWD: <%= ENV['GEM_HOME'] %>/bin/passenger-memory-stats
6
+ nobody ALL=(ALL) NOPASSWD: <%= rubber_env.rvm_gem_home %>/bin/passenger-status
7
+ nobody ALL=(ALL) NOPASSWD: <%= rubber_env.rvm_gem_home %>/bin/passenger-memory-stats
data/lib/generators/vulcanize/templates/passenger/config/rubber/role/passenger/munin-passenger.conf CHANGED
@@ -21,7 +21,7 @@ END
21
21
  end
22
22
 
23
23
  def output_values
24
- status = `sudo <%= ENV['GEM_HOME'] %>/bin/passenger-status`
24
+ status = `sudo <%= rubber_env.rvm_gem_home %>/bin/passenger-status`
25
25
  unless $?.success?
26
26
  $stderr.puts "failed executing passenger-status"
27
27
  exit 1
data/lib/generators/vulcanize/templates/passenger/config/rubber/role/passenger/passenger.conf CHANGED
@@ -2,9 +2,9 @@
2
2
  @path = '/etc/apache2/mods-available/passenger.conf'
3
3
  @post = 'cd /etc/apache2/mods-enabled && ln -fs ../mods-available/passenger.conf'
4
4
  %>
5
- LoadModule passenger_module <%= `echo #{rubber_env.passenger_lib}` %>
6
- PassengerRoot <%= `echo #{rubber_env.passenger_root}` %>
7
- PassengerRuby <%= `echo #{rubber_env.passenger_ruby}` %>
5
+ LoadModule passenger_module <%= rubber_env.passenger_lib %>
6
+ PassengerRoot <%= rubber_env.passenger_root %>
7
+ PassengerRuby <%= rubber_env.passenger_ruby %>
8
8
  PassengerUseGlobalQueue on
9
9
 
10
10
  # max number of rails instances per appserver
data/lib/generators/vulcanize/templates/passenger/config/rubber/rubber-passenger.yml CHANGED
@@ -1,5 +1,5 @@
1
1
  passenger_version: 2.2.11
2
- passenger_root: "$GEM_HOME/gems/passenger-#{passenger_version}"
2
+ passenger_root: "#{rvm_gem_home}/gems/passenger-#{passenger_version}"
3
3
  passenger_ruby: "#{ruby_prefix}/bin/passenger_ruby"
4
4
  passenger_lib: "#{passenger_root}/ext/apache2/mod_passenger.so"
5
5
  passenger_listen_port: 7000
metadata CHANGED
@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
5
5
  segments:
6
6
  - 1
7
7
  - 5
8
- - 9
9
- version: 1.5.9
8
+ - 10
9
+ version: 1.5.10
10
10
  platform: ruby
11
11
  authors:
12
12
  - Matt Conway