From a491bffa5f5ab6c2506a0505388d73ec6ed47f21 Mon Sep 17 00:00:00 2001 From: Joerg Deckert Date: Fri, 25 Jan 2019 14:00:03 +0100 Subject: [PATCH] zabbix: Zabbix 4.0 LTS, fix webapp permissions, PHP 7.2, kernel config 4.14.83 --- zabbix/Makefile | 19 ++++++++++++++++++- zabbix/kernel.config | 5 +++-- zabbix/make.conf | 3 ++- zabbix/package.keywords | 2 +- zabbix/package.mask | 4 ++-- zabbix/package.use | 5 +++-- 6 files changed, 29 insertions(+), 9 deletions(-) diff --git a/zabbix/Makefile b/zabbix/Makefile index 867ed93..56b66f9 100644 --- a/zabbix/Makefile +++ b/zabbix/Makefile @@ -54,8 +54,25 @@ postinstall: timesyncd.conf firstboot.start echo "zabbix-trapper 10051/udp Zabbix Trapper" >> $(CHROOT)/etc/services # Install Zabbix webapp - $(inroot)webapp-config -h localhost -d zabbix -I zabbix `ls $(CHROOT)/usr/share/webapps/zabbix` + $(inroot) webapp-config -h localhost -d zabbix -I zabbix `ls $(CHROOT)/usr/share/webapps/zabbix` cp $(CHROOT)/var/www/localhost/htdocs/zabbix/conf/zabbix.conf.php.example $(CHROOT)/var/www/localhost/htdocs/zabbix/conf/zabbix.conf.php + # im Zabbix-Ebuild wird fowners und fperms vor webapp_src_install aufgerufen und deswegen wieder überschrieben + $(inroot) chown zabbix:zabbix \ + /etc/zabbix \ + /var/lib/zabbix \ + /var/lib/zabbix/home \ + /var/lib/zabbix/scripts \ + /var/lib/zabbix/alertscripts \ + /var/lib/zabbix/externalscripts \ + /var/log/zabbix + chmod 0750 \ + $(CHROOT)/etc/zabbix \ + $(CHROOT)/var/lib/zabbix \ + $(CHROOT)/var/lib/zabbix/home \ + $(CHROOT)/var/lib/zabbix/scripts \ + $(CHROOT)/var/lib/zabbix/alertscripts \ + $(CHROOT)/var/lib/zabbix/externalscripts \ + $(CHROOT)/var/log/zabbix # Zabbix Agent cp zabbix/userparameter_mysql.conf $(CHROOT)/var/lib/zabbix/userparameter_mysql.conf diff --git a/zabbix/kernel.config b/zabbix/kernel.config index 9a48540..2cf5d63 100644 --- a/zabbix/kernel.config +++ b/zabbix/kernel.config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.14.52-gentoo Kernel Configuration +# Linux/x86 4.14.83-gentoo Kernel Configuration # # @@ -236,6 +236,7 @@ CONFIG_SLAB_FREELIST_HARDENED=y CONFIG_SLUB_CPU_PARTIAL=y # CONFIG_SYSTEM_DATA_VERIFICATION is not set # CONFIG_PROFILING is not set +CONFIG_HOTPLUG_SMT=y CONFIG_HAVE_OPROFILE=y CONFIG_OPROFILE_NMI_TIMER=y CONFIG_JUMP_LABEL=y @@ -268,6 +269,7 @@ CONFIG_HAVE_PERF_REGS=y CONFIG_HAVE_PERF_USER_STACK_DUMP=y CONFIG_HAVE_ARCH_JUMP_LABEL=y CONFIG_HAVE_RCU_TABLE_FREE=y +CONFIG_HAVE_RCU_TABLE_INVALIDATE=y CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y CONFIG_HAVE_CMPXCHG_LOCAL=y @@ -2834,7 +2836,6 @@ CONFIG_CRYPTO_AES=y # CONFIG_CRYPTO_FCRYPT is not set # CONFIG_CRYPTO_KHAZAD is not set # CONFIG_CRYPTO_SALSA20 is not set -# CONFIG_CRYPTO_SALSA20_X86_64 is not set # CONFIG_CRYPTO_CHACHA20 is not set # CONFIG_CRYPTO_CHACHA20_X86_64 is not set # CONFIG_CRYPTO_SEED is not set diff --git a/zabbix/make.conf b/zabbix/make.conf index 2a1d048..be3d515 100644 --- a/zabbix/make.conf +++ b/zabbix/make.conf @@ -3,4 +3,5 @@ CXXFLAGS="-O2 -pipe" USE="hardened justify pie ssp urandom xattr -fortran -jit -orc -pch -pic -prelink -profile -tcc" MAKEOPTS="-j5" PYTHON_TARGETS="python2_7 python3_6" -PHP_TARGETS="php7-1" +PHP_TARGETS="php7-2" +VIDEO_CARDS="vmware" diff --git a/zabbix/package.keywords b/zabbix/package.keywords index c5c35c0..5884d75 100644 --- a/zabbix/package.keywords +++ b/zabbix/package.keywords @@ -4,5 +4,5 @@ sys-auth/pam_ssh_agent_auth ~amd64 ~x86 # Zabbix ##dev-db/mariadb ~amd64 ~x86 -net-analyzer/zabbix ~amd64 ~x86 +net-analyzer/zabbix ** net-analyzer/snmptt ~amd64 ~x86 diff --git a/zabbix/package.mask b/zabbix/package.mask index a6107f6..be6bf9c 100644 --- a/zabbix/package.mask +++ b/zabbix/package.mask @@ -1,2 +1,2 @@ -# nur LTS-Versionen 3.0.x bauen ->=net-analyzer/zabbix-3.1 +# nur LTS-Versionen 4.0.x bauen +>=net-analyzer/zabbix-4.1 diff --git a/zabbix/package.use b/zabbix/package.use index 5abe32b..9b17125 100644 --- a/zabbix/package.use +++ b/zabbix/package.use @@ -17,9 +17,10 @@ sys-devel/gcc cxx nptl sys-kernel/gentoo-sources symlink # Zabbix -app-admin/rsyslog dbi mysql snmp systemd +app-admin/rsyslog dbi mysql openssl snmp systemd app-eselect/eselect-php apache2 dev-lang/php apache2 bcmath gd ldap mysql mysqli sockets sysvipc truetype xmlreader xmlwriter media-libs/gd jpeg png -net-analyzer/zabbix curl frontend ldap libxml2 mysql openipmi proxy server snmp ssh xmpp +net-analyzer/zabbix curl frontend ldap libxml2 mysql openipmi -postgres proxy server snmp ssh xmpp net-analyzer/net-snmp perl +net-analyzer/fping suid