diff -Nru zabbix-2.2.1+dfsg/debian/changelog zabbix-2.2.1+dfsg/debian/changelog --- zabbix-2.2.1+dfsg/debian/changelog 2013-12-15 00:16:13.000000000 +0100 +++ zabbix-2.2.1+dfsg/debian/changelog 2014-02-06 23:16:02.000000000 +0100 @@ -1,3 +1,11 @@ +zabbix (1:2.2.1+dfsg-1ubuntu1) trusty; urgency=low + + * Merge from Debian unstable. (LP: #1277268) Remaining changes: + - Extended default config for agent and proxy. + - Upstart support for all zabbix components. + + -- Artur Rona Thu, 06 Feb 2014 22:45:45 +0100 + zabbix (1:2.2.1+dfsg-1) unstable; urgency=low * New upstream release [December 2013]. @@ -11,6 +19,15 @@ -- Dmitry Smirnov Sun, 15 Dec 2013 10:15:55 +1100 +zabbix (1:2.2.0+dfsg-6ubuntu1) trusty; urgency=low + + * Merge from Debian testing. Remaining changes: + - Extended default config for agent and proxy. + - Upstart support for all zabbix components. + * New package from upstream, zabbix-java-gateway. LP: #1062217 + + -- Mahyuddin Susanto Thu, 12 Dec 2013 14:59:33 +0700 + zabbix (1:2.2.0+dfsg-6) unstable; urgency=high * CVE-2013-6824: new upstream patch "ZBX-7479.patch" to fix command @@ -74,6 +91,14 @@ -- Dmitry Smirnov Wed, 20 Nov 2013 05:49:54 +1100 +zabbix (1:2.2.0+dfsg-1ubuntu1) trusty; urgency=low + + * Merge from Debian unstable. Remaining changes: + - Extended default config for agent and proxy. + - Upstart support for all zabbix components. + + -- Matthew Fischer Sun, 17 Nov 2013 21:34:40 -0700 + zabbix (1:2.2.0+dfsg-1) unstable; urgency=low * New major upstream release [November 2013]. @@ -144,6 +169,20 @@ -- Dmitry Smirnov Wed, 24 Jul 2013 03:33:23 +1000 +zabbix (1:2.0.6+dfsg-1ubuntu2) saucy; urgency=low + + * Rebuild for libsnmp30. + + -- Colin Watson Mon, 20 May 2013 14:15:52 +0100 + +zabbix (1:2.0.6+dfsg-1ubuntu1) saucy; urgency=low + + * Merge from Debian unstable. Remaining changes: + - Extended default config for agent and proxy. + - Upstart support for all zabbix components. + + -- Logan Rosen Mon, 29 Apr 2013 15:08:24 -0400 + zabbix (1:2.0.6+dfsg-1) unstable; urgency=low * New upstream release [April 2013]. @@ -153,6 +192,14 @@ -- Dmitry Smirnov Wed, 24 Apr 2013 14:00:51 +1000 +zabbix (1:2.0.5+dfsg-1ubuntu1) raring; urgency=low + + * Merge from Debian unstable. Remaining changes: + - Extended default config for agent and proxy. + - Upstart support for all zabbix components. + + -- Logan Rosen Sun, 03 Mar 2013 20:00:43 -0500 + zabbix (1:2.0.5+dfsg-1) unstable; urgency=low * New upstream release [February 2013]. @@ -169,6 +216,14 @@ -- Dmitry Smirnov Thu, 07 Feb 2013 16:58:09 +1100 +zabbix (1:2.0.4+dfsg-2ubuntu1) raring; urgency=low + + * Merge from Debian unstable. Remaining changes: + - Extended default config for agent and proxy. + - Upstart support for all zabbix components. + + -- Logan Rosen Tue, 05 Feb 2013 16:29:23 -0500 + zabbix (1:2.0.4+dfsg-2) unstable; urgency=low * CVE-2013-1364: fixed the ability to override LDAP configuration when @@ -204,6 +259,13 @@ -- Dmitry Smirnov Sun, 18 Nov 2012 11:27:51 +1100 +zabbix (1:2.0.3+dfsg-1~exp0ubuntu1) raring; urgency=low + + * Extended default config for agent and proxy. + * Upstart support for all zabbix components. + + -- Christian Kampka Mon, 26 Nov 2012 12:02:51 +0000 + zabbix (1:2.0.3+dfsg-1~exp0) experimental; urgency=low * New upstream release. diff -Nru zabbix-2.2.1+dfsg/debian/control zabbix-2.2.1+dfsg/debian/control --- zabbix-2.2.1+dfsg/debian/control 2013-12-04 05:24:59.000000000 +0100 +++ zabbix-2.2.1+dfsg/debian/control 2014-02-06 22:55:03.000000000 +0100 @@ -1,7 +1,8 @@ Source: zabbix Section: net Priority: optional -Maintainer: Christoph Haas +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Christoph Haas Uploaders: Dmitry Smirnov Build-Depends: debhelper (>= 9), automake, dh-autoreconf ,libcurl4-gnutls-dev diff -Nru zabbix-2.2.1+dfsg/debian/zabbix-agent.default zabbix-2.2.1+dfsg/debian/zabbix-agent.default --- zabbix-2.2.1+dfsg/debian/zabbix-agent.default 1970-01-01 01:00:00.000000000 +0100 +++ zabbix-2.2.1+dfsg/debian/zabbix-agent.default 2014-02-06 22:55:03.000000000 +0100 @@ -0,0 +1,8 @@ +# defaults file for zabbix-agent + +# Start the Zabbix on init? +# (Possible values: "yes" or "no") +START="yes" + +# Absolute path to the configuration file +CONFIG_FILE="/etc/zabbix/zabbix_agentd.conf" diff -Nru zabbix-2.2.1+dfsg/debian/zabbix-agent.upstart zabbix-2.2.1+dfsg/debian/zabbix-agent.upstart --- zabbix-2.2.1+dfsg/debian/zabbix-agent.upstart 1970-01-01 01:00:00.000000000 +0100 +++ zabbix-2.2.1+dfsg/debian/zabbix-agent.upstart 2014-02-06 22:55:03.000000000 +0100 @@ -0,0 +1,41 @@ +# Upstart job to start the zabbix agent + +description "Zabbix agent" +author "Christian Kampka " + +start on (filesystem and net-device-up IFACE=lo) +stop on runlevel [!2345] + +expect daemon + +respawn + +# wait for agent to properly disconnect from server before killing it +kill timeout 30 + +console log + +env DIR="/var/run/zabbix" + +pre-start script + + # stop job from continuing if no config file found for daemon + [ ! -f /etc/default/zabbix-agent ] && { stop; exit 0; } + + # source the config file + . /etc/default/zabbix-agent + + # stop job from continuing if admin has not enabled service in + # config file. + [ "x$START" = "xyes" ] || { stop; exit 0; } + + [ -d "$DIR" ] || mkdir "$DIR" + chown -R zabbix:zabbix "$DIR" + +end script + +script + . /etc/default/zabbix-agent + + exec /usr/sbin/zabbix_agentd -c $CONFIG_FILE +end script diff -Nru zabbix-2.2.1+dfsg/debian/zabbix-proxy-mysql.zabbix-proxy.default zabbix-2.2.1+dfsg/debian/zabbix-proxy-mysql.zabbix-proxy.default --- zabbix-2.2.1+dfsg/debian/zabbix-proxy-mysql.zabbix-proxy.default 2013-10-13 02:51:58.000000000 +0200 +++ zabbix-2.2.1+dfsg/debian/zabbix-proxy-mysql.zabbix-proxy.default 2014-02-06 22:55:03.000000000 +0100 @@ -10,3 +10,5 @@ # /usr/share/doc/zabbix-proxy-mysql/README.Debian START=no +# Absolute path to the configuration file +CONFIG_FILE="/etc/zabbix/zabbix_proxy.conf" diff -Nru zabbix-2.2.1+dfsg/debian/zabbix-proxy-mysql.zabbix-proxy.upstart zabbix-2.2.1+dfsg/debian/zabbix-proxy-mysql.zabbix-proxy.upstart --- zabbix-2.2.1+dfsg/debian/zabbix-proxy-mysql.zabbix-proxy.upstart 1970-01-01 01:00:00.000000000 +0100 +++ zabbix-2.2.1+dfsg/debian/zabbix-proxy-mysql.zabbix-proxy.upstart 2014-02-06 22:55:03.000000000 +0100 @@ -0,0 +1,41 @@ +# Upstart job to start the zabbix proxy + +description "Zabbix proxy" +author "Christian Kampka " + +start on (filesystem and net-device-up IFACE=lo) +stop on runlevel [!2345] + +expect daemon + +respawn + +# wait for proxy to properly disconnect from server and agents before killing it +kill timeout 30 + +console log + +env DIR="/var/run/zabbix" + +pre-start script + + # stop job from continuing if no config file found for daemon + [ ! -f /etc/default/zabbix-proxy ] && { stop; exit 0; } + + # source the config file + . /etc/default/zabbix-proxy + + # stop job from continuing if admin has not enabled service in + # config file. + [ "x$START" = "xyes" ] || { stop; exit 0; } + + [ -d "$DIR" ] || mkdir "$DIR" + chown -R zabbix:zabbix "$DIR" + +end script + +script + . /etc/default/zabbix-proxy + + exec /usr/sbin/zabbix_proxy -c $CONFIG_FILE +end script diff -Nru zabbix-2.2.1+dfsg/debian/zabbix-proxy-pgsql.zabbix-proxy.default zabbix-2.2.1+dfsg/debian/zabbix-proxy-pgsql.zabbix-proxy.default --- zabbix-2.2.1+dfsg/debian/zabbix-proxy-pgsql.zabbix-proxy.default 2013-10-13 02:51:58.000000000 +0200 +++ zabbix-2.2.1+dfsg/debian/zabbix-proxy-pgsql.zabbix-proxy.default 2014-02-06 22:55:03.000000000 +0100 @@ -11,3 +11,5 @@ # /usr/share/doc/zabbix-proxy-pgsql/README.Debian START=no +# Absolute path to the configuration file +CONFIG_FILE="/etc/zabbix/zabbix_proxy.conf" diff -Nru zabbix-2.2.1+dfsg/debian/zabbix-proxy-pgsql.zabbix-proxy.upstart zabbix-2.2.1+dfsg/debian/zabbix-proxy-pgsql.zabbix-proxy.upstart --- zabbix-2.2.1+dfsg/debian/zabbix-proxy-pgsql.zabbix-proxy.upstart 1970-01-01 01:00:00.000000000 +0100 +++ zabbix-2.2.1+dfsg/debian/zabbix-proxy-pgsql.zabbix-proxy.upstart 2014-02-06 22:55:03.000000000 +0100 @@ -0,0 +1,41 @@ +# Upstart job to start the zabbix proxy + +description "Zabbix proxy" +author "Christian Kampka " + +start on (filesystem and net-device-up IFACE=lo) +stop on runlevel [!2345] + +expect daemon + +respawn + +# wait for proxy to properly disconnect from server and agents before killing it +kill timeout 30 + +console log + +env DIR="/var/run/zabbix" + +pre-start script + + # stop job from continuing if no config file found for daemon + [ ! -f /etc/default/zabbix-proxy ] && { stop; exit 0; } + + # source the config file + . /etc/default/zabbix-proxy + + # stop job from continuing if admin has not enabled service in + # config file. + [ "x$START" = "xyes" ] || { stop; exit 0; } + + [ -d "$DIR" ] || mkdir "$DIR" + chown -R zabbix:zabbix "$DIR" + +end script + +script + . /etc/default/zabbix-proxy + + exec /usr/sbin/zabbix_proxy -c $CONFIG_FILE +end script diff -Nru zabbix-2.2.1+dfsg/debian/zabbix-proxy-sqlite3.zabbix-proxy.default zabbix-2.2.1+dfsg/debian/zabbix-proxy-sqlite3.zabbix-proxy.default --- zabbix-2.2.1+dfsg/debian/zabbix-proxy-sqlite3.zabbix-proxy.default 2013-10-13 02:51:58.000000000 +0200 +++ zabbix-2.2.1+dfsg/debian/zabbix-proxy-sqlite3.zabbix-proxy.default 2014-02-06 22:55:03.000000000 +0100 @@ -11,3 +11,5 @@ # /usr/share/doc/zabbix-proxy-sqlite3/README.Debian START=no +# Absolute path to the configuration file +CONFIG_FILE="/etc/zabbix/zabbix_proxy.conf" diff -Nru zabbix-2.2.1+dfsg/debian/zabbix-proxy-sqlite3.zabbix-proxy.upstart zabbix-2.2.1+dfsg/debian/zabbix-proxy-sqlite3.zabbix-proxy.upstart --- zabbix-2.2.1+dfsg/debian/zabbix-proxy-sqlite3.zabbix-proxy.upstart 1970-01-01 01:00:00.000000000 +0100 +++ zabbix-2.2.1+dfsg/debian/zabbix-proxy-sqlite3.zabbix-proxy.upstart 2014-02-06 22:55:03.000000000 +0100 @@ -0,0 +1,41 @@ +# Upstart job to start the zabbix proxy + +description "Zabbix proxy" +author "Christian Kampka " + +start on (filesystem and net-device-up IFACE=lo) +stop on runlevel [!2345] + +expect daemon + +respawn + +# wait for proxy to properly disconnect from server and agents before killing it +kill timeout 30 + +console log + +env DIR="/var/run/zabbix" + +pre-start script + + # stop job from continuing if no config file found for daemon + [ ! -f /etc/default/zabbix-proxy ] && { stop; exit 0; } + + # source the config file + . /etc/default/zabbix-proxy + + # stop job from continuing if admin has not enabled service in + # config file. + [ "x$START" = "xyes" ] || { stop; exit 0; } + + [ -d "$DIR" ] || mkdir "$DIR" + chown -R zabbix:zabbix "$DIR" + +end script + +script + . /etc/default/zabbix-proxy + + exec /usr/sbin/zabbix_proxy -c $CONFIG_FILE +end script diff -Nru zabbix-2.2.1+dfsg/debian/zabbix-proxy-.upstart zabbix-2.2.1+dfsg/debian/zabbix-proxy-.upstart --- zabbix-2.2.1+dfsg/debian/zabbix-proxy-.upstart 1970-01-01 01:00:00.000000000 +0100 +++ zabbix-2.2.1+dfsg/debian/zabbix-proxy-.upstart 2014-02-06 22:55:03.000000000 +0100 @@ -0,0 +1,41 @@ +# Upstart job to start the zabbix proxy + +description "Zabbix proxy" +author "Christian Kampka " + +start on (filesystem and net-device-up IFACE=lo) +stop on runlevel [!2345] + +expect daemon + +respawn + +# wait for proxy to properly disconnect from server and agents before killing it +kill timeout 30 + +console log + +env DIR="/var/run/zabbix" + +pre-start script + + # stop job from continuing if no config file found for daemon + [ ! -f /etc/default/zabbix-proxy ] && { stop; exit 0; } + + # source the config file + . /etc/default/zabbix-proxy + + # stop job from continuing if admin has not enabled service in + # config file. + [ "x$START" = "xyes" ] || { stop; exit 0; } + + [ -d "$DIR" ] || mkdir "$DIR" + chown -R zabbix:zabbix "$DIR" + +end script + +script + . /etc/default/zabbix-proxy + + exec /usr/sbin/zabbix_proxy -c $CONFIG_FILE +end script diff -Nru zabbix-2.2.1+dfsg/debian/zabbix-server-mysql.zabbix-server.default zabbix-2.2.1+dfsg/debian/zabbix-server-mysql.zabbix-server.default --- zabbix-2.2.1+dfsg/debian/zabbix-server-mysql.zabbix-server.default 2013-10-13 02:51:58.000000000 +0200 +++ zabbix-2.2.1+dfsg/debian/zabbix-server-mysql.zabbix-server.default 2014-02-06 22:55:03.000000000 +0100 @@ -10,3 +10,5 @@ # /usr/share/doc/zabbix-server-mysql/README.Debian START=no +# Absolute path to the configuration file +CONFIG_FILE="/etc/zabbix/zabbix_server.conf" diff -Nru zabbix-2.2.1+dfsg/debian/zabbix-server-mysql.zabbix-server.upstart zabbix-2.2.1+dfsg/debian/zabbix-server-mysql.zabbix-server.upstart --- zabbix-2.2.1+dfsg/debian/zabbix-server-mysql.zabbix-server.upstart 1970-01-01 01:00:00.000000000 +0100 +++ zabbix-2.2.1+dfsg/debian/zabbix-server-mysql.zabbix-server.upstart 2014-02-06 22:55:03.000000000 +0100 @@ -0,0 +1,41 @@ +# Upstart job to start the zabbix server + +description "Zabbix server" +author "Christian Kampka " + +start on (filesystem and net-device-up IFACE=lo) +stop on runlevel [!2345] + +expect daemon + +respawn + +# wait for server to properly disconnect from connected nodes +kill timeout 30 + +console log + +env DIR="/var/run/zabbix" + +pre-start script + + # stop job from continuing if no config file found for daemon + [ ! -f /etc/default/zabbix-server ] && { stop; exit 0; } + + # source the config file + . /etc/default/zabbix-server + + # stop job from continuing if admin has not enabled service in + # config file. + [ "x$START" = "xyes" ] || { stop; exit 0; } + + [ -d "$DIR" ] || mkdir "$DIR" + chown -R zabbix:zabbix "$DIR" + +end script + +script + . /etc/default/zabbix-server + + exec /usr/sbin/zabbix_server -c $CONFIG_FILE +end script diff -Nru zabbix-2.2.1+dfsg/debian/zabbix-server-pgsql.zabbix-server.default zabbix-2.2.1+dfsg/debian/zabbix-server-pgsql.zabbix-server.default --- zabbix-2.2.1+dfsg/debian/zabbix-server-pgsql.zabbix-server.default 2013-10-13 02:51:59.000000000 +0200 +++ zabbix-2.2.1+dfsg/debian/zabbix-server-pgsql.zabbix-server.default 2014-02-06 22:55:03.000000000 +0100 @@ -11,3 +11,5 @@ # /usr/share/doc/zabbix-server-pgsql/README.Debian START=no +# Absolute path to the configuration file +CONFIG_FILE="/etc/zabbix/zabbix_server.conf" diff -Nru zabbix-2.2.1+dfsg/debian/zabbix-server-pgsql.zabbix-server.upstart zabbix-2.2.1+dfsg/debian/zabbix-server-pgsql.zabbix-server.upstart --- zabbix-2.2.1+dfsg/debian/zabbix-server-pgsql.zabbix-server.upstart 1970-01-01 01:00:00.000000000 +0100 +++ zabbix-2.2.1+dfsg/debian/zabbix-server-pgsql.zabbix-server.upstart 2014-02-06 22:55:03.000000000 +0100 @@ -0,0 +1,41 @@ +# Upstart job to start the zabbix server + +description "Zabbix server" +author "Christian Kampka " + +start on (filesystem and net-device-up IFACE=lo) +stop on runlevel [!2345] + +expect daemon + +respawn + +# wait for server to properly disconnect from connected nodes +kill timeout 30 + +console log + +env DIR="/var/run/zabbix" + +pre-start script + + # stop job from continuing if no config file found for daemon + [ ! -f /etc/default/zabbix-server ] && { stop; exit 0; } + + # source the config file + . /etc/default/zabbix-server + + # stop job from continuing if admin has not enabled service in + # config file. + [ "x$START" = "xyes" ] || { stop; exit 0; } + + [ -d "$DIR" ] || mkdir "$DIR" + chown -R zabbix:zabbix "$DIR" + +end script + +script + . /etc/default/zabbix-server + + exec /usr/sbin/zabbix_server -c $CONFIG_FILE +end script diff -Nru zabbix-2.2.1+dfsg/debian/zabbix-server-sqlite3.zabbix-server.default zabbix-2.2.1+dfsg/debian/zabbix-server-sqlite3.zabbix-server.default --- zabbix-2.2.1+dfsg/debian/zabbix-server-sqlite3.zabbix-server.default 2013-10-13 02:51:59.000000000 +0200 +++ zabbix-2.2.1+dfsg/debian/zabbix-server-sqlite3.zabbix-server.default 2014-02-06 22:55:03.000000000 +0100 @@ -11,3 +11,5 @@ # /usr/share/doc/zabbix-server-sqlite3/README.Debian START=no +# Absolute path to the configuration file +CONFIG_FILE="/etc/zabbix/zabbix_server.conf" diff -Nru zabbix-2.2.1+dfsg/debian/zabbix-server-sqlite3.zabbix-server.upstart zabbix-2.2.1+dfsg/debian/zabbix-server-sqlite3.zabbix-server.upstart --- zabbix-2.2.1+dfsg/debian/zabbix-server-sqlite3.zabbix-server.upstart 1970-01-01 01:00:00.000000000 +0100 +++ zabbix-2.2.1+dfsg/debian/zabbix-server-sqlite3.zabbix-server.upstart 2014-02-06 22:55:03.000000000 +0100 @@ -0,0 +1,41 @@ +# Upstart job to start the zabbix server + +description "Zabbix server" +author "Christian Kampka " + +start on (filesystem and net-device-up IFACE=lo) +stop on runlevel [!2345] + +expect daemon + +respawn + +# wait for server to properly disconnect from connected nodes +kill timeout 30 + +console log + +env DIR="/var/run/zabbix" + +pre-start script + + # stop job from continuing if no config file found for daemon + [ ! -f /etc/default/zabbix-server ] && { stop; exit 0; } + + # source the config file + . /etc/default/zabbix-server + + # stop job from continuing if admin has not enabled service in + # config file. + [ "x$START" = "xyes" ] || { stop; exit 0; } + + [ -d "$DIR" ] || mkdir "$DIR" + chown -R zabbix:zabbix "$DIR" + +end script + +script + . /etc/default/zabbix-server + + exec /usr/sbin/zabbix_server -c $CONFIG_FILE +end script diff -Nru zabbix-2.2.1+dfsg/debian/zabbix-server-.upstart zabbix-2.2.1+dfsg/debian/zabbix-server-.upstart --- zabbix-2.2.1+dfsg/debian/zabbix-server-.upstart 1970-01-01 01:00:00.000000000 +0100 +++ zabbix-2.2.1+dfsg/debian/zabbix-server-.upstart 2014-02-06 22:55:03.000000000 +0100 @@ -0,0 +1,41 @@ +# Upstart job to start the zabbix server + +description "Zabbix server" +author "Christian Kampka " + +start on (filesystem and net-device-up IFACE=lo) +stop on runlevel [!2345] + +expect daemon + +respawn + +# wait for server to properly disconnect from connected nodes +kill timeout 30 + +console log + +env DIR="/var/run/zabbix" + +pre-start script + + # stop job from continuing if no config file found for daemon + [ ! -f /etc/default/zabbix-server ] && { stop; exit 0; } + + # source the config file + . /etc/default/zabbix-server + + # stop job from continuing if admin has not enabled service in + # config file. + [ "x$START" = "xyes" ] || { stop; exit 0; } + + [ -d "$DIR" ] || mkdir "$DIR" + chown -R zabbix:zabbix "$DIR" + +end script + +script + . /etc/default/zabbix-server + + exec /usr/sbin/zabbix_server -c $CONFIG_FILE +end script