From b49de6b74b4d96e64bf771c3c2111e68dc18dafa Mon Sep 17 00:00:00 2001 From: Jamis Buck Date: Mon, 7 Nov 2005 17:45:53 +0000 Subject: Copy lighttpd.conf when it is first needed, instead of on app creation git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2921 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- railties/lib/commands/servers/lighttpd.rb | 8 ++++++++ .../rails_generator/generators/applications/app/app_generator.rb | 1 - 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'railties/lib') diff --git a/railties/lib/commands/servers/lighttpd.rb b/railties/lib/commands/servers/lighttpd.rb index 488c7d61c4..0205e10c0a 100644 --- a/railties/lib/commands/servers/lighttpd.rb +++ b/railties/lib/commands/servers/lighttpd.rb @@ -21,6 +21,14 @@ end config_file = "#{RAILS_ROOT}/config/lighttpd.conf" +unless File.exist?(config_file) + require 'fileutils' + source = File.expand_path(File.join(File.dirname(__FILE__), + "..", "..", "..", "configs", "lighttpd.conf")) + puts "=> #{config_file} not found, copying from #{source}" + FileUtils.cp source, config_file +end + port = IO.read(config_file).scan(/^server.port\s*=\s*(\d+)/).first rescue 3000 puts "=> Rails application started on http://0.0.0.0:#{port}" diff --git a/railties/lib/rails_generator/generators/applications/app/app_generator.rb b/railties/lib/rails_generator/generators/applications/app/app_generator.rb index 9292f227dc..01f371ce42 100644 --- a/railties/lib/rails_generator/generators/applications/app/app_generator.rb +++ b/railties/lib/rails_generator/generators/applications/app/app_generator.rb @@ -39,7 +39,6 @@ class AppGenerator < Rails::Generator::Base } m.template "configs/routes.rb", "config/routes.rb" m.template "configs/apache.conf", "public/.htaccess" - m.template "configs/lighttpd.conf", "config/lighttpd.conf" # Environments m.file "environments/boot.rb", "config/boot.rb" -- cgit v1.2.3