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

mise en ligne production

Browse Source
This commit is contained in:
Nicolas Bally 2015-02-25 11:57:10 +01:00
parent 1795f84be8
commit 005bc19081
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/admin/menu_items/_form.html.haml
View File

@ -6,7 +6,7 @@
= form.input :name, :label => "Nom :" = 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? = #form.input :super_admin,:as => :boolean , :label => "Super Admin"# if current_admin.super_admin?

4
app/views/layouts/public.html.haml
View File

@ -26,8 +26,8 @@
#top #top
.center .center
.contact .contact
contactez-nous : 04 76 93 33 29 - contactez-nous : 06 21 09 06 96 -
=link_to "contact@csrenov.com", "mailto:contact@csrenov.com" =link_to "csrenov@orange.fr", "mailto:csrenov@orange.fr"
%br %br

4
config/nginx.conf
View File

@ -4,7 +4,7 @@ upstream cs_app_unicorn {
server { server {
listen 80; listen 80;
server_name new.csrenov.com; server_name csrenov.com;
root /home/web/cs_app/current/public; root /home/web/cs_app/current/public;
try_files $uri/index.html $uri @unicorn; try_files $uri/index.html $uri @unicorn;
@ -23,6 +23,6 @@ server {
server { server {
listen 80; listen 80;
server_name www.csrenov.com; server_name new.csrenov.com www.csrenov.com;
rewrite ^(.*) http://csrenov.com$1 permanent; rewrite ^(.*) http://csrenov.com$1 permanent;
} }