Commit 395987f1782be77841275deaad5188e5d0925071:
Don't insist on Ruby 2.3.0
Branch: refs/heads/master
Author: Sebb <[email protected]>
Committer: Sebb <[email protected]>
Pusher: sebb <[email protected]>
------------------------------------------------------------
www/status/Gemfile | ++ -
www/status/passenger.cgi | ++ ---
------------------------------------------------------------
8 changes: 4 additions, 4 deletions.
------------------------------------------------------------
diff --git a/www/status/Gemfile b/www/status/Gemfile
index bdc729a..f853090 100644
--- a/www/status/Gemfile
+++ b/www/status/Gemfile
@@ -1,6 +1,7 @@
source 'https://rubygems.org'
-ruby '2.3.0'
+# N.B. It is recommended to use ruby 2.3.0, but 2.0.0 should work
+raise 'Ruby version must be at least 2.0' unless RUBY_VERSION.to_f >= 2.0
root = '../../..'
asf_version = File.read(File.expand_path("#{root}/asf.version",
__FILE__)).chomp
diff --git a/www/status/passenger.cgi b/www/status/passenger.cgi
index 4ccefea..ecca2b7 100755
--- a/www/status/passenger.cgi
+++ b/www/status/passenger.cgi
@@ -1,4 +1,4 @@
-#!/usr/local/bin/ruby2.3.0
+#!/usr/bin/env ruby
require 'bundler/setup'
@@ -15,8 +15,7 @@ unless user
print "WWW-Authenticate: Basic realm=\"ASF Members and Officers\"\r\n\r\n"
exit
end
-
-output, error, status = Open3.capture3 '/usr/local/bin/ruby2.3.0',
+output, error, status = Open3.capture3 'ruby',
Gem.bin_path('passenger', 'passenger-status')
_html do
