From cb2abbd5978975d8e955be8d6f0a4848a5ddcddb Mon Sep 17 00:00:00 2001 From: Nicolas Bally Date: Wed, 17 Jul 2013 12:26:11 +0200 Subject: [PATCH] /Users/nico/dev2/danielle_app/config/database.yml /Users/nico/dev2/danielle_app/config/deploy.rb /Users/nico/dev2/danielle_app/config/nginx.conf --- config/database.yml | 2 +- config/deploy.rb | 2 +- config/nginx.conf | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/config/database.yml b/config/database.yml index 51a4dd4..54c5f62 100644 --- a/config/database.yml +++ b/config/database.yml @@ -20,6 +20,6 @@ test: production: adapter: sqlite3 - database: db/production.sqlite3 + database: /home/web/danielle_app/shared/production.sqlite3 pool: 5 timeout: 5000 diff --git a/config/deploy.rb b/config/deploy.rb index e953513..88542fc 100644 --- a/config/deploy.rb +++ b/config/deploy.rb @@ -70,7 +70,7 @@ namespace :deploy do run "ln -s #{deploy_to}shared/storage/public #{current_path}/public/public_medias" - run "ln -s #{deploy_to}shared/production.sqlite3 #{current_path}/db/production.sqlite3" + #run "ln -s #{deploy_to}shared/production.sqlite3 #{current_path}/db/production.sqlite3" sudo "cp #{current_path}/config/unicorn_init_d /etc/init.d/#{application}" diff --git a/config/nginx.conf b/config/nginx.conf index bb03945..baf9e72 100644 --- a/config/nginx.conf +++ b/config/nginx.conf @@ -4,7 +4,7 @@ upstream danielle_app_unicorn { server { listen 80; - server_name test.script-art.fr; + server_name test.script-art.net; root /home/web/danielle_app/current/public; try_files $uri/index.html $uri @unicorn; @@ -23,7 +23,7 @@ server { server { listen 80; - server_name test2.script-art.fr; + server_name test.script-art.fr; rewrite ^(.*) http://test.script-art.fr$1 permanent; }