From b2b74534e4fe5af2507b9cd6915e4dbe0f522046 Mon Sep 17 00:00:00 2001 From: Nico Date: Tue, 12 Feb 2013 13:49:23 +0100 Subject: [PATCH] cliche nature added --- app/helpers/markdown_helper.rb | 3 ++- config/deploy.rb | 5 +++++ config/nginx.conf | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/app/helpers/markdown_helper.rb b/app/helpers/markdown_helper.rb index 51a44cf..9b9727e 100644 --- a/app/helpers/markdown_helper.rb +++ b/app/helpers/markdown_helper.rb @@ -22,7 +22,8 @@ module MarkdownHelper :autolink => true, :no_intra_emphasis => true, :fenced_code_blocks => true, - :gh_blockcode => true + :gh_blockcode => true, + :tables => true }) syntax_highlighter(markdown.render(text)).html_safe diff --git a/config/deploy.rb b/config/deploy.rb index 3a900df..7ae291c 100644 --- a/config/deploy.rb +++ b/config/deploy.rb @@ -96,6 +96,11 @@ set :application, 'site_perso_app' task :restart, :roles => :app, :except => { :no_release => true } do sudo "service #{application} restart" end + + task :reload_nginx do + sudo "service nginx reload" + end + task :migrate do run "cd #{deploy_to}current && rake db:migrate RAILS_ENV=#{rails_env}" diff --git a/config/nginx.conf b/config/nginx.conf index c2e67ef..8c9c5ef 100644 --- a/config/nginx.conf +++ b/config/nginx.conf @@ -22,6 +22,6 @@ server { server { listen 80; - server_name www.nicolasbally.com nicolasbally.com www.art.nicolasbally.com; + server_name www.cliche-nature.com cliche-nature.com www.nicolasbally.com nicolasbally.com www.art.nicolasbally.com; rewrite ^(.*) http://art.nicolasbally.com$1 permanent; } \ No newline at end of file