Fixes incorrect version. Sets up an extra .rb config option (-S). Fixes an extra log message.

git-svn-id: svn+ssh://rubyforge.org/var/svn/mongrel/trunk@135 19e92222-5c0b-0410-8929-a290d50e31e9

1 files changed, 7 insertions, 1 deletions

diff --git a/bin/mongrel_rails b/bin/mongrel_rails
index 20784bb..679c1e2 100644
--- a/bin/mongrel_rails
+++ b/bin/mongrel_rails
@@ -22,7 +22,8 @@ class Start < GemPlugin::Plugin "/commands"
       ['-c', '--chdir PATH', "Change to dir before starting (will be expanded)", :@cwd, Dir.pwd],
       ['-r', '--root PATH', "Set the document root (default 'public')", :@docroot, "public"],
       ['-B', '--debug', "Enable debugging mode", :@debug, false],
-      ['-C', '--config PATH', "Use a config file", :@config_file, nil]
+      ['-C', '--config PATH', "Use a config file", :@config_file, nil],
+      ['-S', '--script PATH', "Load the given file as an extra config script.", :@config_script, nil]
     ]
   end
   
@@ -83,6 +84,11 @@ class Start < GemPlugin::Plugin "/commands"
         log "Loading any Rails specific GemPlugins"
         load_plugins
 
+        if settings[:config_script]
+          log "Loading #{settings[:config_script]} external config script"
+          run_config("config/mongrel.rb")
+        end
+
         setup_rails_signals
       end
     end