From 1526aa3b1dac916bf7189dd0c7df6eb37188d7f8 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Sun, 7 Apr 2013 22:47:55 +0200 Subject: [PATCH 1/2] Fix cascade problem with site.baseurl. Fixes #931. --- bin/jekyll | 1 - lib/jekyll.rb | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/bin/jekyll b/bin/jekyll index 5d3b229b..ccf5b5ef 100755 --- a/bin/jekyll +++ b/bin/jekyll @@ -77,7 +77,6 @@ command :serve do |c| c.action do |args, options| options.default :port => '4000', :host => '0.0.0.0', - :baseurl => '/', :serving => true options = normalize_options(options.__hash__) diff --git a/lib/jekyll.rb b/lib/jekyll.rb index b7c711e8..8d10746c 100644 --- a/lib/jekyll.rb +++ b/lib/jekyll.rb @@ -68,7 +68,7 @@ module Jekyll 'markdown' => 'maruku', 'permalink' => 'date', - 'baseurl' => '', + 'baseurl' => '/', 'include' => ['.htaccess'], 'paginate_path' => 'page:num', From dbb3dd3a1a12d42cbb57cdd7e1583c1a13cf9fed Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Sun, 7 Apr 2013 23:55:04 +0200 Subject: [PATCH 2/2] Move port and host configuration options to Jekyll::DEFAULTS so Commander doesn't override in serving awkwardly. --- bin/jekyll | 4 +--- lib/jekyll.rb | 5 ++++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/bin/jekyll b/bin/jekyll index ccf5b5ef..1c3324ba 100755 --- a/bin/jekyll +++ b/bin/jekyll @@ -75,9 +75,7 @@ command :serve do |c| c.option '-b', '--baseurl [URL]', 'Base URL' c.action do |args, options| - options.default :port => '4000', - :host => '0.0.0.0', - :serving => true + options.default :serving => true options = normalize_options(options.__hash__) options = Jekyll.configuration(options) diff --git a/lib/jekyll.rb b/lib/jekyll.rb index 8d10746c..19ad0373 100644 --- a/lib/jekyll.rb +++ b/lib/jekyll.rb @@ -64,7 +64,7 @@ module Jekyll 'keep_files' => ['.git','.svn'], 'future' => true, # remove and make true just default - 'pygments' => true, # remove and make true just default + 'pygments' => true, # remove and make true just default 'markdown' => 'maruku', 'permalink' => 'date', @@ -75,6 +75,9 @@ module Jekyll 'markdown_ext' => 'markdown,mkd,mkdn,md', 'textile_ext' => 'textile', + 'port' => '4000', + 'host' => '0.0.0.0', + 'excerpt_separator' => "\n\n", 'maruku' => {