@@ -2,22 +2,21 @@ require 'rubygems' require 'merb-core' - + +# this is Merb.root, change this if you have some funky setup. +merb_root = File.expand_path(File.dirname(__FILE__) / '../') + # If the fcgi process runs as apache, make sure -# we have an inlinedir set +# we have an inlinedir set for Rubyinline action-args to work unless ENV["INLINEDIR"] || ENV["HOME"] - tmpdir = File.dirname(__FILE__) + "/../tmp" + tmpdir = merb_root / "tmp" unless File.directory?(tmpdir) Dir.mkdir(tmpdir) end - ENV["INLINEDIR"] = tmpdir - end - -# the merb root should alwasy be located below -# to set the root dir -argv = ARGV + %w[-a fcgi -m ..] - -# start -Merb.start(argv) \ No newline at end of file + +# start merb with the fcgi adapter, add options or change the log dir here +Merb.start(:adapter => 'fcgi', + :merb_root => merb_root, + :log_file => merb_root /'log'/'merb.log') \ No newline at end of file merb-gen/app_generators/merb/templates/public/merb.fcgi 3a13dac3bfdb4e37d20095e254f36437fcf0cc84 Ezra Zygmuntowicz ez@engineyard.com http://github.com/wycats/merb-more/commit/b5467e5138b8c18c0c521a5fce5ea529f1a090d6 b5467e5138b8c18c0c521a5fce5ea529f1a090d6 2008-03-24T16:17:33-07:00 2008-03-24T16:17:33-07:00 fix up merb-fcgi binary to work out of the box b201cfab820b88a522c79ded9239eba53625ee28 Ezra Zygmuntowicz ez@engineyard.com