diff options
| -rw-r--r-- | railties/CHANGELOG | 2 | ||||
| -rw-r--r-- | railties/Rakefile | 3 | ||||
| -rw-r--r-- | railties/lib/rails_generator/generators/applications/app/app_generator.rb | 7 |
3 files changed, 8 insertions, 4 deletions
diff --git a/railties/CHANGELOG b/railties/CHANGELOG index c3618cda0b..9a0a7f8825 100644 --- a/railties/CHANGELOG +++ b/railties/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Added default lighttpd config in config/lighttpd.conf and added a default runner for lighttpd in script/lighttpd (works like script/server, but using lighttpd and FastCGI) [DHH] + * Added plugin generator to create a stub structure for a new plugin in vendor/plugins (see "script/generate plugin" for help) [DHH] * Added app/services as a default dir in the Rails skeleton and to the load path. Use it to keep classes like MaintenanceService and PaymentGateway [DHH] diff --git a/railties/Rakefile b/railties/Rakefile index db66c153b0..511ebfe744 100644 --- a/railties/Rakefile +++ b/railties/Rakefile @@ -38,7 +38,7 @@ HTML_FILES = %w( 404.html 500.html index.html robots.txt favicon.ico javascripts/prototype.js javascripts/scriptaculous.js javascripts/effects.js javascripts/dragdrop.js javascripts/controls.js javascripts/slider.js ) -BIN_FILES = %w( breakpointer console destroy generate performance/benchmarker performance/profiler process/reaper process/spawner process/spinner runner server ) +BIN_FILES = %w( breakpointer console destroy generate performance/benchmarker performance/profiler process/reaper process/spawner process/spinner runner server lighttpd ) VENDOR_LIBS = %w( actionpack activerecord actionmailer activesupport actionwebservice railties ) @@ -164,6 +164,7 @@ task :copy_configs do cp "configs/routes.rb", "#{PKG_DESTINATION}/config/routes.rb" cp "configs/apache.conf", "#{PKG_DESTINATION}/public/.htaccess" + cp "configs/lighttpd.conf", "#{PKG_DESTINATION}/config/lighttpd.conf" cp "environments/boot.rb", "#{PKG_DESTINATION}/config/boot.rb" cp "environments/environment.rb", "#{PKG_DESTINATION}/config/environment.rb" 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 79bb808d7b..65d6afd9ab 100644 --- a/railties/lib/rails_generator/generators/applications/app/app_generator.rb +++ b/railties/lib/rails_generator/generators/applications/app/app_generator.rb @@ -37,8 +37,9 @@ class AppGenerator < Rails::Generator::Base :app_name => File.basename(File.expand_path(@destination_root)), :socket => @socket } - m.template "configs/routes.rb", "config/routes.rb" - m.template "configs/apache.conf", "public/.htaccess" + 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" @@ -48,7 +49,7 @@ class AppGenerator < Rails::Generator::Base m.file "environments/test.rb", "config/environments/test.rb" # Scripts - %w( breakpointer console destroy generate performance/benchmarker performance/profiler process/reaper process/spawner process/spinner runner server ).each do |file| + %w( breakpointer console destroy generate performance/benchmarker performance/profiler process/reaper process/spawner process/spinner runner server lighttpd ).each do |file| m.file "bin/#{file}", "script/#{file}", script_options end |