Skip to content
This repository has been archived by the owner on May 27, 2024. It is now read-only.

Fit2you projects new #3

Open
wants to merge 40 commits into
base: fit2you-projects
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
7960e8d
Revert version of ruby from amazon repository
neo87cs Apr 14, 2021
ba1f277
Add a little wrapper to converge confs
neo87cs Apr 15, 2021
e279093
Put ruby back to 2.3.4
neo87cs Apr 15, 2021
b7b6cc0
Fix env creation
neo87cs Apr 16, 2021
85d2a82
Set link creation if possible
neo87cs Apr 16, 2021
8827eb0
Add missing do
neo87cs Apr 16, 2021
d238cd9
remove env wrapping
neo87cs Apr 16, 2021
55b9317
Add preprod rule to hurricane database copy
neo87cs Apr 16, 2021
c23940b
Externalize to default recipe symlink creation
neo87cs Apr 20, 2021
7d5c9cc
move declarations
neo87cs Apr 20, 2021
8482728
Refactor preprod creator
neo87cs Apr 20, 2021
3213457
Add missing file
neo87cs Apr 20, 2021
8f44749
Fix naming
neo87cs Apr 20, 2021
439e056
Add preprod conf for lumen
neo87cs Apr 20, 2021
8dd1775
Test fix
neo87cs Apr 23, 2021
cce920c
Revert fix
neo87cs Apr 23, 2021
9f6b126
Change exec order
neo87cs Apr 23, 2021
d7fd86f
add config for print preprod
neo87cs Apr 23, 2021
e6d3fee
Add env
neo87cs Apr 23, 2021
3393524
Add debugging
neo87cs Apr 23, 2021
94710d8
Remove preprod symlink
neo87cs Apr 23, 2021
b583a33
Remove preprod symlink direct creation
neo87cs Apr 27, 2021
b185075
Change patch version to 6
neo87cs May 6, 2021
2d92b51
Merge branch 'ruby-2.3.6' into ruby-version-revert
neo87cs May 6, 2021
f452b45
Add iubenda fallback configuration
neo87cs May 13, 2021
8d06b8d
Merge branch 'ruby-2.3.6' into ruby-version-revert
neo87cs May 13, 2021
d606208
Merge branch 'ruby-2.3.6' into fit2you-projects-new
neo87cs May 31, 2021
3bf35f4
Merge branch 'ruby-version-revert' into fit2you-projects-new
neo87cs May 31, 2021
93dc0b1
add extended timeout to avoid 504
neo87cs Jun 4, 2021
eff5034
Merge branch 'utf-8-encoding' into fit2you-projects-new
neo87cs Jun 11, 2021
9e4f11e
Change hostname based on public dns variable
neo87cs Jun 21, 2021
f5283c6
Merge pull request #5 from fit2you/hostname-change-public-dns
neo87cs Jun 21, 2021
c40e636
Externalize aviva bucket
neo87cs Jun 23, 2021
bc84f0e
Rca config
ilasorsa Jul 6, 2021
cd4c6a2
Rca config
ilasorsa Jul 6, 2021
0f39e38
Merge pull request #6 from fit2you/aviva-bucket
neo87cs Jul 8, 2021
b2cfa8b
Add a previnet property for hurricane print
ilasorsa Feb 21, 2022
ee387fe
Merge branch 'fit2you-projects' into fit2you-projects-new
neo87cs Jun 16, 2022
352a530
test new smtp confs
neo87cs Jun 16, 2022
aaf033f
test new smtp confs
neo87cs Jun 16, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
remove env wrapping
  • Loading branch information
neo87cs committed Apr 16, 2021
commit d238cd9e7c40ea5845455bb9414c55aaee4fd696
28 changes: 14 additions & 14 deletions deploy/recipes/hurricane-api.rb
Original file line number Diff line number Diff line change
@@ -5,7 +5,6 @@
node[:deploy].each do |application, deploy|

rails_env = deploy[:rails_env]
rails_env_fixed = rails_env=='preprod' ? 'staging' : rails_env
current_path = deploy[:current_path]

active_job_with_resque = (node[:hurricane_api_settings][:active_job].present? && node[:hurricane_api_settings][:active_job][:adapter] == 'resque')
@@ -48,7 +47,8 @@
owner deploy[:user]
group deploy[:group]
variables(
:hurricane_api_settings => node[:hurricane_api_settings]
:hurricane_api_settings => node[:hurricane_api_settings],
:env => rails_env
)
only_if do
File.exists?("#{deploy[:deploy_to]}/shared/config")
@@ -62,7 +62,7 @@
group deploy[:group]
variables(
:hurricane_api_settings => node[:hurricane_api_settings],
:env => rails_env_fixed
:env => rails_env
)
only_if do
File.exists?("#{deploy[:deploy_to]}/shared/config")
@@ -76,7 +76,7 @@
group deploy[:group]
variables(
:hurricane_api_settings => node[:hurricane_api_settings],
:env => rails_env_fixed
:env => rails_env
)
only_if do
File.exists?("#{deploy[:deploy_to]}/shared/config")
@@ -90,7 +90,7 @@
group deploy[:group]
variables(
:hurricane_api_settings => node[:hurricane_api_settings],
:env => rails_env_fixed
:env => rails_env
)
only_if do
File.exists?("#{deploy[:deploy_to]}/shared/config")
@@ -104,7 +104,7 @@
group deploy[:group]
variables(
:hurricane_api_settings => node[:hurricane_api_settings],
:env => rails_env_fixed
:env => rails_env
)
only_if do
File.exists?("#{deploy[:deploy_to]}/shared/config")
@@ -118,7 +118,7 @@
group deploy[:group]
variables(
:hurricane_api_settings => node[:hurricane_api_settings],
:env => rails_env_fixed
:env => rails_env
)
only_if do
File.exists?("#{deploy[:deploy_to]}/shared/config")
@@ -143,7 +143,7 @@
group deploy[:group]
variables(
:hurricane_api_settings => node[:hurricane_api_settings],
:env => rails_env_fixed
:env => rails_env
)
only_if do
File.exists?("#{deploy[:deploy_to]}/shared/config")
@@ -158,7 +158,7 @@
group deploy[:group]
variables(
:hurricane_api_settings => node[:hurricane_api_settings],
:env => rails_env_fixed
:env => rails_env
)
only_if do
File.exists?("#{deploy[:deploy_to]}/shared/config")
@@ -172,7 +172,7 @@
group deploy[:group]
variables(
:hurricane_api_settings => node[:hurricane_api_settings],
:env => rails_env_fixed
:env => rails_env
)
only_if do
File.exists?("#{deploy[:deploy_to]}/shared/config")
@@ -186,7 +186,7 @@
group deploy[:group]
variables(
:hurricane_api_settings => node[:hurricane_api_settings],
:env => rails_env_fixed
:env => rails_env
)
only_if do
File.exists?("#{deploy[:deploy_to]}/shared/config")
@@ -244,7 +244,7 @@
group deploy[:group]
variables(
:hurricane_api_settings => node[:hurricane_api_settings],
:env => rails_env_fixed
:env => rails_env
)
only_if do
active_job_with_resque && File.exists?("#{deploy[:deploy_to]}/shared/config")
@@ -257,7 +257,7 @@
action :restart
end

queue_name = ['hurricane_api', rails_env_fixed, 'queue'].join('_')
queue_name = ['hurricane_api', rails_env, 'queue'].join('_')
pid_file_name = ['resque_worker', queue_name, '.pid'].join
log_file_name = ['resque_worker', queue_name, '.log'].join
monit_resque_rc = File.join(node[:monit][:conf_dir], 'resque.monitrc')
@@ -273,7 +273,7 @@
:working_dir => deploy[:current_path],
:log_file => File.join(deploy[:deploy_to], 'shared', 'log', log_file_name),
:queue_name => queue_name,
:env => rails_env_fixed,
:env => rails_env,
:home => deploy[:home],
:user => deploy[:user]
)
5 changes: 1 addition & 4 deletions deploy/templates/default/hurricane-api/secrets.yml.erb
Original file line number Diff line number Diff line change
@@ -1,5 +1,2 @@
staging:
secret_key_base: <%= @hurricane_api_settings[:secret_key_base] %>

production:
<%= @env %>:
secret_key_base: <%= @hurricane_api_settings[:secret_key_base] %>