Compare commits

...
Sign in to create a new pull request.

34 commits

Author SHA1 Message Date
Till Maas
9d3d6101c2 2014-12-20: Retired because of broken deps:
unresolved dependencies for zabbix20-web-2.0.13-1.el5.i386:
dejavu-sans-fonts
2014-12-20 18:02:48 +01:00
Volker Fröhlich
0b18fbab84 2.0.13, resolve directory ownership problems
- New upstream release; Remove obsolete patches for ZBX-8151, ZBX-8238
  and fping
- Use the upstream tarball, now that non-free json was replaced with android-json
- Clean between builds, otherwise zabbix_{proxy,server} are compiled
  again on install
- Harmonize package descriptions and summaries
- Sort out /var/run ownership issue when only installing the server or proxy
- Update README
2014-09-22 17:24:35 +02:00
Volker Fröhlich
5cc65f51de Add patch for zbx-8158 (CVE-2014-3005) 2014-06-20 08:36:43 +02:00
Volker Fröhlich
b89e5915bb New upstream release 2.0.12 and patch for ZBX-8238
- ZBX-8238 (logrt may continue reading an old file repeatedly)
2014-06-04 08:43:56 +02:00
Volker Fröhlich
1940186544 Handle logrotate directions properly 2014-06-04 08:42:17 +02:00
Volker Fröhlich
f797285c33 New upstream release 2.0.11 2014-02-12 16:25:17 +01:00
Volker Fröhlich
412251845c To be rebased
Conflicts:
	zabbix-fedora.README
	zabbix20.spec
2014-02-12 16:23:05 +01:00
Volker Fröhlich
98d2c3d8cf Fix typo in proxy init script and improve the README
- The start function had a typo causing failure
- Improved the section on running multiple instances in the README
2013-12-20 11:52:42 +01:00
Volker Fröhlich
668b2eb836 Upload correct tarball and add a note on proxy/server to README 2013-12-20 11:52:33 +01:00
Volker Fröhlich
ff95486d30 New release 2.0.10 and init file improvements (BZ#1018293)
- Upstream release 2.0.10
- Drop obsolete patch ZBX-7479 (previous CVE)
- Improve init scripts to not kill other instances (BZ#1018293)
- General overhaul of init scripts and documentation in README
- Harmonize scriptlet if-clause style

Conflicts:
	zabbix20.spec
2013-12-20 11:52:11 +01:00
Volker Fröhlich
7d095ae301 Possible remote command injection ZBX-7479 (CVE-2013-6824)
Conflicts:
	zabbix20.spec
2013-12-03 19:46:51 +01:00
Volker Fröhlich
b1967fdf1c New upstream release 2.0.9
- Drop now-incorporated patches
2013-10-09 22:16:42 +02:00
Volker Fröhlich
ab6e039819 Correct release number 2013-10-02 21:21:06 +02:00
Volker Fröhlich
0a261edbcd Add patch for CVE-2013-5743 (SQL injection vulnerability, ZBX-7091)
-Also add patch for ZBX-6922 (Failing host XML import)
2013-10-02 21:20:58 +02:00
Volker Fröhlich
6ece5476cd SQL speed-up patch for graphs (ZBX-6804) 2013-10-02 21:20:49 +02:00
Volker Fröhlich
22b0b88c63 Require php-ldap and ZBX-6992 (Service SQL)
Conflicts:
	zabbix20.spec
2013-09-13 11:13:35 +02:00
Volker Fröhlich
ea64300dc5 New upstream release 2.0.8
- Introduces a pinger tmp directory in the zabbixsrv home directory
2013-09-08 04:27:36 +03:00
Volker Fröhlich
ab25655921 Patch for CVE-2012-6086
Possible security issue due to misuse of the libcurl API
https://support.zabbix.com/browse/ZBX-5924
2013-07-30 17:51:40 +02:00
Volker Fröhlich
f7b322e736 Actually apply patch; solve cause for zabbix sub-directories in zabbixsrv's home
- Remove origin of directories BZ#867159, comment 14 and 16

Conflicts:

	zabbix20.spec
2013-05-07 22:14:56 +02:00
Volker Fröhlich
c8eae084d7 Solve /var/run permissions, add patch ZBX-6526
- Add patch for ZBX-6526
- Solve permission problem with /var/run/zabbix in Fedora (BZ#904041)
2013-05-07 21:51:16 +02:00
Volker Fröhlich
9774008aa8 New upstream release 2.0.6
Conflicts:
	zabbix20.spec
2013-04-22 16:22:26 +02:00
Volker Fröhlich
06dcb685c3 Remove obsolete patch files 2013-04-22 15:42:07 +02:00
Volker Fröhlich
95f44cc505 Add patch for ZBX-6318 2013-03-19 14:10:43 +01:00
Volker Fröhlich
6864660596 Include patch for ZBX-6290 2013-03-07 12:29:39 +01:00
Volker Fröhlich
a7422fc281 New upstream release 2.0.5
- Also correct configuration comments in init scripts
2013-02-12 13:34:12 +01:00
Volker Fröhlich
e26a1b4549 Re-add patch for traceroute path in SQL dumps 2013-02-09 19:03:34 +01:00
Volker Fröhlich
4e4fb1e635 Throw away most things not relevant for EL5
- Adapt to update path from 1.4 only
- Remove all conditionals for Fedora/EL
- Remove origin of directories BZ#867159, comment 14 and 16
  server package
2013-01-22 15:18:12 +01:00
Volker Fröhlich
2bfda12183 Solve conflict between proxy, server and base package
- Remove zabbix_get plus manpage from the proxy files section
- Solve conflict for externalscripts symlink between proxy and
  server package
2013-01-22 13:11:02 +01:00
Volker Fröhlich
1dad1297e8 Patch LDAP security issue CVE-2013-1364 2013-01-17 22:28:12 +01:00
Volker Fröhlich
a9e361ae98 SNMP trap patch ZBX-6101, agent pre-un script
- Patch for ZBX-6101, where SNMP traps were not processed in
  maintenances with data collection
- The pre-un scriptlet of the agent was empty for EL
- Updated logrotate file with "su" statements for Fedora
- Don't own /var/lib/run directories in Fedora
2013-01-14 22:20:27 +01:00
Volker Fröhlich
f4d7e885aa New release 2.0.4 plus SNMP patch
Use upstream patch to solve the issue described in ZBX-3379:
SNMP polling breaks if daemon is bound to an interface
2012-12-08 14:28:37 +01:00
Volker Fröhlich
e1ddb3874c APPLY FPING PATCH ONLY FOR FEDORA
- Fping 3 is not in EPEL
2012-11-26 10:28:37 +01:00
Volker Fröhlich
3ab0dd56c4 Update httpd configuration for Apache 2.4
- Solving BZ#871498
2012-11-13 22:38:32 +01:00
Volker Fröhlich
a698f68ebf Minor glitches, better documentation, Req. php
- Remove further references to /usr/local in configuration files
- Improve documentation, finishing the TODOs
- Explicitly require php again, as it turned out necessary
2012-11-09 00:16:24 +01:00
21 changed files with 4 additions and 1793 deletions

1
.gitignore vendored
View file

@ -1 +0,0 @@
/zabbix-2.0.3-free.tar.gz

4
dead.package Normal file
View file

@ -0,0 +1,4 @@
2014-12-20: Retired because of broken deps:
unresolved dependencies for zabbix20-web-2.0.13-1.el5.i386:
dejavu-sans-fonts

View file

@ -1 +0,0 @@
10c50c7ff5f605139590e1e03c40026d zabbix-2.0.3-free.tar.gz

View file

@ -1,39 +0,0 @@
diff -up zabbix-1.8.12/src/libs/zbxicmpping/icmpping.c.fping3 zabbix-1.8.12/src/libs/zbxicmpping/icmpping.c
--- zabbix-1.8.12/src/libs/zbxicmpping/icmpping.c.fping3 2012-04-24 16:31:36.000000000 +0200
+++ zabbix-1.8.12/src/libs/zbxicmpping/icmpping.c 2012-04-24 16:32:31.000000000 +0200
@@ -42,34 +42,7 @@ static const char *source_ip6_option = N
static void get_source_ip_option(const char *fping, const char **option, unsigned char *checked)
{
- FILE *f;
- char *p, tmp[MAX_STRING_LEN];
-
- zbx_snprintf(tmp, sizeof(tmp), "%s -h 2>&1", fping);
-
- if (NULL == (f = popen(tmp, "r")))
- return;
-
- while (NULL != fgets(tmp, sizeof(tmp), f))
- {
- for (p = tmp; isspace(*p); p++)
- ;
-
- if ('-' == p[0] && 'I' == p[1] && isspace(p[2]))
- {
- *option = "-I";
- break;
- }
-
- if ('-' == p[0] && 'S' == p[1] && isspace(p[2]))
- {
- *option = "-S";
- break;
- }
- }
-
- pclose(f);
-
+ *option = "-S";
*checked = 1;
}

View file

@ -1,11 +0,0 @@
diff -up zabbix-2.0.1/frontends/php/include/screens.inc.php.orig zabbix-2.0.1/frontends/php/include/screens.inc.php
--- zabbix-2.0.1/frontends/php/include/screens.inc.php.orig 2012-06-27 23:03:03.000000000 +0200
+++ zabbix-2.0.1/frontends/php/include/screens.inc.php 2012-07-12 16:29:02.000000000 +0200
@@ -25,7 +25,6 @@ require_once dirname(__FILE__).'/js.inc.
function screen_resources($resource = null) {
$resources = array(
- SCREEN_RESOURCE_CLOCK => _('Clock'),
SCREEN_RESOURCE_DATA_OVERVIEW => _('Data overview'),
SCREEN_RESOURCE_GRAPH => _('Graph'),
SCREEN_RESOURCE_ACTIONS => _('History of actions'),

View file

@ -1,22 +0,0 @@
diff -Nur zabbix-2.0.2/frontends/php/include/config.inc.php zabbix-2.0.2-conf/frontends/php/include/config.inc.php
--- zabbix-2.0.2/frontends/php/include/config.inc.php 2012-07-31 11:16:47.000000000 +0200
+++ zabbix-2.0.2-conf/frontends/php/include/config.inc.php 2012-09-04 00:07:03.217816413 +0200
@@ -31,7 +31,7 @@
CProfiler::getInstance()->start();
require_once dirname(__FILE__).'/profiles.inc.php';
-require_once dirname(__FILE__).'/../conf/maintenance.inc.php';
+require_once '/etc/zabbix/web/maintenance.inc.php';
// abc sorting
require_once dirname(__FILE__).'/acknow.inc.php';
@@ -64,8 +64,7 @@
$USER_RIGHTS = array();
$ZBX_LOCALNODEID = 0;
$ZBX_LOCMASTERID = 0;
-$ZBX_CONFIGURATION_FILE = './conf/zabbix.conf.php';
-$ZBX_CONFIGURATION_FILE = realpath(dirname($ZBX_CONFIGURATION_FILE)).DIRECTORY_SEPARATOR.basename($ZBX_CONFIGURATION_FILE);
+$ZBX_CONFIGURATION_FILE = '/etc/zabbix/web/zabbix.conf.php';
// include tactical overview modules
require_once dirname(__FILE__).'/locales.inc.php';

View file

@ -1,12 +0,0 @@
diff -Nur zabbix-2.0.3/frontends/php/include/defines.inc.php zabbix-2.0.3-fonts/frontends/php/include/defines.inc.php
--- zabbix-2.0.3/frontends/php/include/defines.inc.php 2012-10-03 16:41:36.000000000 +0200
+++ zabbix-2.0.3-fonts/frontends/php/include/defines.inc.php 2012-10-05 23:47:17.341790748 +0200
@@ -34,7 +34,7 @@
define('ZBX_WIDGET_ROWS', 20);
-define('ZBX_FONTPATH', realpath('fonts')); // where to search for font (GD > 2.0.18)
+define('ZBX_FONTPATH', '/usr/share/fonts/dejavu'); // where to search for font (GD > 2.0.18)
define('ZBX_GRAPH_FONT_NAME', 'DejaVuSans'); // font file name
define('ZBX_GRAPH_LEGEND_HEIGHT', 120); // when graph height is less then this value, some legend will not show up

View file

@ -1,80 +0,0 @@
#!/bin/sh
#
# chkconfig: - 86 14
# description: Zabbix agent daemon
# processname: zabbix_agentd
# config: /etc/zabbix/zabbix_agentd.conf
#
### BEGIN INIT INFO
# Provides: zabbix-agent
# Required-Start: $local_fs $network
# Required-Stop: $local_fs $network
# Should-Start: zabbix zabbix-proxy
# Should-Stop: zabbix zabbix-proxy
# Default-Start:
# Default-Stop: 0 1 2 3 4 5 6
# Short-Description: Start and stop Zabbix agent
# Description: Zabbix agent
### END INIT INFO
# Source function library.
. /etc/rc.d/init.d/functions
exec=/usr/sbin/zabbix_agentd
prog=${exec##*/}
syscf=zabbix-agent
lockfile=/var/lock/subsys/zabbix-agent
[ -e /etc/sysconfig/$syscf ] && . /etc/sysconfig/$syscf
start()
{
echo -n $"Starting Zabbix agent: "
daemon --user zabbix $exec
rv=$?
echo
[ $rv -eq 0 ] && touch $lockfile
return $rv
}
stop()
{
echo -n $"Shutting down Zabbix agent: "
killproc $prog
rv=$?
echo
[ $rv -eq 0 ] && rm -f $lockfile
return $rv
}
restart()
{
stop
start
}
case "$1" in
start|stop|restart)
$1
;;
force-reload)
restart
;;
status)
status $prog
;;
try-restart|condrestart)
if status $prog >/dev/null ; then
restart
fi
;;
reload)
action $"Service ${0##*/} does not support the reload action: " /bin/false
exit 3
;;
*)
echo $"Usage: $0 {start|stop|status|restart|try-restart|force-reload}"
exit 2
;;
esac

View file

@ -1,13 +0,0 @@
[Unit]
Description=Zabbix Monitor Agent
After=syslog.target network.target
[Service]
Type=oneshot
ExecStart=/usr/sbin/zabbix_agentd
RemainAfterExit=yes
User=zabbix
PrivateTmp=yes
[Install]
WantedBy=multi-user.target

View file

@ -1,115 +0,0 @@
=Custom in Fedora=
_Web configuration_
Web configuration resides in /etc/zabbix/web.
_Log files_
Log files are located in /var/log/zabbix.
_Where's my Flash watch?_
It's not included in Fedora! Fedora's policy does not allow to include blobs.
_No htaccess files_
Fedora ships an Apache configuration file instead. This solutions performs
better and is easier to maintain.
=Additional changes from 1.8 to 2.0 in Fedora=
_Zabbix 2.0 packages conflict Zabbix 1.8_
This measure was taken because this major version introduces various database
schema changes. A silent update would render Zabbix inoperational and possibly
break the database. Besides that, Zabbix 2.0 server only works with other 2.0
servers and proxies. Distributed setups must therefore be updated at the same
time.
http://www.zabbix.com/documentation/2.0/manual/appendix/compatibility
_Two users_
There's a certain security risk involved, running agent and proxy/server as the
same user. This package therefore introduces an additional zabbixsrv user, used
for proxy and server. Please check the permissions of your scripts and group
memberships, if necessary.
_Using the Alternatives system instead of conflicting sub-packages_
You can now install Zabbix proxies or servers compiled for different database
backends on the same system. While this is not intended to happily switch back
and forth, it allows you to:
- Stop the daemon
- "Run alternatives --config zabbix-server" or "alternatives --config
zabbix-proxy"
- Make your choice
- If you're using systemd, run systemctl reload
- Adjust the configuration file
- Start the daemon
#TODO: Why does it need "restart" in cases?
Alternatives considers the first installed implementation of server or proxy as
default respectively.
Don't forget to reconfigure the frontend when you switch the server to a
different DB implementation!
_Configuration changes_
Zabbix 2.0 places configuration files directly in /etc and a couple of
sub-directories. Symlinks preserve compatibility. maintenance.inc.php also moved
to /etc/zabbix/web. #TODO: Didn't install *.conf.d directories
_Alert and media scripts_
The Alert and media script directories have moved to /var/lib/zabbixsrv.
Symlinks preserver compatibility.
/var/lib/zabbix is now intended for scripts run by the agent. Please move your
server or proxy scripts to /var/lib/zabbixsrv. Be sure to check permissions and
ownership.
_No Java bridge_
The Zabbix Java bridge can not be included now, due to legal issue with one of
the modules (json).
_No Sqlite frontend or server implementation_
Sadly it doesn't work with how Fedora's/EPEL's PHP is compiled.
--------------------------------------------------------------------------------
_Guide for updating to 2.0_
http://www.zabbix.com/documentation/2.0/manual/installation/upgrade_notes
Picking the relevant steps from
http://www.zabbix.com/documentation/2.0/manual/installation/upgrade
- Stop the Zabbix server/proxy
TODO: Did it already stop when uninstalling 1.8?
- Back up the Zabbix database (really!)
- Make sure the database user has sufficing permissions.
- Run the fitting database update script/s
- The scripts can run very long, depending on the content of your database and
your hardware; A case running 90 hours was reported. 2.0.3 should improve the
situation a lot.
- Review all rpmnew and rpmsave files; merge where necessary
- Review permissions, ownerships and group memberships for zabbixsrv
Volker Fröhlich volker27@gmx.at Sep 15 2012

View file

@ -1,7 +0,0 @@
/var/log/zabbix/zabbix_COMPONENT.log {
missingok
monthly
notifempty
compress
create 0664 zabbix zabbix
}

View file

@ -1,13 +0,0 @@
[Unit]
Description=Zabbix MySQL Proxy Agent
After=syslog.target network.target mysqld.service
[Service]
Type=oneshot
ExecStart=/usr/sbin/zabbix_proxy
RemainAfterExit=yes
User=zabbixsrv
PrivateTmp=yes
[Install]
WantedBy=multi-user.target

View file

@ -1,13 +0,0 @@
[Unit]
Description=Zabbix PostgreSQL Proxy Agent
After=syslog.target network.target postgresql.service
[Service]
Type=oneshot
ExecStart=/usr/sbin/zabbix_proxy
RemainAfterExit=yes
User=zabbixsrv
PrivateTmp=yes
[Install]
WantedBy=multi-user.target

View file

@ -1,13 +0,0 @@
[Unit]
Description=Zabbix SQLite3 Proxy Agent
After=syslog.target network.target
[Service]
Type=oneshot
ExecStart=/usr/sbin/zabbix_proxy
RemainAfterExit=yes
User=zabbixsrv
PrivateTmp=yes
[Install]
WantedBy=multi-user.target

View file

@ -1,78 +0,0 @@
#!/bin/sh
#
# chkconfig: - 85 15
# description: Zabbix proxy daemon
# config: /etc/zabbix/zabbix_proxy.conf
#
### BEGIN INIT INFO
# Provides: zabbix-proxy
# Required-Start: $local_fs $network
# Required-Stop: $local_fs $network
# Default-Start:
# Default-Stop: 0 1 2 3 4 5 6
# Short-Description: Start and stop Zabbix proxy
# Description: Zabbix proxy
### END INIT INFO
# Source function library.
. /etc/rc.d/init.d/functions
exec=zabbix_proxy
prog=${exec##*/}
lockfile=/var/lock/subsys/zabbix-proxy
conf=
syscf=zabbix-proxy
[ -e /etc/sysconfig/$syscf ] && . /etc/sysconfig/$syscf
start()
{
echo -n $"Starting Zabbix proxy: "
daemon --user zabbixsrv $exec
rv=$?
echo
[ $rv -eq 0 ] && touch $lockfile
return $rv
}
stop()
{
echo -n $"Shutting down Zabbix proxy: "
killproc $prog
rv=$?
echo
[ $rv -eq 0 ] && rm -f $lockfile
return $rv
}
restart()
{
stop
start
}
case "$1" in
start|stop|restart)
$1
;;
force-reload)
restart
;;
status)
status $prog
;;
try-restart|condrestart)
if status $prog >/dev/null ; then
restart
fi
;;
reload)
action $"Service ${0##*/} does not support the reload action: " /bin/false
exit 3
;;
*)
echo $"Usage: $0 {start|stop|status|restart|try-restart|force-reload}"
exit 2
;;
esac

View file

@ -1,13 +0,0 @@
[Unit]
Description=Zabbix Server with MySQL DB
After=syslog.target network.target mysqld.service
[Service]
Type=oneshot
ExecStart=/usr/sbin/zabbix_server
RemainAfterExit=yes
User=zabbixsrv
PrivateTmp=yes
[Install]
WantedBy=multi-user.target

View file

@ -1,13 +0,0 @@
[Unit]
Description=Zabbix Server with PostgreSQL DB
After=syslog.target network.target postgresql.service
[Service]
Type=oneshot
ExecStart=/usr/sbin/zabbix_server
RemainAfterExit=yes
User=zabbixsrv
PrivateTmp=yes
[Install]
WantedBy=multi-user.target

View file

@ -1,77 +0,0 @@
#!/bin/sh
#
# chkconfig: - 85 15
# description: Zabbix server daemon
# config: /etc/zabbix/zabbix_server.conf
#
### BEGIN INIT INFO
# Provides: zabbix
# Required-Start: $local_fs $network
# Required-Stop: $local_fs $network
# Default-Start:
# Default-Stop: 0 1 2 3 4 5 6
# Short-Description: Start and stop Zabbix server
# Description: Zabbix server
### END INIT INFO
# Source function library.
. /etc/rc.d/init.d/functions
exec=zabbix_server
prog=${exec##*/}
lockfile=/var/lock/subsys/zabbix
syscf=zabbix-server
[ -e /etc/sysconfig/$syscf ] && . /etc/sysconfig/$syscf
start()
{
echo -n $"Starting Zabbix server: "
daemon --user zabbixsrv $exec
rv=$?
echo
[ $rv -eq 0 ] && touch $lockfile
return $rv
}
stop()
{
echo -n $"Shutting down Zabbix server: "
killproc $prog
rv=$?
echo
[ $rv -eq 0 ] && rm -f $lockfile
return $rv
}
restart()
{
stop
start
}
case "$1" in
start|stop|restart)
$1
;;
force-reload)
restart
;;
status)
status $prog
;;
try-restart|condrestart)
if status $prog >/dev/null ; then
restart
fi
;;
reload)
action $"Service ${0##*/} does not support the reload action: " /bin/false
exit 3
;;
*)
echo $"Usage: $0 {start|stop|status|restart|try-restart|force-reload}"
exit 2
;;
esac

View file

@ -1 +0,0 @@
D /var/run/zabbix 0755 zabbix zabbix -

View file

@ -1,48 +0,0 @@
#
# Zabbix monitoring system php web frontend
#
Alias /zabbix /usr/share/zabbix
<Directory "/usr/share/zabbix">
Options FollowSymLinks
AllowOverride None
Order allow,deny
Allow from all
</Directory>
<Directory "/usr/share/zabbix/conf">
Order deny,allow
Deny from all
<files *.php>
Order deny,allow
Deny from all
</files>
</Directory>
<Directory "/usr/share/zabbix/api">
Order deny,allow
Deny from all
<files *.php>
Order deny,allow
Deny from all
</files>
</Directory>
<Directory "/usr/share/zabbix/include">
Order deny,allow
Deny from all
<files *.php>
Order deny,allow
Deny from all
</files>
</Directory>
<Directory "/usr/share/zabbix/include/classes">
Order deny,allow
Deny from all
<files *.php>
Order deny,allow
Deny from all
</files>
</Directory>

File diff suppressed because it is too large Load diff