diff options
author | David Heinemeier Hansson <david@loudthinking.com> | 2005-09-09 09:07:43 +0000 |
---|---|---|
committer | David Heinemeier Hansson <david@loudthinking.com> | 2005-09-09 09:07:43 +0000 |
commit | 17ef7067c86be4e01ac8320ade4f2787c9d7aa57 (patch) | |
tree | 3be29c1525081ab0cc4e1a1a2520fadad06b8910 /railties/bin | |
parent | b33557b6221c0d9f4d0a7374771b9272c48951a8 (diff) | |
download | rails-17ef7067c86be4e01ac8320ade4f2787c9d7aa57.tar.gz rails-17ef7067c86be4e01ac8320ade4f2787c9d7aa57.tar.bz2 rails-17ef7067c86be4e01ac8320ade4f2787c9d7aa57.zip |
Added -m/--mime-types option to the WEBrick server, so you can specify a Apache-style mime.types file to load #2059 [ask@develooper.com]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2175 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'railties/bin')
-rw-r--r-- | railties/bin/server | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/railties/bin/server b/railties/bin/server index 3a8cc68258..38f35c4285 100644 --- a/railties/bin/server +++ b/railties/bin/server @@ -4,12 +4,12 @@ require 'webrick' require 'optparse' OPTIONS = { - :port => 3000, - :ip => "0.0.0.0", - :environment => "development", - :server_root => File.expand_path(File.dirname(__FILE__) + "/../public/"), - :server_type => WEBrick::SimpleServer, - :charset => "UTF-8" + :port => 3000, + :ip => "0.0.0.0", + :environment => "development", + :server_root => File.expand_path(File.dirname(__FILE__) + "/../public/"), + :server_type => WEBrick::SimpleServer, + :charset => "UTF-8" } ARGV.options do |opts| @@ -27,6 +27,10 @@ ARGV.options do |opts| opts.on("-e", "--environment=name", String, "Specifies the environment to run this server under (test/development/production).", "Default: development") { |OPTIONS[:environment]| } + opts.on("-m", "--mime-types=filename", String, + "Specifies an Apache style mime.types configuration file to be used for mime types", + "Default: none") { |mime_types_file| OPTIONS[:mime_types] = WEBrick::HTTPUtils::load_mime_types(mime_types_file) } + opts.on("-d", "--daemon", "Make Rails run as a Daemon (only works if fork is available -- meaning on *nix)." ) { OPTIONS[:server_type] = WEBrick::Daemon } |