Mirrored_Repos/docker-atlassian-confluence-server
1
0
Fork 0
mirror of https://bitbucket.org/atlassian-docker/docker-atlassian-confluence-server.git synced 2024-08-30 18:22:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

DCCLIP-586: Added secret store class support.

Browse Source
This commit is contained in:
Yifei Zhang 2023-09-18 11:15:04 +10:00
parent cda8d93331
commit b8bed7ea61
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
config/confluence.cfg.xml.j2
View File

@ -26,6 +26,9 @@
<property name="hibernate.connection.url">{{ atl_jdbc_url }}</property> <property name="hibernate.connection.url">{{ atl_jdbc_url }}</property>
<property name="hibernate.connection.username">{{ atl_jdbc_user }}</property> <property name="hibernate.connection.username">{{ atl_jdbc_user }}</property>
{% if atl_jdbc_secret_class is defined %}
<property name="jdbc.password.decrypter.classname">{{ atl_jdbc_secret_class }}</property>
{% endif %}
<property name="hibernate.connection.password">{{ atl_jdbc_password }}</property> <property name="hibernate.connection.password">{{ atl_jdbc_password }}</property>
<property name="hibernate.connection.driver_class">{{ databases[atl_db_type][0] }}</property> <property name="hibernate.connection.driver_class">{{ databases[atl_db_type][0] }}</property>
<property name="hibernate.dialect">com.atlassian.confluence.impl.hibernate.dialect.{{ databases[atl_db_type][1] }}</property> <property name="hibernate.dialect">com.atlassian.confluence.impl.hibernate.dialect.{{ databases[atl_db_type][1] }}</property>

2
tests/test_image.py
View File

@ -314,6 +314,7 @@ def test_confluence_xml_postgres_c3p0(docker_cli, image, run_user):
'ATL_JDBC_URL': 'atl_jdbc_url', 'ATL_JDBC_URL': 'atl_jdbc_url',
'ATL_JDBC_USER': 'atl_jdbc_user', 'ATL_JDBC_USER': 'atl_jdbc_user',
'ATL_JDBC_PASSWORD': 'atl_jdbc_password', 'ATL_JDBC_PASSWORD': 'atl_jdbc_password',
'ATL_JDBC_SECRET_CLASS': 'atl_jdbc_secret_class',
} }
container = run_image(docker_cli, image, user=run_user, environment=environment) container = run_image(docker_cli, image, user=run_user, environment=environment)
_jvm = wait_for_proc(container, get_bootstrap_proc(container)) _jvm = wait_for_proc(container, get_bootstrap_proc(container))
@ -322,6 +323,7 @@ def test_confluence_xml_postgres_c3p0(docker_cli, image, run_user):
assert xml.findall('.//property[@name="hibernate.connection.url"]')[0].text == "atl_jdbc_url" assert xml.findall('.//property[@name="hibernate.connection.url"]')[0].text == "atl_jdbc_url"
assert xml.findall('.//property[@name="hibernate.connection.username"]')[0].text == "atl_jdbc_user" assert xml.findall('.//property[@name="hibernate.connection.username"]')[0].text == "atl_jdbc_user"
assert xml.findall('.//property[@name="hibernate.connection.password"]')[0].text == "atl_jdbc_password" assert xml.findall('.//property[@name="hibernate.connection.password"]')[0].text == "atl_jdbc_password"
assert xml.findall('.//property[@name="jdbc.password.decrypter.classname"]')[0].text == "atl_jdbc_secret_class"
assert xml.findall('.//property[@name="confluence.database.choice"]')[0].text == "postgresql" assert xml.findall('.//property[@name="confluence.database.choice"]')[0].text == "postgresql"
assert xml.findall('.//property[@name="hibernate.dialect"]')[0].text == "com.atlassian.confluence.impl.hibernate.dialect.PostgreSQLDialect" assert xml.findall('.//property[@name="hibernate.dialect"]')[0].text == "com.atlassian.confluence.impl.hibernate.dialect.PostgreSQLDialect"
assert xml.findall('.//property[@name="hibernate.connection.driver_class"]')[0].text == "org.postgresql.Driver" assert xml.findall('.//property[@name="hibernate.connection.driver_class"]')[0].text == "org.postgresql.Driver"