|
 |
f8250e |
diff --git a/lib/phusion_passenger/standalone/command.rb b/lib/phusion_passenger/standalone/command.rb
|
|
|
f8250e |
index e9079f1..a51b380 100644
|
|
|
f8250e |
--- a/lib/phusion_passenger/standalone/command.rb
|
|
|
f8250e |
+++ b/lib/phusion_passenger/standalone/command.rb
|
|
|
f8250e |
@@ -61,6 +61,7 @@ private
|
|
|
f8250e |
def require_daemon_controller
|
|
|
f8250e |
if !defined?(DaemonController)
|
|
|
f8250e |
begin
|
|
|
f8250e |
+ $LOAD_PATH.unshift "/opt/rh/rh-passenger40/root/usr/share/gems/gems/daemon_controller-1.2.0/lib/"
|
|
|
f8250e |
require 'daemon_controller'
|
|
|
f8250e |
begin
|
|
|
f8250e |
require 'daemon_controller/version'
|
|
|
f8250e |
diff --git a/lib/phusion_passenger/standalone/runtime_locator.rb b/lib/phusion_passenger/standalone/runtime_locator.rb
|
|
|
f8250e |
index 418ab6f..d674441 100644
|
|
|
f8250e |
--- a/lib/phusion_passenger/standalone/runtime_locator.rb
|
|
|
f8250e |
+++ b/lib/phusion_passenger/standalone/runtime_locator.rb
|
|
|
f8250e |
@@ -84,7 +84,7 @@ class RuntimeLocator
|
|
|
f8250e |
if result = config["nginx_binary"]
|
|
|
f8250e |
@nginx_binary = result
|
|
|
f8250e |
elsif PhusionPassenger.natively_packaged? && @nginx_version == PhusionPassenger::PREFERRED_NGINX_VERSION
|
|
|
f8250e |
- @nginx_binary = "#{PhusionPassenger.lib_dir}/PassengerWebHelper"
|
|
|
f8250e |
+ @nginx_binary = "#{PhusionPassenger.agents_dir}/PassengerWebHelper"
|
|
|
f8250e |
else
|
|
|
f8250e |
filename = "#{@runtime_dir}/#{version}/webhelper-#{@nginx_version}-#{cxx_compat_id}/PassengerWebHelper"
|
|
|
f8250e |
if File.exist?(filename)
|
|
|
f8250e |
@@ -98,7 +98,7 @@ class RuntimeLocator
|
|
|
f8250e |
end
|
|
|
f8250e |
|
|
|
f8250e |
def find_agents_dir
|
|
|
f8250e |
- return "#{find_support_dir}/agents"
|
|
|
f8250e |
+ return PhusionPassenger.agents_dir
|
|
|
f8250e |
end
|
|
|
f8250e |
|
|
|
f8250e |
def find_lib_dir
|
|
|
f8250e |
diff --git a/lib/phusion_passenger/utils/file_system_watcher.rb b/lib/phusion_passenger/utils/file_system_watcher.rb
|
|
|
f8250e |
index a4a6b50..878acf9 100644
|
|
|
f8250e |
--- a/lib/phusion_passenger/utils/file_system_watcher.rb
|
|
|
f8250e |
+++ b/lib/phusion_passenger/utils/file_system_watcher.rb
|
|
|
f8250e |
@@ -21,7 +21,7 @@
|
|
|
f8250e |
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
|
|
f8250e |
# THE SOFTWARE.
|
|
|
f8250e |
|
|
|
f8250e |
-PhusionPassenger.require_passenger_lib 'native_support'
|
|
|
f8250e |
+#PhusionPassenger.require_passenger_lib 'native_support'
|
|
|
f8250e |
|
|
|
f8250e |
module PhusionPassenger
|
|
|
f8250e |
module Utils
|
|
|
f8250e |
diff --git a/resources/templates/standalone/config.erb b/resources/templates/standalone/config.erb
|
|
|
f8250e |
index e80297e..37e91a1 100644
|
|
|
f8250e |
--- a/resources/templates/standalone/config.erb
|
|
|
f8250e |
+++ b/resources/templates/standalone/config.erb
|
|
|
f8250e |
@@ -41,7 +41,15 @@ events {
|
|
|
f8250e |
http {
|
|
|
f8250e |
log_format debug '[$time_local] $msec "$request" $status conn=$connection sent=$bytes_sent body_sent=$body_bytes_sent';
|
|
|
f8250e |
include '<%= PhusionPassenger.resources_dir %>/mime.types';
|
|
|
f8250e |
+<% if PlatformInfo.ruby_command == "/opt/rh/rh-ruby22/root/usr/bin/ruby" %>
|
|
|
f8250e |
+ passenger_ruby "/opt/rh/rh-passenger40/root/usr/libexec/passenger-ruby22";
|
|
|
f8250e |
+<% elsif PlatformInfo.ruby_command == "/opt/rh/ruby200/root/usr/bin/ruby" %>
|
|
|
f8250e |
+ passenger_ruby "/opt/rh/rh-passenger40/root/usr/libexec/passenger-ruby200";
|
|
|
f8250e |
+<% elsif PlatformInfo.ruby_command == "/opt/rh/ruby193/root/usr/bin/ruby" %>
|
|
|
f8250e |
+ passenger_ruby "/opt/rh/rh-passenger40/root/usr/libexec/passenger-ruby193";
|
|
|
f8250e |
+<% else %>
|
|
|
f8250e |
passenger_ruby <%= PlatformInfo.ruby_command %>;
|
|
|
f8250e |
+<% end %>
|
|
|
f8250e |
passenger_root '<%= location_config_filename %>';
|
|
|
f8250e |
passenger_abort_on_startup_error on;
|
|
|
f8250e |
passenger_ctl cleanup_pidfiles <%= serialize_strset("#{@temp_dir}/temp_dir_toucher.pid") %>;
|