Alon Bar-Lev has uploaded a new change for review. Change subject: packaging: engine-service: allow service user customization ......................................................................
packaging: engine-service: allow service user customization Change-Id: Ie71a3a56c77e29aea87b955dc82cd194e88c3582 Signed-off-by: Alon Bar-Lev <[email protected]> --- M .gitignore M Makefile R packaging/fedora/engine-service.limits.in M packaging/fedora/spec/ovirt-engine.spec.in 4 files changed, 9 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/85/13485/1 diff --git a/.gitignore b/.gitignore index 7bc5a96..62b12fb 100644 --- a/.gitignore +++ b/.gitignore @@ -48,4 +48,5 @@ backend/manager/tools/src/main/conf/engine-manage-domains-log4j.xml backend/manager/tools/src/main/conf/engine-notifier-log4j.xml packaging/fedora/engine-service.py +packaging/fedora/engine-service.limits packaging/fedora/spec/ovirt-engine.spec diff --git a/Makefile b/Makefile index e123c0c..5bd1d18 100644 --- a/Makefile +++ b/Makefile @@ -53,6 +53,8 @@ PKG_CACHE_DIR=$(LOCALSTATE_DIR)/cache/$(ENGINE_NAME) PKG_LOG_DIR=$(LOCALSTATE_DIR)/log/$(ENGINE_NAME) PKG_TMP_DIR=$(LOCALSTATE_DIR)/tmp/$(ENGINE_NAME) +PKG_USER=ovirt +PKG_GROUP=ovirt RPMBUILD=rpmbuild PYTHON=python PYTHON_DIR:=$(shell $(PYTHON) -c "from distutils.sysconfig import get_python_lib as f;print(f())") @@ -98,6 +100,8 @@ sed \ -e "s|@ENGINE_DEFAULTS@|$(DATA_DIR)/conf/engine.conf.defaults|" \ -e "s|@ENGINE_VARS@|$(PKG_SYSCONF_DIR)/engine.conf|" \ + -e "s|@ENGINE_USER@|$(PKG_USER)|" \ + -e "s|@ENGINE_GROUP@|$(PKG_GROUP)|" \ -e "s|@ENGINE_ETC@|$(PKG_SYSCONF_DIR)|" \ -e "s|@ENGINE_PKI@|$(PKG_PKI_DIR)|" \ -e "s|@ENGINE_LOG@|$(PKG_LOG_DIR)|" \ @@ -120,6 +124,7 @@ backend/manager/tools/src/main/conf/engine-manage-domains-log4j.xml \ backend/manager/tools/src/main/conf/engine-notifier-log4j.xml \ packaging/fedora/engine-service.py \ + packaging/fedora/engine-service.limits \ packaging/fedora/spec/ovirt-engine.spec \ $(NULL) diff --git a/packaging/fedora/engine-service.limits b/packaging/fedora/engine-service.limits.in similarity index 74% rename from packaging/fedora/engine-service.limits rename to packaging/fedora/engine-service.limits.in index 851c4eb..9ff8175 100644 --- a/packaging/fedora/engine-service.limits +++ b/packaging/fedora/engine-service.limits.in @@ -1,4 +1,4 @@ # The default max number of open files is 1024 and it is not # enough for the engine: -ovirt - nofile 65535 +@ENGINE_USER@ - nofile 65535 diff --git a/packaging/fedora/spec/ovirt-engine.spec.in b/packaging/fedora/spec/ovirt-engine.spec.in index ea54f7e..12d237d 100644 --- a/packaging/fedora/spec/ovirt-engine.spec.in +++ b/packaging/fedora/spec/ovirt-engine.spec.in @@ -96,6 +96,8 @@ PKG_CACHE_DIR=%{engine_cache} \\\ PKG_LOG_DIR=%{engine_log} \\\ PKG_TMP_DIR=%{engine_tmp} \\\ + PKG_USER=%{engine_user} \\\ + PKG_GROUP=%{engine_group} \\\ %{?BUILD_FLAGS:BUILD_FLAGS="%{BUILD_FLAGS}"} \\\ %{?EXTRA_BUILD_FLAGS:EXTRA_BUILD_FLAGS="%{EXTRA_BUILD_FLAGS}"} -- To view, visit http://gerrit.ovirt.org/13485 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie71a3a56c77e29aea87b955dc82cd194e88c3582 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
