Juan Hernandez has uploaded a new change for review. Change subject: packaging: Allow passwordless database connection ......................................................................
packaging: Allow passwordless database connection Currently if no database password is provided in the configuration the engine will not be able to connect to the database, even if the database doesn't require a password (it is configured with "trust" mode). This patch changes the start script so that it will allow this passwordless connections as this is what we currently do in development environments. Change-Id: I1c51485720aa7e3289a067e2677239a44d689bf1 Signed-off-by: Juan Hernandez <[email protected]> --- M packaging/fedora/engine-service.xml.in 1 file changed, 16 insertions(+), 10 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/83/10983/1 diff --git a/packaging/fedora/engine-service.xml.in b/packaging/fedora/engine-service.xml.in index 66bc8ce..eedf03d 100644 --- a/packaging/fedora/engine-service.xml.in +++ b/packaging/fedora/engine-service.xml.in @@ -96,7 +96,11 @@ <prefill>true</prefill> </pool> <security> - <security-domain>EncryptDBPassword</security-domain> + #if $getString('ENGINE_DB_PASSWORD') + <security-domain>EncryptDBPassword</security-domain> + #else + <user-name><![CDATA[$getString('ENGINE_DB_USER')]]></user-name> + #end if </security> <statement> <prepared-statement-cache-size>100</prepared-statement-cache-size> @@ -215,15 +219,17 @@ </authentication> </security-domain> - <security-domain name="EncryptDBPassword"> - <authentication> - <login-module code="org.picketbox.datasource.security.SecureIdentityLoginModule" flag="required"> - <module-option name="username" value="$getString('ENGINE_DB_USER')"/> - <module-option name="password" value="$getString('ENGINE_DB_PASSWORD')"/> - <module-option name="managedConnectionFactoryName" value="jboss.jca:name=ENGINEDataSource,service=LocalTxCM"/> - </login-module> - </authentication> - </security-domain> + #if $getString('ENGINE_DB_PASSWORD') + <security-domain name="EncryptDBPassword"> + <authentication> + <login-module code="org.picketbox.datasource.security.SecureIdentityLoginModule" flag="required"> + <module-option name="username" value="$getString('ENGINE_DB_USER')"/> + <module-option name="password" value="$getString('ENGINE_DB_PASSWORD')"/> + <module-option name="managedConnectionFactoryName" value="jboss.jca:name=ENGINEDataSource,service=LocalTxCM"/> + </login-module> + </authentication> + </security-domain> + #end if </security-domains> </subsystem> -- To view, visit http://gerrit.ovirt.org/10983 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1c51485720aa7e3289a067e2677239a44d689bf1 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Juan Hernandez <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
