From 005bc190819434c374f15c8d0b2506b9b626c95d Mon Sep 17 00:00:00 2001 From: Nicolas Bally Date: Wed, 25 Feb 2015 11:57:10 +0100 Subject: [PATCH] mise en ligne production --- app/views/admin/menu_items/_form.html.haml | 2 +- app/views/layouts/public.html.haml | 4 ++-- config/nginx.conf | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/views/admin/menu_items/_form.html.haml b/app/views/admin/menu_items/_form.html.haml index b36f6a2..2c263b2 100644 --- a/app/views/admin/menu_items/_form.html.haml +++ b/app/views/admin/menu_items/_form.html.haml @@ -6,7 +6,7 @@ = form.input :name, :label => "Nom :" - = form.input :slug, :label => "slug :"# if current_admin.super_admin? || !@menu_item.super_admin + = form.input :slug, :label => "Url :"# if current_admin.super_admin? || !@menu_item.super_admin = #form.input :super_admin,:as => :boolean , :label => "Super Admin"# if current_admin.super_admin? diff --git a/app/views/layouts/public.html.haml b/app/views/layouts/public.html.haml index ca427e4..e4bd4ed 100644 --- a/app/views/layouts/public.html.haml +++ b/app/views/layouts/public.html.haml @@ -26,8 +26,8 @@ #top .center .contact - contactez-nous : 04 76 93 33 29 - - =link_to "contact@csrenov.com", "mailto:contact@csrenov.com" + contactez-nous : 06 21 09 06 96 - + =link_to "csrenov@orange.fr", "mailto:csrenov@orange.fr" %br diff --git a/config/nginx.conf b/config/nginx.conf index 0e9dd5e..0d755c6 100644 --- a/config/nginx.conf +++ b/config/nginx.conf @@ -4,7 +4,7 @@ upstream cs_app_unicorn { server { listen 80; - server_name new.csrenov.com; + server_name csrenov.com; root /home/web/cs_app/current/public; try_files $uri/index.html $uri @unicorn; @@ -23,6 +23,6 @@ server { server { listen 80; - server_name www.csrenov.com; + server_name new.csrenov.com www.csrenov.com; rewrite ^(.*) http://csrenov.com$1 permanent; }