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.

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

ansible: allow for blank DB passwords #141

Merged
merged 1 commit into from Apr 5, 2019
Merged
Changes from all commits
Commits
File filter...
Filter file types
Jump to…
Jump to file or symbol
Failed to load files and symbols.
+3 −3
Diff settings

Always

Just for now

@@ -48,7 +48,8 @@ org.killbill.billing.osgi.dao.mysqlServerVersion={{ lookup('env', 'KILLBILL_DAO_
{% endif %}
{% if lookup('env', 'KILLBILL_OSGI_DAO_PASSWORD') %}
org.killbill.billing.osgi.dao.password={{ lookup('env', 'KILLBILL_OSGI_DAO_PASSWORD') }}
{% elif lookup('env', 'KILLBILL_DAO_PASSWORD') %}
{% else %}
{# Allow for blank passwords (SSL certificates usecase) #}
org.killbill.billing.osgi.dao.password={{ lookup('env', 'KILLBILL_DAO_PASSWORD') }}
{% endif %}
{% if lookup('env', 'KILLBILL_OSGI_DAO_POOLING_TYPE') %}
@@ -132,9 +133,8 @@ org.killbill.dao.minIdle={{ lookup('env', 'KILLBILL_DAO_MIN_IDLE') }}
{% if lookup('env', 'KILLBILL_DAO_MYSQL_SERVER_VERSION') %}
org.killbill.dao.mysqlServerVersion={{ lookup('env', 'KILLBILL_DAO_MYSQL_SERVER_VERSION') }}
{% endif %}
{% if lookup('env', 'KILLBILL_DAO_PASSWORD') %}
{# Allow for blank passwords (SSL certificates usecase) #}
org.killbill.dao.password={{ lookup('env', 'KILLBILL_DAO_PASSWORD') }}
{% endif %}
This conversation was marked as resolved by pierre

This comment has been minimized.

Copy link
@sbrossie

sbrossie Apr 4, 2019

Member

If i understand correctly, before we would first check if such env variable exists before calling lookup and setting the value for org.killbill.dao.password; with the change, we now always set the value for org.killbill.dao.password based on the result of the lookup method which could then be empty and therefore allows us to have an empty pwd for SSL ?

This comment has been minimized.

Copy link
@pierre

pierre Apr 5, 2019

Author Member

Yup - otherwise we default to the hardcoded value in config-magic (killbill).

{% if lookup('env', 'KILLBILL_DAO_POOLING_TYPE') %}
org.killbill.dao.poolingType={{ lookup('env', 'KILLBILL_DAO_POOLING_TYPE') }}
{% endif %}
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.