zabbix: stop shipping sysctl.d conf in package

The sysctl file increases max files to allow the default full
complement of discovery workers, however this is probably not a
hard requirement and such a conf not shipped elsewhere in tree, so
leave that to the user to configure. (The syslog messages from
zabbix-server and/or zabbix-proxy provided the needed information).

Signed-off-by: Daniel F. Dickinson <redacted>

diff --git a/admin/zabbix/Makefile b/admin/zabbix/Makefile
index b53ea9df9d9716810b4ff3a99cc4838f7431b139..000734f9caf0f965d9f54a1746dd0f4a55ee591e 100644 (file)
--- a/admin/zabbix/Makefile
+++ b/admin/zabbix/Makefile
@@ -542,7 +542,6 @@ define Package/zabbix-server/conffiles
 /etc/zabbix_server.conf
 /etc/zabbix_server.conf.d/
 /etc/config/zabbix_server
-/etc/sysctl.d/90-zabbix-discovery-workers.conf
 endef
 
 define Package/zabbix-server/install
@@ -550,8 +549,6 @@ define Package/zabbix-server/install
        $(call Package/zabbix/install/sbin,$(1),server)
        $(call Package/zabbix/install/etc,$(1),server)
        $(call Package/zabbix/install/init.d,$(1),server)
-       $(INSTALL_DIR) $(1)/etc/sysctl.d
-       $(INSTALL_CONF) ./files/zabbix-discovery-workers.conf.sysctl $(1)/etc/sysctl.d/90-zabbix-discovery-workers.conf
        $(INSTALL_DIR) $(1)/etc/config
        $(INSTALL_CONF) ./files/zabbix_server.config $(1)/etc/config/zabbix_server
        $(INSTALL_DIR) $(1)/etc/uci-defaults

diff --git a/admin/zabbix/files/zabbix-discovery-workers.conf.sysctl b/admin/zabbix/files/zabbix-discovery-workers.conf.sysctl
deleted file mode 100644 (file)
index e88c239..0000000
--- a/admin/zabbix/files/zabbix-discovery-workers.conf.sysctl
+++ /dev/null
@@ -1 +0,0 @@
-fs.file-max=100000