aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrandon Mathis <brandon@imathis.com>2011-08-11 19:56:25 -0400
committerBrandon Mathis <brandon@imathis.com>2011-08-11 19:56:25 -0400
commit313c3859aa07013815c51ae0a4af2e4fbe2ba808 (patch)
tree9e48e1d93cec1e43061bb881bcdb872394ef357d
parent9c2f64d20cd881054abe09247c26162118afe541 (diff)
downloadmy_new_personal_website-313c3859aa07013815c51ae0a4af2e4fbe2ba808.tar.xz
my_new_personal_website-313c3859aa07013815c51ae0a4af2e4fbe2ba808.zip
now using rack instead of Jekyll's webrick server, fixes #90
Diffstat (limited to '')
-rw-r--r--Rakefile3
-rw-r--r--_config.yml1
2 files changed, 2 insertions, 2 deletions
diff --git a/Rakefile b/Rakefile
index 86e07b5d..2e3c93d6 100644
--- a/Rakefile
+++ b/Rakefile
@@ -20,6 +20,7 @@ posts_dir = "_posts" # directory for blog files
themes_dir = ".themes" # directory for blog files
new_post_ext = "markdown" # default new post file extension when using the new_post task
new_page_ext = "markdown" # default new page file extension when using the new_page task
+server_port = "4000" # port for preview server eg. localhost:4000
desc "Initial setup for Octopress: copies the default theme into the path of Jekyll's generator. Rake install defaults to rake install[classic] to install a different theme run rake install[some_theme_name]"
@@ -52,7 +53,7 @@ end
desc "preview the site in a web browser"
task :preview do
- system "trap 'kill $jekyllPid $compassPid' Exit; jekyll --auto --server & jekyllPid=$!; compass watch & compassPid=$!; wait"
+ system "trap 'kill $jekyllPid $compassPid $rackPid' Exit; jekyll --auto & jekyllPid=$!; compass watch & compassPid=$!; rackup --port #{server_port} & rackPid=$!; wait"
end
# usage rake new_post[my-new-post] or rake new_post['my new post'] or rake new_post (defaults to "new-post")
diff --git a/_config.yml b/_config.yml
index 36ebe90c..3d6fee89 100644
--- a/_config.yml
+++ b/_config.yml
@@ -20,7 +20,6 @@ email:
# If publishing to a subdirectory as in http://site.com/project set 'root: /project'
root: /
-server_port: 4000
permalink: /blog/:year/:month/:day/:title/
source: source
destination: public