Alon Bar-Lev has uploaded a new change for review. Change subject: packaging: setup: add README file to configuration drop dirs ......................................................................
packaging: setup: add README file to configuration drop dirs Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1020675 Change-Id: I17797e329be28ba938fbc4c57703aa2d3517ec15 Signed-off-by: Alon Bar-Lev <[email protected]> --- M .gitignore M Makefile M ovirt-engine.spec.in A packaging/etc/engine.conf.d/README.in A packaging/etc/notifier/notifier.conf.d/README.in A packaging/etc/ovirt-websocket-proxy.conf.d/README.in 6 files changed, 36 insertions(+), 6 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/81/20381/1 diff --git a/.gitignore b/.gitignore index 222031d..fb33e33 100644 --- a/.gitignore +++ b/.gitignore @@ -49,7 +49,10 @@ packaging/etc/engine-config/log4j.xml packaging/etc/engine-manage-domains/engine-manage-domains.conf packaging/etc/engine-manage-domains/log4j.xml +packaging/etc/engine.conf.d/README packaging/etc/notifier/log4j.xml +packaging/etc/notifier/notifier.conf.d/README +packaging/etc/ovirt-websocket-proxy.conf.d/README packaging/pythonlib/ovirt_engine/config.py packaging/services/*/*.conf packaging/services/*/*.systemd diff --git a/Makefile b/Makefile index a42f02f..6047d31 100644 --- a/Makefile +++ b/Makefile @@ -158,7 +158,10 @@ packaging/etc/engine-config/log4j.xml \ packaging/etc/engine-manage-domains/engine-manage-domains.conf \ packaging/etc/engine-manage-domains/log4j.xml \ + packaging/etc/engine.conf.d/README \ packaging/etc/notifier/log4j.xml \ + packaging/etc/notifier/notifier.conf.d/README \ + packaging/etc/ovirt-websocket-proxy.conf.d/README \ packaging/pythonlib/ovirt_engine/config.py \ packaging/services/ovirt-engine-notifier/config.py \ packaging/services/ovirt-engine-notifier/ovirt-engine-notifier.conf \ @@ -361,9 +364,6 @@ ln -sf "$(DATA_DIR)/bin/engine-manage-domains.sh" "$(DESTDIR)$(BIN_DIR)/engine-manage-domains" ln -sf "$(DATA_DIR)/bin/engine-backup.sh" "$(DESTDIR)$(BIN_DIR)/engine-backup" - install -d -m 755 "$(DESTDIR)$(PKG_SYSCONF_DIR)/notifier/notifier.conf.d" - install -d -m 755 "$(DESTDIR)$(PKG_SYSCONF_DIR)/engine.conf.d" - install -d -m 755 "$(DESTDIR)$(PKG_SYSCONF_DIR)/ovirt-websocket-proxy.conf.d" install -d -m 755 "$(DESTDIR)$(PKG_PKI_DIR)/certs" install -d -m 755 "$(DESTDIR)$(PKG_PKI_DIR)/keys" install -d -m 750 "$(DESTDIR)$(PKG_PKI_DIR)/private" diff --git a/ovirt-engine.spec.in b/ovirt-engine.spec.in index 76bee03..3bebc71 100644 --- a/ovirt-engine.spec.in +++ b/ovirt-engine.spec.in @@ -710,12 +710,12 @@ %dir %{engine_data}/services %dir %{engine_etc} %dir %{engine_etc}/branding -%dir %{engine_etc}/engine.conf.d %dir %{engine_java} %doc LICENSE %ghost %config(noreplace) %{engine_etc}/engine.conf %{engine_data}/branding/ovirt.brand/ %{engine_etc}/branding/00-ovirt.brand +%{engine_etc}/engine.conf.d/ %{engine_java}/common.jar %{engine_java}/compat.jar %{engine_java}/utils.jar @@ -886,8 +886,8 @@ %files websocket-proxy -%dir %{engine_etc}/ovirt-websocket-proxy.conf.d %{engine_data}/services/ovirt-websocket-proxy +%{engine_etc}/ovirt-websocket-proxy.conf.d/ %if %{ovirt_install_systemd} %{_unitdir}/ovirt-websocket-proxy.service @@ -907,7 +907,6 @@ %dir %{engine_etc}/engine-config %dir %{engine_etc}/engine-manage-domains %dir %{engine_etc}/notifier -%dir %{engine_etc}/notifier/notifier.conf.d %ghost %config(noreplace) %{engine_etc}/notifier/notifier.conf %{_bindir}/engine-config %{_bindir}/engine-manage-domains @@ -921,6 +920,7 @@ %{engine_etc}/engine-config/engine-config.*properties %{engine_etc}/engine-config/log4j.xml %{engine_etc}/engine-manage-domains/log4j.xml +%{engine_etc}/notifier/notifier.conf.d/ %{engine_java}/tools.jar %if %{ovirt_install_poms} diff --git a/packaging/etc/engine.conf.d/README.in b/packaging/etc/engine.conf.d/README.in new file mode 100644 index 0000000..140aea8 --- /dev/null +++ b/packaging/etc/engine.conf.d/README.in @@ -0,0 +1,9 @@ +ovirt-engine service configuration directory + +Only *.conf are considered. + +Files are sorted by name, last wins. + +Variables available at: + + @ENGINE_USR@/services/ovirt-engine/ovirt-engine.conf diff --git a/packaging/etc/notifier/notifier.conf.d/README.in b/packaging/etc/notifier/notifier.conf.d/README.in new file mode 100644 index 0000000..cb8a8ed --- /dev/null +++ b/packaging/etc/notifier/notifier.conf.d/README.in @@ -0,0 +1,9 @@ +ovirt-engine-notifier service configuration directory + +Only *.conf are considered. + +Files are sorted by name, last wins. + +Variables available at: + + @ENGINE_USR@/services/ovirt-engine-notifier/ovirt-engine-notifier.conf diff --git a/packaging/etc/ovirt-websocket-proxy.conf.d/README.in b/packaging/etc/ovirt-websocket-proxy.conf.d/README.in new file mode 100644 index 0000000..3952c40 --- /dev/null +++ b/packaging/etc/ovirt-websocket-proxy.conf.d/README.in @@ -0,0 +1,9 @@ +ovirt-websocket-proxy service configuration directory + +Only *.conf are considered. + +Files are sorted by name, last wins. + +Variables available at: + + @ENGINE_USR@/services/ovirt-websocket-proxy/ovirt-websocket-proxy.conf -- To view, visit http://gerrit.ovirt.org/20381 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I17797e329be28ba938fbc4c57703aa2d3517ec15 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
