Permalink
Browse files

Don't show the OS X warning during install anymore. The problem has b…

…een fixed.
  • Loading branch information...
1 parent e58be53 commit 2e06f5eecc7ed81e4e2ea39abf12834023bc5d5f @FooBarWidget FooBarWidget committed Apr 19, 2008
Showing with 0 additions and 31 deletions.
  1. +0 −8 bin/passenger-install-apache2-module
  2. +0 −23 lib/passenger/templates/osx_broken_apache_warning.txt.erb
@@ -52,7 +52,6 @@ class Installer
Dir.chdir(PASSENGER_ROOT)
show_welcome_screen
check_dependencies || exit(1)
- warn_about_broken_apache_on_osx
check_whether_apache_uses_prefork_mpm
check_write_permission_to_passenger_root || exit(1)
if install_apache2_module
@@ -121,13 +120,6 @@ private
end
end
- def warn_about_broken_apache_on_osx
- return unless RUBY_PLATFORM =~ /darwin/ && APXS2 == "/usr/sbin/apxs"
- line
- render_template 'osx_broken_apache_warning'
- wait
- end
-
def check_whether_apache_uses_prefork_mpm
line
# 'httpd -V' output is in the form of:
@@ -1,23 +0,0 @@
-<%= "<banner>WARNING</banner> <red>WARNING</red> " * 3 %>
-
-You seem to be running MacOS X. Testers have reported that the default Apache
-installation, as provided by MacOS X, is broken. Passenger seems to crash for
-unknown reasons on OS X's default Apache installation.
-
-And it seems that you are about to install Passenger against OS X's default
-Apache installation (/usr/sbin/apxs).
-
-We recommend you to install Apache manually, and to install Passenger against
-that Apache instead. To tell Passenger to use a different Apache installation,
-please set the <b>APXS2</b> environment variable, and run this installer again.
-For example, if Apache is installed in /opt/apache2, then please set:
-
- APXS2=/opt/apache2/bin/apxs
- -or-
- APXS2=/opt/apache2/bin/apxs2
-
-...depending on whether your Apache installation's apxs is called 'apxs' or
-'apxs2'.
-
-<b>Press Enter if you want to install Passenger against OS X's default Apache.</b>
-<b>Press Ctrl-C to abort this installer.</b>

0 comments on commit 2e06f5e

Please sign in to comment.