nicolas/danielle_app
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

nginx

Browse Source
This commit is contained in:
Nicolas Bally 2013-07-17 14:55:45 +02:00
parent 6adca38f69
commit ddef8e13b3
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/deploy.rb
View File

@ -6,7 +6,7 @@ set :scm_user, "git"
set :scm_host, "gitlab.bally.me"
set :domain, 'test.script-art.net'
set :domain, 'test.script-art.fr'
set :rvm_ruby_string, 'ruby-2.0.0-p195'
set :rvm_autolibs_flag, "read-only"

4
config/nginx.conf
View File

@ -4,7 +4,7 @@ upstream danielle_app_unicorn {
server {
listen 80;
server_name test.script-art.net;
server_name test.script-art.fr;
root /home/web/danielle_app/current/public;
try_files $uri/index.html $uri @unicorn;
@ -41,7 +41,7 @@ server {
server {
listen 80;
server_name test.script-art.fr;
server_name test.script-art.net;
rewrite ^(.*) http://test.script-art.fr$1 permanent;
}