Change in ovirt-engine[master]: packaging: less intrusive method for httpd integration

juan.hernandez at redhat.com juan.hernandez at redhat.com
Tue Apr 9 07:33:25 UTC 2013


Juan Hernandez has submitted this change and it was merged.

Change subject: packaging: less intrusive method for httpd integration
......................................................................


packaging: less intrusive method for httpd integration

CURRENT IMPLEMENTATION

ovirt-engine proxy all requests, disallow any additional application to
be hosted on the same web server.

NEW IMPLEMENTATION

proxy only ovirt-engine URI prefixes. By default ovirt-engine is at:

  http://host/ovirt-engine

Optionally add redirect from / to /ovirt-engine during setup.

SIDE EFFECTS

In order to handle redirects of 404.html, we require some valid URI to
redirect into, as a result the welcome page of root will not be
index.html but ovirt-engine.html, same for style.css which was renamed
to ovirt-engine-style.css

Change-Id: I89a47a99e28de0905183dc502cb0b35c80f77e6d
Signed-off-by: Alex Lourie <alourie at redhat.com>
Signed-off-by: Alon Bar-Lev <alonbl at redhat.com>
---
M Makefile
M backend/manager/modules/root/src/main/webapp/404.html
M backend/manager/modules/root/src/main/webapp/WEB-INF/web.xml
R backend/manager/modules/root/src/main/webapp/ovirt-engine-style.css
R backend/manager/modules/root/src/main/webapp/ovirt-engine.html
M frontend/webadmin/modules/userportal-gwtp/src/main/webapp/404.html
M frontend/webadmin/modules/webadmin/src/main/webapp/404.html
M packaging/fedora/setup/basedefs.py
M packaging/fedora/setup/engine-cleanup.py
M packaging/fedora/setup/engine-setup.py
M packaging/fedora/setup/engine_validators.py
M packaging/fedora/setup/output_messages.py
M packaging/fedora/setup/ovirt-engine-proxy.conf.in
A packaging/fedora/setup/ovirt-engine-root-redirect.conf.in
14 files changed, 127 insertions(+), 43 deletions(-)

Approvals:
  Juan Hernandez: Verified; Looks good to me, approved


--
To view, visit http://gerrit.ovirt.org/13318
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I89a47a99e28de0905183dc502cb0b35c80f77e6d
Gerrit-PatchSet: 22
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Alex Lourie <alourie at redhat.com>
Gerrit-Reviewer: Alex Lourie <alourie at redhat.com>
Gerrit-Reviewer: Alexander Wels <awels at redhat.com>
Gerrit-Reviewer: Alon Bar-Lev <alonbl at redhat.com>
Gerrit-Reviewer: Einav Cohen <ecohen at redhat.com>
Gerrit-Reviewer: Juan Hernandez <juan.hernandez at redhat.com>
Gerrit-Reviewer: Michael Pasternak <mpastern at redhat.com>
Gerrit-Reviewer: Moran Goldboim <mgoldboi at redhat.com>
Gerrit-Reviewer: Ofer Schreiber <oschreib at redhat.com>
Gerrit-Reviewer: Sandro Bonazzola <sbonazzo at redhat.com>
Gerrit-Reviewer: Vojtech Szocs <vszocs at redhat.com>
Gerrit-Reviewer: Yair Zaslavsky <yzaslavs at redhat.com>



More information about the Engine-commits mailing list