diff --git a/app/models/kaps_rappel_item.rb b/app/models/kaps_rappel_item.rb
index 2a5ffa5..9f6bd4d 100644
--- a/app/models/kaps_rappel_item.rb
+++ b/app/models/kaps_rappel_item.rb
@@ -19,7 +19,7 @@ class KapsRappelItem < ActiveRecord::Base
after_create do
puts "BBBBBBBB"
- GeneralMailer.new_send_qi_mail(:to => self.kaps_rappel.kap.p_customer.email, :subject => "Rappel : #{self.kapsme.name}", :body => "Rappel, la tâche \"#{self.kapsme.name}\" n'a pas été cochée aujourd'hui :(
Marquer comme réalisé : #{validate_by_token_public_kapsme_url(self.kapsme.token)}
http://kaps.quartz.xyz/", :custom_id => self.token).deliver
+ GeneralMailer.new_send_qi_mail(:to => self.kaps_rappel.kap.p_customer.email, :subject => "Rappel : #{self.kapsme.name}", :body => "Rappel, la tâche \"#{self.kapsme.name}\" n'a pas été cochée aujourd'hui :(
Marquer comme réalisé : #{validate_by_token_public_kapsme_url(self.kapsme.token)}
https://kaps.quartz.xyz/", :custom_id => self.token).deliver
end
diff --git a/config/nginx.conf b/config/nginx.conf
index 9c7f042..42bc7d4 100644
--- a/config/nginx.conf
+++ b/config/nginx.conf
@@ -2,27 +2,6 @@ upstream kaps_app_unicorn {
server unix:/srv/www/web/kaps_app/shared/tmp/unicorn.sock fail_timeout=0;
}
-server {
- listen [::]:80;
- server_name kaps.quartz.xyz ;
- root /srv/www/web/kaps_app/current/public;
- try_files $uri/index.html $uri @unicorn;
-
- location @unicorn {
- proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
- proxy_set_header Host $http_host;
- proxy_redirect off;
- proxy_pass http://kaps_app_unicorn;
- proxy_read_timeout 6000;
- }
-
- error_page 500 502 503 504 /500.html;
- client_max_body_size 4G;
- keepalive_timeout 10;
-
- include snippets/letsencrypt.conf;
-}
-
server {
listen [::]:443 ssl;
@@ -53,7 +32,7 @@ server {
server {
listen [::]:80;
- server_name www.kaps.quartz.xyz;
+ server_name kaps.quartz.xyz www.kaps.quartz.xyz;
rewrite ^(.*) https://kaps.quartz.xyz$1 permanent;
include snippets/letsencrypt.conf;