From 61e6de931d408f8ad6ab78cf3cdcf632381b5156 Mon Sep 17 00:00:00 2001 From: Fernando Blat Date: Mon, 24 Jul 2023 08:15:06 +0200 Subject: [PATCH 1/9] Custom CA file --- config/environments/production.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/config/environments/production.rb b/config/environments/production.rb index 42feed6..e470f03 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -83,6 +83,7 @@ :password => Rails.application.secrets.smtp_password, :domain => Rails.application.secrets.smtp_domain, :enable_starttls_auto => Rails.application.secrets.smtp_starttls_auto, + :ca_file => "/etc/ssl/certs/ca-certificates.crt", :openssl_verify_mode => 'none' } From 3921d094959d378c26ceb34293ed805aa7e1cfd8 Mon Sep 17 00:00:00 2001 From: Fernando Blat Date: Mon, 24 Jul 2023 11:22:47 +0200 Subject: [PATCH 2/9] Add certs --- docs/decidim_terrassa_2023.crt | Bin 0 -> 1661 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 docs/decidim_terrassa_2023.crt diff --git a/docs/decidim_terrassa_2023.crt b/docs/decidim_terrassa_2023.crt new file mode 100644 index 0000000000000000000000000000000000000000..87697b8a1f4a7a0a38ceeb5b334d1adc1e387d6c GIT binary patch literal 1661 zcmah}X;4#F6wZ5jga{$Xs9!y2#&US%{lnPV` zPeX(u7@lnxC_S$&8sPi{B`+{v;>`diq*<;x!8sEq5M*pX01sE3-W+KsTz+An>m}15i@{=*KA{FHdu^nQ*P)?@-_rEf6Vh4Vx*aQC&X9&?KVI0Z; zxLy_H_`M&(ewHy>5}z zRZlYeOO~mlclBmxNM6XWXz{#ZN@N%pC9&_FlWZD&_}~;9>geSi9SM3JPIcjVJQBN3 z91q&==f(2L#T@ed1%)>=mIn;yr^wQmA6a7i-A0njubH8C3F*4}2l3}RBl3y@Vq%Xy zzjeSf`H5M#dRbca+yPAuC8i4|LIkKn1(SgaMu0h9TYC!#dWVn!3ID(l0nFFmEky8k zWmyWZ4c2%&5d1UmC|d05vg>0#(Cm&0o ziT*KPG`=*^lh4DXQU#5VDe%Tl`2kQ4I>nRn<+6_wfwDud3q_O{fwBcCn@I?c2tZi} zlv&e`U>GPU*vym*r23)%w+*;>RzgDqr4o5^f08DiMhFt09!@iOF&)DwIqs zOG!!js4!2yOb$F}6hPJsr&9S(g1tT&C&U_9PBV${%n1U1dh>jQ2^auqXd3tbud4`O z+vH!nZ_y5gptix@&%b$leusWOsU>%j+EE3Id&EK z!47K->ThK+* zxBq!u&bHVFOcsCD7EJEzUH9&Kg(%*)#3?N|W`Fib2J_JQ4ek4eVs(|A&icE39-oa4 zxe@NQ9p;0{Z)ThOuaKJ+jd#$DZZ{87_uSE)AV>C>L{t>LO6uvlRo0tl;cIf!xo&K0 z^XtlnmtBk9Z4Gabo$b5x+rNKPaeSxpD!V;#>~ytuPDcBlwveyO!gh~4`K6SGV$7ud z4`a~_eppwy%ih5^n}g2OG#xIWTv(Cf_^La64t+u!+FEtnJH3%%LD{uqN{Sm$TJco9OxjrR^c-N*cQ_Ck?cZg*5zpJF>aR_AucOr-y6P literal 0 HcmV?d00001 From 856b1720b91509fd57f0c224d2634785054dc711 Mon Sep 17 00:00:00 2001 From: Fernando Blat Date: Mon, 24 Jul 2023 11:39:30 +0200 Subject: [PATCH 3/9] Rename certs folder --- {docs => certs}/decidim_terrassa_2023.crt | Bin 1 file changed, 0 insertions(+), 0 deletions(-) rename {docs => certs}/decidim_terrassa_2023.crt (100%) diff --git a/docs/decidim_terrassa_2023.crt b/certs/decidim_terrassa_2023.crt similarity index 100% rename from docs/decidim_terrassa_2023.crt rename to certs/decidim_terrassa_2023.crt From d12079900c9b4a9c736f36e160fd918425cd1938 Mon Sep 17 00:00:00 2001 From: Fernando Blat Date: Tue, 25 Jul 2023 09:52:30 +0200 Subject: [PATCH 4/9] Remove CA file path --- config/environments/production.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/config/environments/production.rb b/config/environments/production.rb index e470f03..f55f27b 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -82,8 +82,7 @@ :user_name => Rails.application.secrets.smtp_username, :password => Rails.application.secrets.smtp_password, :domain => Rails.application.secrets.smtp_domain, - :enable_starttls_auto => Rails.application.secrets.smtp_starttls_auto, - :ca_file => "/etc/ssl/certs/ca-certificates.crt", + :enable_starttls_auto => Rails.application.secrets.smtp_starttls_auto :openssl_verify_mode => 'none' } From 6456db60e5f50cb7244b4a9594a09c171377ae1d Mon Sep 17 00:00:00 2001 From: Fernando Blat Date: Tue, 25 Jul 2023 09:57:18 +0200 Subject: [PATCH 5/9] Typo --- config/environments/production.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/environments/production.rb b/config/environments/production.rb index f55f27b..42feed6 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -82,7 +82,7 @@ :user_name => Rails.application.secrets.smtp_username, :password => Rails.application.secrets.smtp_password, :domain => Rails.application.secrets.smtp_domain, - :enable_starttls_auto => Rails.application.secrets.smtp_starttls_auto + :enable_starttls_auto => Rails.application.secrets.smtp_starttls_auto, :openssl_verify_mode => 'none' } From 1cdf086a7af7c886d29679dc946480c1eb748fa4 Mon Sep 17 00:00:00 2001 From: Fernando Blat Date: Wed, 26 Jul 2023 05:00:39 +0200 Subject: [PATCH 6/9] Disable sidekiq --- config/environments/production.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/environments/production.rb b/config/environments/production.rb index 42feed6..44f60fc 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -110,7 +110,7 @@ # Do not dump schema after migrations. config.active_record.dump_schema_after_migration = false - config.active_job.queue_adapter = :sidekiq + #config.active_job.queue_adapter = :sidekiq config.lograge.enabled = true config.lograge.formatter = Lograge::Formatters::Json.new From d921c62e5215dcce183fe084fbfb73b3231ee23f Mon Sep 17 00:00:00 2001 From: Fernando Blat Date: Thu, 27 Jul 2023 07:00:47 +0200 Subject: [PATCH 7/9] Disable ssl verification --- config/environments/production.rb | 2 +- config/initializers/decidim.rb | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/config/environments/production.rb b/config/environments/production.rb index 44f60fc..42feed6 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -110,7 +110,7 @@ # Do not dump schema after migrations. config.active_record.dump_schema_after_migration = false - #config.active_job.queue_adapter = :sidekiq + config.active_job.queue_adapter = :sidekiq config.lograge.enabled = true config.lograge.formatter = Lograge::Formatters::Json.new diff --git a/config/initializers/decidim.rb b/config/initializers/decidim.rb index a0cc739..5fe3971 100644 --- a/config/initializers/decidim.rb +++ b/config/initializers/decidim.rb @@ -54,3 +54,7 @@ active: :inclusive, if: Decidim::ParticipatoryProcess.where(decidim_participatory_process_group_id: 6).published.public_spaces.any? end + +# Disable SSL checking of the SMTP +OpenSSL::SSL::VERIFY_PEER = OpenSSL::SSL::VERIFY_NONE + From c442020b48d447e60cd0088bb7675a4322c4de95 Mon Sep 17 00:00:00 2001 From: Fernando Blat Date: Wed, 27 Sep 2023 06:26:09 +0200 Subject: [PATCH 8/9] Update sidekiq versions to avoid log issues --- Gemfile | 2 +- Gemfile.lock | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Gemfile b/Gemfile index b831b37..8eddcdf 100644 --- a/Gemfile +++ b/Gemfile @@ -38,7 +38,7 @@ group :production, :straging do gem 'newrelic_rpm' gem "lograge" gem "sentry-raven" - gem "sidekiq" + gem "sidekiq", "~> 6.5.6" end group :test do diff --git a/Gemfile.lock b/Gemfile.lock index 11ce45b..1c405c9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -164,7 +164,7 @@ GEM execjs coffee-script-source (1.12.2) concurrent-ruby (1.2.2) - connection_pool (2.2.5) + connection_pool (2.4.1) crack (0.4.5) rexml crass (1.0.6) @@ -605,7 +605,7 @@ GEM puma (5.6.2) nio4r (~> 2.0) racc (1.6.2) - rack (2.2.6.4) + rack (2.2.8) rack-attack (6.6.1) rack (>= 1.0, < 3) rack-cors (1.1.1) @@ -747,10 +747,10 @@ GEM sentry-raven (3.1.2) faraday (>= 1.0) seven_zip_ruby (1.3.0) - sidekiq (6.4.1) - connection_pool (>= 2.2.2) + sidekiq (6.5.9) + connection_pool (>= 2.2.5, < 3) rack (~> 2.0) - redis (>= 4.2.0) + redis (>= 4.5.0, < 5) simplecov (0.19.1) docile (~> 1.1) simplecov-html (~> 0.11) @@ -861,7 +861,7 @@ DEPENDENCIES rspec-rails sendgrid-ruby sentry-raven - sidekiq + sidekiq (~> 6.5.6) spring spring-commands-rspec spring-watcher-listen From 03d6a7e964f94133792df096902d985ac42c0cd3 Mon Sep 17 00:00:00 2001 From: Fernando Blat Date: Wed, 27 Sep 2023 06:26:22 +0200 Subject: [PATCH 9/9] Log in info level --- config/environments/production.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/environments/production.rb b/config/environments/production.rb index 42feed6..d755e66 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -38,7 +38,7 @@ # Use the lowest log level to ensure availability of diagnostic information # when problems arise. - config.log_level = :debug + config.log_level = :info # Silence the cache store, the decidim-term_customizer module doesn't work otherwise # source: https://github.com/mainio/decidim-module-term_customizer/issues/38