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

Compare commits

base: nicolas:750d08f250083472082288e49084e7ba9c6610d6
Branches Tags
nicolas:master
nicolas:update-css-header-footer
..
compare: nicolas:056dda1cfa4abc65e64613c40dd22666532dd781
Branches Tags
nicolas:master
nicolas:update-css-header-footer

No commits in common. "750d08f250083472082288e49084e7ba9c6610d6" and "056dda1cfa4abc65e64613c40dd22666532dd781" have entirely different histories.
750d08f250 ... 056dda1cfa

2 changed files with 2 additions and 17 deletions
Show Stats Expand all files Collapse all files

2
app/models/particular.rb
View File

@ -8,7 +8,7 @@ class Particular < ApplicationRecord
belongs_to :owner, :polymorphic => true belongs_to :owner, :polymorphic => true
#validates :civilite, :presence => true, :if => :force_validate_name #validates :civilite, :presence => true, :if => :force_validate_name
#validates :name, :presence => true, :if => :force_validate_name validates :name, :presence => true, :if => :force_validate_name
validates :firstname, :presence => true, :if => :force_validate_name validates :firstname, :presence => true, :if => :force_validate_name
validates :email, :presence => true, :format => /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\z/i, :if => :force_email_validation validates :email, :presence => true, :format => /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\z/i, :if => :force_email_validation
#validates :address_2, :presence => true, :if => :force_validation #validates :address_2, :presence => true, :if => :force_validation

17
config/nginx.conf
View File

@ -10,7 +10,7 @@ upstream mmsc_app_unicorn {
server { server {
listen [::]:443 ssl; listen [::]:443 ssl;
server_name mamotosurcircuit.com ; server_name mmsc.olwen.xyz mamotosurcircuit.com www.mamotosurcircuit.com;
root /srv/www/web/mmsc_app/current/public; root /srv/www/web/mmsc_app/current/public;
try_files $uri/index.html $uri @unicorn; try_files $uri/index.html $uri @unicorn;
@ -44,21 +44,6 @@ server {
} }
server {
listen [::]:443 ssl;
ssl on;
ssl_certificate /etc/letsencrypt/live/mmsc.olwen.xyz/fullchain.pem;
ssl_certificate_key /etc/letsencrypt/live/mmsc.olwen.xyz/privkey.pem;
include snippets/letsencrypt.conf;
server_name www.mamotosurcircuit.com mmsc.olwen.xyz;
rewrite ^(.*) https://mamotosurcircuit.com$1 permanent;
}
server { server {
listen [::]:80; listen [::]:80;
server_name mmsc.olwen.xyz mamotosurcircuit.com www.mamotosurcircuit.com; server_name mmsc.olwen.xyz mamotosurcircuit.com www.mamotosurcircuit.com;