diff --git a/app/views/layouts/mail.html.haml b/app/views/layouts/mail.html.haml
index 935872f..df3b0d8 100755
--- a/app/views/layouts/mail.html.haml
+++ b/app/views/layouts/mail.html.haml
@@ -49,5 +49,5 @@
.content= yield
.bottom{:style => "padding:10px;font-size:0.9em;"}
- =link_to image_tag("http://negos-pro.fr/logo_mail.png", :style => "margin:20px auto;display:block;height:200px;"), "http://negos-pro.fr"
+ =link_to image_tag("http://negos.pro/logo_mail.png", :style => "margin:20px auto;display:block;height:200px;"), "http://negos.pro"
\ No newline at end of file
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 5a25784..a53d6fa 100755
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -77,9 +77,9 @@ Rails.application.configure do
# Do not dump schema after migrations.
config.active_record.dump_schema_after_migration = false
- HOSTNAME="negos-pro.fr"
+ HOSTNAME="negos.pro"
- config.action_mailer.default_url_options = { :host => 'negos-pro.fr' }
+ config.action_mailer.default_url_options = { :host => 'negos.pro' }
config.action_mailer.delivery_method = :smtp
config.action_mailer.smtp_settings = {
diff --git a/config/nginx.conf b/config/nginx.conf
index 677f780..4fea7d8 100755
--- a/config/nginx.conf
+++ b/config/nginx.conf
@@ -4,7 +4,7 @@ upstream negos_app_unicorn {
server {
listen 80;
- server_name negos-pro.fr;
+ server_name negos.pro;
root /home/web/negos_app/current/public;
try_files $uri/index.html $uri @unicorn;
@@ -22,6 +22,6 @@ server {
server {
listen 80;
- server_name www.negos-pro.fr;
- rewrite ^(.*) http://negos-pro.fr$1 permanent;
+ server_name www.negos-pro.fr negos-pro.fr www.negos.pro;
+ rewrite ^(.*) http://negos.pro$1 permanent;
}