| 1 |
mattm 12/08/01 22:27:49 |
| 2 |
|
| 3 |
Modified: zabbix-agentd zabbix-server |
| 4 |
Log: |
| 5 |
Fixes for bug 426818 and bug 427740. Modified init scripts to create /var/run/zabbix if needed and added 'sysvipc' to php dependency use flags. |
| 6 |
|
| 7 |
(Portage version: 2.1.11.9/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.3 net-analyzer/zabbix/files/2.0/init.d/zabbix-agentd |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/zabbix/files/2.0/init.d/zabbix-agentd?rev=1.3&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/zabbix/files/2.0/init.d/zabbix-agentd?rev=1.3&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/zabbix/files/2.0/init.d/zabbix-agentd?r1=1.2&r2=1.3 |
| 15 |
|
| 16 |
Index: zabbix-agentd |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/files/2.0/init.d/zabbix-agentd,v |
| 19 |
retrieving revision 1.2 |
| 20 |
retrieving revision 1.3 |
| 21 |
diff -u -r1.2 -r1.3 |
| 22 |
--- zabbix-agentd 22 May 2012 11:34:02 -0000 1.2 |
| 23 |
+++ zabbix-agentd 1 Aug 2012 22:27:49 -0000 1.3 |
| 24 |
@@ -1,9 +1,10 @@ |
| 25 |
#!/sbin/runscript |
| 26 |
# Copyright 1999-2012 Gentoo Foundation |
| 27 |
# Distributed under the terms of the GNU General Public License v2 |
| 28 |
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/files/2.0/init.d/zabbix-agentd,v 1.2 2012/05/22 11:34:02 mattm Exp $ |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/files/2.0/init.d/zabbix-agentd,v 1.3 2012/08/01 22:27:49 mattm Exp $ |
| 30 |
|
| 31 |
pid_file="/var/run/zabbix/zabbix_agentd.pid" |
| 32 |
+dir="/var/run/zabbix" |
| 33 |
|
| 34 |
depend() { |
| 35 |
need net |
| 36 |
@@ -12,6 +13,11 @@ |
| 37 |
} |
| 38 |
|
| 39 |
start() { |
| 40 |
+ if [ ! -d "${dir}" ]; then |
| 41 |
+ einfo " Creating ${dir}" |
| 42 |
+ /bin/mkdir -p "${dir}" |
| 43 |
+ /bin/chown zabbix:zabbix "${dir}" |
| 44 |
+ fi |
| 45 |
ebegin "Starting Zabbix agent" |
| 46 |
start-stop-daemon --start --pidfile ${pid_file} \ |
| 47 |
--user zabbix --group zabbix --exec /usr/sbin/zabbix_agentd -- -c /etc/zabbix/zabbix_agentd.conf |
| 48 |
|
| 49 |
|
| 50 |
|
| 51 |
1.2 net-analyzer/zabbix/files/2.0/init.d/zabbix-server |
| 52 |
|
| 53 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/zabbix/files/2.0/init.d/zabbix-server?rev=1.2&view=markup |
| 54 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/zabbix/files/2.0/init.d/zabbix-server?rev=1.2&content-type=text/plain |
| 55 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/zabbix/files/2.0/init.d/zabbix-server?r1=1.1&r2=1.2 |
| 56 |
|
| 57 |
Index: zabbix-server |
| 58 |
=================================================================== |
| 59 |
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/files/2.0/init.d/zabbix-server,v |
| 60 |
retrieving revision 1.1 |
| 61 |
retrieving revision 1.2 |
| 62 |
diff -u -r1.1 -r1.2 |
| 63 |
--- zabbix-server 22 May 2012 11:34:02 -0000 1.1 |
| 64 |
+++ zabbix-server 1 Aug 2012 22:27:49 -0000 1.2 |
| 65 |
@@ -1,7 +1,10 @@ |
| 66 |
#!/sbin/runscript |
| 67 |
# Copyright 1999-2012 Gentoo Foundation |
| 68 |
# Distributed under the terms of the GNU General Public License v2 |
| 69 |
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/files/2.0/init.d/zabbix-server,v 1.1 2012/05/22 11:34:02 mattm Exp $ |
| 70 |
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/files/2.0/init.d/zabbix-server,v 1.2 2012/08/01 22:27:49 mattm Exp $ |
| 71 |
+ |
| 72 |
+pid_file="/var/run/zabbix/zabbix_server.pid" |
| 73 |
+dir="/var/run/zabbix" |
| 74 |
|
| 75 |
depend() { |
| 76 |
need net |
| 77 |
@@ -9,13 +12,19 @@ |
| 78 |
} |
| 79 |
|
| 80 |
start() { |
| 81 |
+ if [ ! -d "${dir}" ]; then |
| 82 |
+ einfo " Creating ${dir}" |
| 83 |
+ /bin/mkdir -p "${dir}" |
| 84 |
+ /bin/chown zabbix:zabbix "${dir}" |
| 85 |
+ fi |
| 86 |
ebegin "Starting Zabbix server" |
| 87 |
- start-stop-daemon --start --user zabbix --group zabbix --exec /usr/sbin/zabbix_server -- -c /etc/zabbix/zabbix_server.conf |
| 88 |
+ start-stop-daemon --start --user zabbix --group zabbix --pidfile ${pid_file} \ |
| 89 |
+ --exec /usr/sbin/zabbix_server -- -c /etc/zabbix/zabbix_server.conf |
| 90 |
eend $? |
| 91 |
} |
| 92 |
|
| 93 |
stop() { |
| 94 |
ebegin "Stopping Zabbix server" |
| 95 |
- start-stop-daemon --stop --pidfile /var/run/zabbix/zabbix_server.pid |
| 96 |
+ start-stop-daemon --stop --pidfile ${pid_file} |
| 97 |
eend $? |
| 98 |
} |
Archives