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

Merge branch 'master' of gitlab.quartz.xyz:quartz/negos_app

Browse Source
This commit is contained in:
Nicolas VARROT 2016-03-21 17:48:19 +01:00
commit 8e635b457b
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/layouts/mail.html.haml
View File

@ -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"

4
config/environments/production.rb
View File

@ -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 = {

6
config/nginx.conf
View File

@ -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;
}