Package: src:zabbix Version: 1:2.0.2+dfsg-5 Ubuntu uses Upstart instead of SysVInit to run the init process. Attached debdiff includes upstart scripts that will allow Upstart to start/stop all zabbix daemon components. Installation of the scripts will happen automatically using Ubuntus Upstart debhelper scripts, Debian will simply ignore them.
I am aware that Debian will benefit little from these, especially since its Upstart version is quite old. Nevertheless, I believe it's reasonable to get the patch to enter Ubuntus repositories through upstream Debian. Cheers, Christian
diff -Nru zabbix-2.0.2+dfsg/debian/changelog zabbix-2.0.2+dfsg/debian/changelog
--- zabbix-2.0.2+dfsg/debian/changelog 2012-09-08 11:23:45.000000000 +0200
+++ zabbix-2.0.2+dfsg/debian/changelog 2012-09-08 14:25:00.000000000 +0200
@@ -1,3 +1,10 @@
+zabbix (1:2.0.2+dfsg-6) UNRELEASED; urgency=low
+
+ * Extended default config for agent and proxy.
+ * Upstart support for all zabbix components.
+
+ -- Christian Kampka <ch...@emerge-life.de> Sat, 08 Sep 2012 11:24:07 +0200
+
zabbix (1:2.0.2+dfsg-5) UNRELEASED; urgency=low
* xz compression for binary packages.
diff -Nru zabbix-2.0.2+dfsg/debian/zabbix-agent.default
zabbix-2.0.2+dfsg/debian/zabbix-agent.default
--- zabbix-2.0.2+dfsg/debian/zabbix-agent.default 1970-01-01
01:00:00.000000000 +0100
+++ zabbix-2.0.2+dfsg/debian/zabbix-agent.default 2012-09-08
14:25:00.000000000 +0200
@@ -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.0.2+dfsg/debian/zabbix-agent.upstart
zabbix-2.0.2+dfsg/debian/zabbix-agent.upstart
--- zabbix-2.0.2+dfsg/debian/zabbix-agent.upstart 1970-01-01
01:00:00.000000000 +0100
+++ zabbix-2.0.2+dfsg/debian/zabbix-agent.upstart 2012-09-08
14:25:00.000000000 +0200
@@ -0,0 +1,41 @@
+# Upstart job to start the zabbix agent
+
+description "Zabbix agent"
+author "Christian Kampka <ch...@emerge-life.de>"
+
+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.0.2+dfsg/debian/zabbix-proxy-mysql.zabbix-proxy.default
zabbix-2.0.2+dfsg/debian/zabbix-proxy-mysql.zabbix-proxy.default
--- zabbix-2.0.2+dfsg/debian/zabbix-proxy-mysql.zabbix-proxy.default
2012-09-08 11:23:45.000000000 +0200
+++ zabbix-2.0.2+dfsg/debian/zabbix-proxy-mysql.zabbix-proxy.default
2012-09-08 14:25:00.000000000 +0200
@@ -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.0.2+dfsg/debian/zabbix-proxy-mysql.zabbix-proxy.upstart
zabbix-2.0.2+dfsg/debian/zabbix-proxy-mysql.zabbix-proxy.upstart
--- zabbix-2.0.2+dfsg/debian/zabbix-proxy-mysql.zabbix-proxy.upstart
1970-01-01 01:00:00.000000000 +0100
+++ zabbix-2.0.2+dfsg/debian/zabbix-proxy-mysql.zabbix-proxy.upstart
2012-09-08 14:25:00.000000000 +0200
@@ -0,0 +1,41 @@
+# Upstart job to start the zabbix proxy
+
+description "Zabbix proxy"
+author "Christian Kampka <ch...@emerge-life.de>"
+
+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.0.2+dfsg/debian/zabbix-proxy-pgsql.zabbix-proxy.default
zabbix-2.0.2+dfsg/debian/zabbix-proxy-pgsql.zabbix-proxy.default
--- zabbix-2.0.2+dfsg/debian/zabbix-proxy-pgsql.zabbix-proxy.default
2012-09-08 11:23:45.000000000 +0200
+++ zabbix-2.0.2+dfsg/debian/zabbix-proxy-pgsql.zabbix-proxy.default
2012-09-08 14:25:00.000000000 +0200
@@ -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.0.2+dfsg/debian/zabbix-proxy-pgsql.zabbix-proxy.upstart
zabbix-2.0.2+dfsg/debian/zabbix-proxy-pgsql.zabbix-proxy.upstart
--- zabbix-2.0.2+dfsg/debian/zabbix-proxy-pgsql.zabbix-proxy.upstart
1970-01-01 01:00:00.000000000 +0100
+++ zabbix-2.0.2+dfsg/debian/zabbix-proxy-pgsql.zabbix-proxy.upstart
2012-09-08 14:25:00.000000000 +0200
@@ -0,0 +1,41 @@
+# Upstart job to start the zabbix proxy
+
+description "Zabbix proxy"
+author "Christian Kampka <ch...@emerge-life.de>"
+
+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.0.2+dfsg/debian/zabbix-proxy-sqlite3.zabbix-proxy.default
zabbix-2.0.2+dfsg/debian/zabbix-proxy-sqlite3.zabbix-proxy.default
--- zabbix-2.0.2+dfsg/debian/zabbix-proxy-sqlite3.zabbix-proxy.default
2012-09-08 11:23:45.000000000 +0200
+++ zabbix-2.0.2+dfsg/debian/zabbix-proxy-sqlite3.zabbix-proxy.default
2012-09-08 14:25:00.000000000 +0200
@@ -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.0.2+dfsg/debian/zabbix-proxy-sqlite3.zabbix-proxy.upstart
zabbix-2.0.2+dfsg/debian/zabbix-proxy-sqlite3.zabbix-proxy.upstart
--- zabbix-2.0.2+dfsg/debian/zabbix-proxy-sqlite3.zabbix-proxy.upstart
1970-01-01 01:00:00.000000000 +0100
+++ zabbix-2.0.2+dfsg/debian/zabbix-proxy-sqlite3.zabbix-proxy.upstart
2012-09-08 14:25:00.000000000 +0200
@@ -0,0 +1,41 @@
+# Upstart job to start the zabbix proxy
+
+description "Zabbix proxy"
+author "Christian Kampka <ch...@emerge-life.de>"
+
+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.0.2+dfsg/debian/zabbix-proxy-.upstart
zabbix-2.0.2+dfsg/debian/zabbix-proxy-.upstart
--- zabbix-2.0.2+dfsg/debian/zabbix-proxy-.upstart 1970-01-01
01:00:00.000000000 +0100
+++ zabbix-2.0.2+dfsg/debian/zabbix-proxy-.upstart 2012-09-08
14:25:00.000000000 +0200
@@ -0,0 +1,41 @@
+# Upstart job to start the zabbix proxy
+
+description "Zabbix proxy"
+author "Christian Kampka <ch...@emerge-life.de>"
+
+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.0.2+dfsg/debian/zabbix-server-mysql.zabbix-server.default
zabbix-2.0.2+dfsg/debian/zabbix-server-mysql.zabbix-server.default
--- zabbix-2.0.2+dfsg/debian/zabbix-server-mysql.zabbix-server.default
2012-09-08 11:23:45.000000000 +0200
+++ zabbix-2.0.2+dfsg/debian/zabbix-server-mysql.zabbix-server.default
2012-09-08 14:25:00.000000000 +0200
@@ -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.0.2+dfsg/debian/zabbix-server-mysql.zabbix-server.upstart
zabbix-2.0.2+dfsg/debian/zabbix-server-mysql.zabbix-server.upstart
--- zabbix-2.0.2+dfsg/debian/zabbix-server-mysql.zabbix-server.upstart
1970-01-01 01:00:00.000000000 +0100
+++ zabbix-2.0.2+dfsg/debian/zabbix-server-mysql.zabbix-server.upstart
2012-09-08 14:25:00.000000000 +0200
@@ -0,0 +1,41 @@
+# Upstart job to start the zabbix server
+
+description "Zabbix server"
+author "Christian Kampka <ch...@emerge-life.de>"
+
+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.0.2+dfsg/debian/zabbix-server-pgsql.zabbix-server.default
zabbix-2.0.2+dfsg/debian/zabbix-server-pgsql.zabbix-server.default
--- zabbix-2.0.2+dfsg/debian/zabbix-server-pgsql.zabbix-server.default
2012-09-08 11:23:45.000000000 +0200
+++ zabbix-2.0.2+dfsg/debian/zabbix-server-pgsql.zabbix-server.default
2012-09-08 14:25:00.000000000 +0200
@@ -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.0.2+dfsg/debian/zabbix-server-pgsql.zabbix-server.upstart
zabbix-2.0.2+dfsg/debian/zabbix-server-pgsql.zabbix-server.upstart
--- zabbix-2.0.2+dfsg/debian/zabbix-server-pgsql.zabbix-server.upstart
1970-01-01 01:00:00.000000000 +0100
+++ zabbix-2.0.2+dfsg/debian/zabbix-server-pgsql.zabbix-server.upstart
2012-09-08 14:25:00.000000000 +0200
@@ -0,0 +1,41 @@
+# Upstart job to start the zabbix server
+
+description "Zabbix server"
+author "Christian Kampka <ch...@emerge-life.de>"
+
+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.0.2+dfsg/debian/zabbix-server-sqlite3.zabbix-server.default
zabbix-2.0.2+dfsg/debian/zabbix-server-sqlite3.zabbix-server.default
--- zabbix-2.0.2+dfsg/debian/zabbix-server-sqlite3.zabbix-server.default
2012-09-08 11:23:45.000000000 +0200
+++ zabbix-2.0.2+dfsg/debian/zabbix-server-sqlite3.zabbix-server.default
2012-09-08 14:25:00.000000000 +0200
@@ -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.0.2+dfsg/debian/zabbix-server-sqlite3.zabbix-server.upstart
zabbix-2.0.2+dfsg/debian/zabbix-server-sqlite3.zabbix-server.upstart
--- zabbix-2.0.2+dfsg/debian/zabbix-server-sqlite3.zabbix-server.upstart
1970-01-01 01:00:00.000000000 +0100
+++ zabbix-2.0.2+dfsg/debian/zabbix-server-sqlite3.zabbix-server.upstart
2012-09-08 14:25:00.000000000 +0200
@@ -0,0 +1,41 @@
+# Upstart job to start the zabbix server
+
+description "Zabbix server"
+author "Christian Kampka <ch...@emerge-life.de>"
+
+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.0.2+dfsg/debian/zabbix-server-.upstart
zabbix-2.0.2+dfsg/debian/zabbix-server-.upstart
--- zabbix-2.0.2+dfsg/debian/zabbix-server-.upstart 1970-01-01
01:00:00.000000000 +0100
+++ zabbix-2.0.2+dfsg/debian/zabbix-server-.upstart 2012-09-08
14:25:00.000000000 +0200
@@ -0,0 +1,41 @@
+# Upstart job to start the zabbix server
+
+description "Zabbix server"
+author "Christian Kampka <ch...@emerge-life.de>"
+
+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
signature.asc
Description: OpenPGP digital signature
