Alon Bar-Lev has uploaded a new change for review.
Change subject: packaging: engine-service: remove limits.d file
......................................................................
packaging: engine-service: remove limits.d file
the limits.d file is not used as service applies rlimit on its own.
in future systemd and sysv script will this this on behalf of the
service.
the limits.d file is unused and will remain unused.
Change-Id: I35e00bb4756e590e3c7e463b5d758bbb00de4a43
Signed-off-by: Alon Bar-Lev <alo...@redhat.com>
---
M Makefile
D packaging/fedora/engine-service.limits
M packaging/fedora/spec/ovirt-engine.spec.in
3 files changed, 0 insertions(+), 7 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/95/13495/1
diff --git a/Makefile b/Makefile
index ad69267..bcf822e 100644
--- a/Makefile
+++ b/Makefile
@@ -231,7 +231,6 @@
@install -dm 755 $(DESTDIR)$(PKG_SYSCONF_DIR)/engine-config
@install -dm 755 $(DESTDIR)$(PKG_SYSCONF_DIR)/engine-manage-domains
@install -dm 755 $(DESTDIR)$(SYSCONF_DIR)/cron.daily
- @install -dm 755 $(DESTDIR)$(SYSCONF_DIR)/security/limits.d
@install -dm 755 $(DESTDIR)$(SYSCONF_DIR)/rc.d/init.d
@install -dm 755 $(DESTDIR)$(SYSCONF_DIR)/firewalld/services
@@ -413,7 +412,6 @@
install -m 644 packaging/fedora/engine-service.xml.in
$(DESTDIR)$(DATA_DIR)/service
install -m 644 packaging/fedora/engine-service-logging.properties.in
$(DESTDIR)$(DATA_DIR)/service
install -m 755 packaging/fedora/engine-service.py
$(DESTDIR)$(DATA_DIR)/service
- install -m 644 packaging/fedora/engine-service.limits
$(DESTDIR)$(SYSCONF_DIR)/security/limits.d/10-$(ENGINE_NAME).conf
# Install the links:
ln -sf $(DATA_DIR)/service/engine-service.py
$(DESTDIR)$(BIN_DIR)/engine-service
diff --git a/packaging/fedora/engine-service.limits
b/packaging/fedora/engine-service.limits
deleted file mode 100644
index 851c4eb..0000000
--- a/packaging/fedora/engine-service.limits
+++ /dev/null
@@ -1,4 +0,0 @@
-# The default max number of open files is 1024 and it is not
-# enough for the engine:
-
-ovirt - nofile 65535
diff --git a/packaging/fedora/spec/ovirt-engine.spec.in
b/packaging/fedora/spec/ovirt-engine.spec.in
index e83dfe2..b8c3021 100644
--- a/packaging/fedora/spec/ovirt-engine.spec.in
+++ b/packaging/fedora/spec/ovirt-engine.spec.in
@@ -428,7 +428,6 @@
%dir %{engine_etc}/engine.conf.d
# Files needed by the service:
-%config(noreplace) %{_sysconfdir}/security/limits.d/10-ovirt-engine.conf
%{engine_data}/service
%{_bindir}/engine-service
%if %{install_systemd}
--
To view, visit http://gerrit.ovirt.org/13495
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I35e00bb4756e590e3c7e463b5d758bbb00de4a43
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Alon Bar-Lev <alo...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
