doc/Users guide Apache.html doc/Users guide Nginx.txt @@ -1,4 +1,6 @@ Please read the file README for installation instructions. If you're having trouble installing Phusion Passenger, please -read the file 'doc/Users guide.html'. +read the file 'doc/Users guide Apache.html' or 'doc/Users guide Nginx.html', +depending on whether you want to install Phusion Passenger for Apache or for +Nginx. INSTALL @@ -7,15 +7,22 @@ to http://www.modrails.com/ for general information. === Regular installation -Run the following script as root: +You can install either Phusion Passenger for Apache or for Nginx. Run either of +the following programs as root: ./bin/passenger-install-apache2-module +-OR- + + ./bin/passenger-install-nginx-module + That's it. :) -For troubleshooting, configuration and tips, please read the Users Guide: +For troubleshooting, configuration and tips, please read the corresponding +Users Guide: - doc/Users guide.html + doc/Users guide Apache.html + doc/Users guide Nginx.html This file is included in the source tarball, and may also be viewed online on our website. README @@ -548,7 +548,7 @@ subdir 'doc' do ASCIIDOC = 'asciidoc' ASCIIDOC_FLAGS = "-a toc -a numbered -a toclevels=3 -a icons" ASCII_DOCS = ['Security of user switching support', 'Users guide', - 'Architectural overview'] + 'Users guide Nginx', 'Architectural overview'] DOXYGEN = 'doxygen' @@ -640,7 +640,8 @@ spec = Gem::Specification.new do |s| # If you're running 'rake package' for the first time, then these # files don't exist yet, and so won't be matched by the above glob. # So we add these filenames manually. - 'doc/Users guide.html', + 'doc/Users guide Apache.html', + 'doc/Users guide Nginx.html', 'doc/Security of user switching support.html', 'doc/*/*', Rakefile @@ -69,6 +69,10 @@ class Installer < PhusionPassenger::AbstractInstaller return result end + def users_guide + return "#{DOCDIR}/Users guide Apache.html" + end + def install! if PhusionPassenger.natively_packaged? check_dependencies || exit(1) @@ -177,7 +181,7 @@ private puts line render_template 'apache2/deployment_example', - :users_guide => USERS_GUIDE, + :users_guide => users_guide, :phusion_website => PHUSION_WEBSITE, :passenger_website => PASSENGER_WEBSITE end @@ -185,7 +189,7 @@ private def show_possible_solutions_for_compilation_and_installation_problems new_screen render_template 'apache2/possible_solutions_for_compilation_and_installation_problems', - :users_guide => USERS_GUIDE, + :users_guide => users_guide, :passenger_website => PASSENGER_WEBSITE end end bin/passenger-install-apache2-module @@ -30,6 +30,10 @@ class Installer < PhusionPassenger::AbstractInstaller ] end + def users_guide + return "#{DOCDIR}/Users guide Nginx.html" + end + def install! Dir.chdir(PASSENGER_ROOT) show_welcome_screen @@ -320,7 +324,7 @@ private line puts render_template 'nginx/deployment_example', - :users_guide => USERS_GUIDE, + :users_guide => users_guide, :phusion_website => PHUSION_WEBSITE, :passenger_website => PASSENGER_WEBSITE end @@ -329,7 +333,7 @@ private line puts render_template 'nginx/possible_solutions_for_compilation_and_installation_problems', - :users_guide => USERS_GUIDE, + :users_guide => users_guide, :passenger_website => PASSENGER_WEBSITE end bin/passenger-install-nginx-module @@ -32,7 +32,6 @@ module PhusionPassenger class AbstractInstaller PASSENGER_WEBSITE = "http://www.modrails.com/" PHUSION_WEBSITE = "www.phusion.nl" - USERS_GUIDE = "#{DOCDIR}/Users guide.html" def initialize(options = {}) options.each_pair do |key, value| @@ -172,7 +171,7 @@ private color_puts "If the aforementioned instructions didn't solve your problem, then please take" color_puts "a look at the Users Guide:" puts - color_puts " <yellow>#{USERS_GUIDE}</yellow>" + color_puts " <yellow>#{users_guide}</yellow>" return false end end lib/phusion_passenger/abstract_installer.rb doc/Users guide.txt 7f05cf0c991f06c57c8991541885ba315811fd94 Hongli Lai (Phusion) hongli@phusion.nl http://github.com/FooBarWidget/passenger/commit/85846ccdf3f89ecabba99104bd4743e2385d5fd8 85846ccdf3f89ecabba99104bd4743e2385d5fd8 2009-03-10T04:57:13-07:00 2009-03-10T04:57:13-07:00 Begin writing Nginx documentation. 38cc81b16f329c2c470bfdd53f9250046f807849 Hongli Lai (Phusion) hongli@phusion.nl