Alon Bar-Lev has uploaded a new change for review. Change subject: packaging: setup: no need to use secure ssl in local host ......................................................................
packaging: setup: no need to use secure ssl in local host reduces complexity of setup. Change-Id: I51e1e70e1124f545b2fa26ee6717e53a8bc2b325 Signed-off-by: Alon Bar-Lev <[email protected]> --- M packaging/jasper-customizations/WEB-INF/applicationContext-ovirt-override.xml M packaging/legacy-setup/ovirt-engine-reports-setup.py 2 files changed, 2 insertions(+), 52 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-reports refs/changes/36/23536/1 diff --git a/packaging/jasper-customizations/WEB-INF/applicationContext-ovirt-override.xml b/packaging/jasper-customizations/WEB-INF/applicationContext-ovirt-override.xml index b1c1e27..ba94be9 100644 --- a/packaging/jasper-customizations/WEB-INF/applicationContext-ovirt-override.xml +++ b/packaging/jasper-customizations/WEB-INF/applicationContext-ovirt-override.xml @@ -31,9 +31,8 @@ <property name="authenticationManager"> <ref bean="authenticationManager"/> </property> - <property name="getSessionUserServletURL" value="http://localhost/ovirt-engine/services/get-session-user"/> - <property name="sslTrustStorePath" value="/usr/local/jboss-as/truststore"/> - <property name="sslTrustStorePassword" value="NoSoup4U"/> + <property name="getSessionUserServletURL" value="https://localhost/ovirt-engine/services/get-session-user"/> + <property name="sslInsecure" value="true"/> </bean> <bean class="org.ovirt.jasperreports.querymodifier.CustomOvirtReportsQueryManipulator" id="CustomOvirtReportsQueryManipulator"> diff --git a/packaging/legacy-setup/ovirt-engine-reports-setup.py b/packaging/legacy-setup/ovirt-engine-reports-setup.py index b21998f..ca14d48 100755 --- a/packaging/legacy-setup/ovirt-engine-reports-setup.py +++ b/packaging/legacy-setup/ovirt-engine-reports-setup.py @@ -902,52 +902,6 @@ node.unlinkNode() xml_editor.close() -def updateApplicationSecurity(): - """ - Setting the SSO solution - """ - file_content = '' - protocol, fqdn, port = getHostParams() - logging.debug("downloading certificates %s://%s:%s" % (protocol, fqdn, port)) - if protocol == 'https': - utils.execCmd( - cmdList=( - SSL2JKSTRUST, - '--host=%s' % fqdn, - '--port=%s' % port, - '--keystore=%s' % OVIRT_REPORTS_TRUST_STORE, - '--storepass=%s' % OVIRT_REPORTS_TRUST_STORE_PASS, - ), - failOnError=True, - ) - logging.debug("editing applicationContext-ovirt-override file") - protocol, fqdn, port = getHostParams() - hostGetSessionUserUrl = ( - '{proto}://{fqdn}:{port}/ovirt-engine/services/get-session-user' - ).format( - proto=protocol, - fqdn=fqdn, - port=port, - ) - with open(FILE_APPLICATION_CONTEXT_OVERRIDE, "r") as fd: - file_content = fd.read() - - logging.debug("replace servlet URL") - file_content = file_content.replace("http://localhost/ovirt-engine/services/get-session-user";, hostGetSessionUserUrl) - - logging.debug("replace trust store path and pass") - file_content = file_content.replace( - "name=\"sslTrustStorePath\" value=\"/usr/local/jboss-as/truststore\"", - "name=\"sslTrustStorePath\" value=\"%s\"" % OVIRT_REPORTS_TRUST_STORE - ) - file_content = file_content.replace( - "name=\"sslTrustStorePassword\" value=\"NoSoup4U\"", - "name=\"sslTrustStorePassword\" value=\"%s\"" % OVIRT_REPORTS_TRUST_STORE_PASS - ) - logging.debug("writing replaced content to %s" % FILE_APPLICATION_CONTEXT_OVERRIDE) - with open(FILE_APPLICATION_CONTEXT_OVERRIDE, "w") as fd: - fd.write(file_content) - @transactionDisplay("Running post setup steps") def configureRepository(): """ @@ -1203,9 +1157,6 @@ # Edit Data Sources Driver Info updateDsJdbc() - - # Setup the SSO - updateApplicationSecurity() #Run post setup steps - disable unused users, set theme, change superuser password if needed configureRepository() -- To view, visit http://gerrit.ovirt.org/23536 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I51e1e70e1124f545b2fa26ee6717e53a8bc2b325 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-reports Gerrit-Branch: master Gerrit-Owner: Alon Bar-Lev <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
