diff options
| author | Leonardo Saraiva <vyper@maneh.org> | 2013-02-24 20:51:31 -0300 |
|---|---|---|
| committer | Leonardo Saraiva <vyper@maneh.org> | 2013-02-24 20:51:31 -0300 |
| commit | 2fe9da91f5a4b5ba3edaee47ee24dbce523e739e (patch) | |
| tree | cca3792ae030b550015633b4b855451fa8455bc3 /config.ru | |
| parent | e1020ed888439a480cb13af2585f9fea5283c609 (diff) | |
| parent | 4790b939807be4d9abcc567f02773ff24b99320d (diff) | |
| download | my_new_personal_website-2fe9da91f5a4b5ba3edaee47ee24dbce523e739e.tar.xz my_new_personal_website-2fe9da91f5a4b5ba3edaee47ee24dbce523e739e.zip | |
Merge branch 'master' of github.com:imathis/octopress
Conflicts:
plugins/category_generator.rb
Diffstat (limited to 'config.ru')
| -rw-r--r-- | config.ru | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -4,7 +4,7 @@ require 'sinatra/base' # The project root directory $root = ::File.dirname(__FILE__) -class SinatraStaticServer < Sinatra::Base +class SinatraStaticServer < Sinatra::Base get(/.+/) do send_sinatra_file(request.path) {404} @@ -16,10 +16,10 @@ class SinatraStaticServer < Sinatra::Base def send_sinatra_file(path, &missing_file_block) file_path = File.join(File.dirname(__FILE__), 'public', path) - file_path = File.join(file_path, 'index.html') unless file_path =~ /\.[a-z]+$/i + file_path = File.join(file_path, 'index.html') unless file_path =~ /\.[a-z]+$/i File.exist?(file_path) ? send_file(file_path) : missing_file_block.call end end -run SinatraStaticServer
\ No newline at end of file +run SinatraStaticServer |