| |
@@ -269,10 +269,9 @@
|
| |
rm -rf bin
|
| |
|
| |
# Override creation of statically named directory for alertscripts and externalscripts
|
| |
+ # and ssl certs/keys
|
| |
# https://support.zabbix.com/browse/ZBX-6159
|
| |
- sed -i 's|$(DESTDIR)@datadir@/zabbix|$(DESTDIR)/var/lib/zabbixsrv|' \
|
| |
- src/zabbix_server/Makefile.in \
|
| |
- src/zabbix_proxy/Makefile.in
|
| |
+ sed -i 's|="${datadir}/zabbix|="%{_sharedstatedir}/zabbixsrv|' configure
|
| |
|
| |
# Kill off .htaccess files, options set in SOURCE1
|
| |
rm -f frontends/php/app/.htaccess
|
| |
@@ -295,9 +294,12 @@
|
| |
-e '\|^# LogFileSize=.*|a LogFileSize=0' \
|
| |
-e 's|^DBUser=root|DBUser=zabbix|' \
|
| |
-e 's|^# DBSocket=/tmp/mysql.sock|# DBSocket=%{_sharedstatedir}/mysql/mysql.sock|' \
|
| |
- -e '\|^# ExternalScripts=\${datadir}/zabbix/externalscripts|a ExternalScripts=%{_sharedstatedir}/zabbixsrv/externalscripts' \
|
| |
- -e '\|^# AlertScripts=\${datadir}/zabbix/alertscripts|a AlertScripts=%{_sharedstatedir}/zabbixsrv/externalscripts' \
|
| |
- -e '\|^# TmpDir=\/tmp|a TmpDir=%{_sharedstatedir}/zabbixsrv/tmp' \
|
| |
+ -e '\|^# ExternalScripts=|a ExternalScripts=%{_sharedstatedir}/zabbixsrv/externalscripts' \
|
| |
+ -e '\|^# AlertScriptsPath=|a AlertScriptsPath=%{_sharedstatedir}/zabbixsrv/alertscripts' \
|
| |
+ -e '\|^# SSLCertLocation=|a SSLCertLocation=%{_sharedstatedir}/zabbixsrv/ssl/certs' \
|
| |
+ -e '\|^# SSLKeyLocation=|a SSLKeyLocation=%{_sharedstatedir}/zabbixsrv/ssl/keys' \
|
| |
+ -e '\|^# SocketDir=|a SocketDir=%{_sharedstatedir}/zabbixsrv/tmp' \
|
| |
+ -e '\|^# TmpDir=|a TmpDir=%{_sharedstatedir}/zabbixsrv/tmp' \
|
| |
-e 's|/usr/local||' \
|
| |
-e 's|\${datadir}|/usr/share|' \
|
| |
conf/zabbix_agentd.conf conf/zabbix_proxy.conf conf/zabbix_server.conf
|
| |
@@ -383,7 +385,7 @@
|
| |
install -d -m 0755 $RPM_BUILD_ROOT%{_rundir}/zabbixsrv/
|
| |
|
| |
# Frontend
|
| |
- mkdir -p $RPM_BUILD_ROOT%{_datadir}
|
| |
+ mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{srcname}
|
| |
|
| |
# Home directory for the agent;
|
| |
# The other home directory is created during installation
|
| |
@@ -698,6 +700,9 @@
|
| |
%files web-pgsql
|
| |
|
| |
%changelog
|
| |
+ * Tue Mar 05 2019 Orion Poplawski <orion@nwra.com> - 4.0.5-2
|
| |
+ - Fix changes for custom install paths
|
| |
+
|
| |
* Tue Feb 26 2019 Volker Froehlich <volker27@gmx.at> - 4.0.5-1
|
| |
- New upstream release
|
| |
|
| |
orion
commented 5 years ago
4.0 changed where /usr/share/zabbix was set. Also need to change SocketDir, and I made the regexes more forgiving.