Skip to content
Permalink
Browse files

Merge pull request #141 from killbill/fix-for-empty-db-password

ansible: allow for blank DB passwords
  • Loading branch information...
pierre committed Apr 5, 2019
2 parents f6f46a2 + 489605c commit f4ef18e9d8c16b00a6250c3c6ca49c9e6b2985c5
Showing with 3 additions and 3 deletions.
  1. +3 −3 ansible/templates/killbill/killbill.properties.j2
@@ -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 %}
{% if lookup('env', 'KILLBILL_DAO_POOLING_TYPE') %}
org.killbill.dao.poolingType={{ lookup('env', 'KILLBILL_DAO_POOLING_TYPE') }}
{% endif %}

0 comments on commit f4ef18e

Please sign in to comment.
You can’t perform that action at this time.