diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index f3b44c3..b359685 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -15,6 +15,7 @@ %style=Pygments.css('.highlight') + =render :partial => "shared/ga" if Rails.env.production? diff --git a/app/views/shared/_ga.html.erb b/app/views/shared/_ga.html.erb new file mode 100644 index 0000000..7804887 --- /dev/null +++ b/app/views/shared/_ga.html.erb @@ -0,0 +1,13 @@ + \ No newline at end of file diff --git a/config/nginx.conf b/config/nginx.conf index 84dc4c7..c2e67ef 100644 --- a/config/nginx.conf +++ b/config/nginx.conf @@ -4,7 +4,7 @@ upstream site_perso_app_unicorn { server { listen 80; - server_name new.nicolasbally.com; + server_name new.nicolasbally.com art.nicolasbally.com; root /home/web/site_perso_app/current/public; try_files $uri/index.html $uri @unicorn; @@ -18,4 +18,10 @@ server { error_page 500 502 503 504 /500.html; client_max_body_size 4G; keepalive_timeout 10; +} + +server { + listen 80; + server_name www.nicolasbally.com nicolasbally.com www.art.nicolasbally.com; + rewrite ^(.*) http://art.nicolasbally.com$1 permanent; } \ No newline at end of file