Alon Bar-Lev has uploaded a new change for review. Change subject: novnc: handle package config properly ......................................................................
novnc: handle package config properly currently no configuration is loaded from /etc at all. Change-Id: Iece7ff23e61281231e646b3e727ee5399c854220 Signed-off-by: Alon Bar-Lev <[email protected]> --- M Makefile M ovirt-engine.spec.in 2 files changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/91/15191/1 diff --git a/Makefile b/Makefile index 5405166..a839126 100644 --- a/Makefile +++ b/Makefile @@ -128,6 +128,7 @@ -e "s|@ENGINE_NOTIFIER_DEFAULTS@|$(DATA_DIR)/conf/notifier.conf.defaults|g" \ -e "s|@ENGINE_NOTIFIER_VARS@|$(PKG_SYSCONF_DIR)/notifier/notifier.conf|g" \ -e "s|@ENGINE_WSPROXY_DEFAULT_FILE@|$(DATA_DIR)/conf/ovirt-websocket-proxy.conf.defaults|g" \ + -e "s|@ENGINE_WSPROXY_VARS@|$(PKG_SYSCONF_DIR)/ovirt-websocket-proxy.conf|g" \ -e "s|@ENGINE_USER@|$(PKG_USER)|g" \ -e "s|@ENGINE_GROUP@|$(PKG_GROUP)|g" \ -e "s|@ENGINE_ETC@|$(PKG_SYSCONF_DIR)|g" \ @@ -448,6 +449,7 @@ install -dm 755 $(DESTDIR)$(PKG_SYSCONF_DIR)/engine.conf.d install -m 755 packaging/resources/ovirtlogrot.sh ${DESTDIR}$(DATA_DIR)/scripts/ install -m 755 packaging/resources/ovirt-cron ${DESTDIR}$(SYSCONF_DIR)/cron.daily/ + install -dm 755 $(DESTDIR)$(PKG_SYSCONF_DIR)/ovirt-websocket-proxy.conf.d install -m 644 packaging/conf/ovirt-websocket-proxy.conf.defaults $(DESTDIR)$(DATA_DIR)/conf # Service common diff --git a/ovirt-engine.spec.in b/ovirt-engine.spec.in index f1b9dbe..3b078f7 100644 --- a/ovirt-engine.spec.in +++ b/ovirt-engine.spec.in @@ -787,6 +787,7 @@ %files websocket-proxy +%dir %{engine_etc}/ovirt-websocket-proxy.conf.d %{engine_data}/conf/ovirt-websocket-proxy.conf.defaults %{engine_data}/services/ovirt-websocket-proxy.* %{engine_data}/services/config.py* -- To view, visit http://gerrit.ovirt.org/15191 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iece7ff23e61281231e646b3e727ee5399c854220 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Alon Bar-Lev <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
