Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Citi OFN Voucher] Add Activerecord encryption configuration and VINE api config #942

Merged
merged 4 commits into from
Oct 9, 2024
Merged

[Citi OFN Voucher] Add Activerecord encryption configuration and VINE api config #942

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e6ecfa4
Update env template and secret example
rioug Oct 7, 2024
5a2129f
Check if variable are defined
rioug Oct 8, 2024
4a7d352
Add VINE_API_URL config
rioug Oct 8, 2024
b334214
Move vine_api_url to host_vars/*/config.yml
rioug Oct 8, 2024
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
9 changes: 9 additions & 0 deletions inventory/host_vars/_example.com/secrets.example.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,3 +88,12 @@ smtp_password:
#new_relic_agent_enabled: true
#new_relic_app_name: "Open Food Network"
#new_relic_license_key: "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"

# database encryption configuration, required for vine connected app
# generate with bin/rails db:encryption:init
#active_record_encryption_primary_key: "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
#active_record_encryption_deterministic_key: "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
#active_record_encryption_key_derivation_salt: "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"

# VINE API settings
#vine_api_url: "https://vine-url.com/api/v1"
rioug marked this conversation as resolved.
Show resolved Hide resolved
14 changes: 14 additions & 0 deletions roles/app/templates/env.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,4 +102,18 @@ NEW_RELIC_APP_NAME="{{ new_relic_app_name }}"
NEW_RELIC_LICENSE_KEY="{{ new_relic_license_key }}"
{% endif %}

{% if active_record_encryption_primary_key is defined %}
ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY="{{ active_record_encryption_primary_key }}"
{% endif %}
{% if active_record_encryption_deterministic_key is defined %}
ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY="{{ active_record_encryption_deterministic_key }}"
{% endif %}
{% if active_record_encryption_key_derivation_salt is defined %}
ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT="{{ active_record_encryption_key_derivation_salt }}"
{% endif %}

{% if vine_api_url is defined %}
VINE_API_URL="{{ vine_api_url }}"
{% endif %}
Comment on lines +115 to +117
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you think that a default would work instead?

Suggested change
{% if vine_api_url is defined %}
VINE_API_URL="{{ vine_api_url }}"
{% endif %}
VINE_API_URL="{{ vine_api_url | default('') }}"

Just a question, not a real suggestion.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The code handle a missing VINE_API_URL with an error saying the VINE api isn't configured. With an empty string default it would result in a API connection error which could be confusing when the issue is actually a missing configuration.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah yes, the code would need to check for the presence of the variable instead.


{{ custom_env_vars | default('') }}
Loading