| 1 |
mattm 12/12/27 02:55:43 |
| 2 |
|
| 3 |
Modified: zabbix-agentd zabbix-server |
| 4 |
Log: |
| 5 |
Bump for Zabbix 2.0.4 |
| 6 |
Testing minor ebuild and init script changes, in particular with regard to new /var/run/subdirectory creation/handling. |
| 7 |
If testing goes well, 2.0.4 will eventually become the new stable after being keyworded ~amd64/~x86. |
| 8 |
It currently has no keywords. |
| 9 |
Current users of 1.8.x should consider 2.0.4 a future migration target. |
| 10 |
|
| 11 |
(Portage version: 2.1.11.31/cvs/Linux x86_64, signed Manifest commit with key 786037A7) |
| 12 |
|
| 13 |
Revision Changes Path |
| 14 |
1.4 net-analyzer/zabbix/files/2.0/init.d/zabbix-agentd |
| 15 |
|
| 16 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/zabbix/files/2.0/init.d/zabbix-agentd?rev=1.4&view=markup |
| 17 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/zabbix/files/2.0/init.d/zabbix-agentd?rev=1.4&content-type=text/plain |
| 18 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/zabbix/files/2.0/init.d/zabbix-agentd?r1=1.3&r2=1.4 |
| 19 |
|
| 20 |
Index: zabbix-agentd |
| 21 |
=================================================================== |
| 22 |
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/files/2.0/init.d/zabbix-agentd,v |
| 23 |
retrieving revision 1.3 |
| 24 |
retrieving revision 1.4 |
| 25 |
diff -u -r1.3 -r1.4 |
| 26 |
--- zabbix-agentd 1 Aug 2012 22:27:49 -0000 1.3 |
| 27 |
+++ zabbix-agentd 27 Dec 2012 02:55:43 -0000 1.4 |
| 28 |
@@ -1,10 +1,9 @@ |
| 29 |
#!/sbin/runscript |
| 30 |
# Copyright 1999-2012 Gentoo Foundation |
| 31 |
# Distributed under the terms of the GNU General Public License v2 |
| 32 |
-# $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 $ |
| 33 |
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/files/2.0/init.d/zabbix-agentd,v 1.4 2012/12/27 02:55:43 mattm Exp $ |
| 34 |
|
| 35 |
pid_file="/var/run/zabbix/zabbix_agentd.pid" |
| 36 |
-dir="/var/run/zabbix" |
| 37 |
|
| 38 |
depend() { |
| 39 |
need net |
| 40 |
@@ -12,12 +11,11 @@ |
| 41 |
use zabbix-server |
| 42 |
} |
| 43 |
|
| 44 |
+start_pre() { |
| 45 |
+ checkpath -d -m 0664 -o zabbix:zabbix /var/run/zabbix |
| 46 |
+} |
| 47 |
+ |
| 48 |
start() { |
| 49 |
- if [ ! -d "${dir}" ]; then |
| 50 |
- einfo " Creating ${dir}" |
| 51 |
- /bin/mkdir -p "${dir}" |
| 52 |
- /bin/chown zabbix:zabbix "${dir}" |
| 53 |
- fi |
| 54 |
ebegin "Starting Zabbix agent" |
| 55 |
start-stop-daemon --start --pidfile ${pid_file} \ |
| 56 |
--user zabbix --group zabbix --exec /usr/sbin/zabbix_agentd -- -c /etc/zabbix/zabbix_agentd.conf |
| 57 |
|
| 58 |
|
| 59 |
|
| 60 |
1.3 net-analyzer/zabbix/files/2.0/init.d/zabbix-server |
| 61 |
|
| 62 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/zabbix/files/2.0/init.d/zabbix-server?rev=1.3&view=markup |
| 63 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/zabbix/files/2.0/init.d/zabbix-server?rev=1.3&content-type=text/plain |
| 64 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/zabbix/files/2.0/init.d/zabbix-server?r1=1.2&r2=1.3 |
| 65 |
|
| 66 |
Index: zabbix-server |
| 67 |
=================================================================== |
| 68 |
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/files/2.0/init.d/zabbix-server,v |
| 69 |
retrieving revision 1.2 |
| 70 |
retrieving revision 1.3 |
| 71 |
diff -u -r1.2 -r1.3 |
| 72 |
--- zabbix-server 1 Aug 2012 22:27:49 -0000 1.2 |
| 73 |
+++ zabbix-server 27 Dec 2012 02:55:43 -0000 1.3 |
| 74 |
@@ -1,22 +1,19 @@ |
| 75 |
#!/sbin/runscript |
| 76 |
# Copyright 1999-2012 Gentoo Foundation |
| 77 |
# Distributed under the terms of the GNU General Public License v2 |
| 78 |
-# $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 $ |
| 79 |
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/files/2.0/init.d/zabbix-server,v 1.3 2012/12/27 02:55:43 mattm Exp $ |
| 80 |
|
| 81 |
pid_file="/var/run/zabbix/zabbix_server.pid" |
| 82 |
-dir="/var/run/zabbix" |
| 83 |
|
| 84 |
depend() { |
| 85 |
need net |
| 86 |
use mysql postgresql |
| 87 |
} |
| 88 |
+start_pre() { |
| 89 |
+ checkpath -d -m 0664 -o zabbix:zabbix /var/run/zabbix |
| 90 |
+} |
| 91 |
|
| 92 |
start() { |
| 93 |
- if [ ! -d "${dir}" ]; then |
| 94 |
- einfo " Creating ${dir}" |
| 95 |
- /bin/mkdir -p "${dir}" |
| 96 |
- /bin/chown zabbix:zabbix "${dir}" |
| 97 |
- fi |
| 98 |
ebegin "Starting Zabbix server" |
| 99 |
start-stop-daemon --start --user zabbix --group zabbix --pidfile ${pid_file} \ |
| 100 |
--exec /usr/sbin/zabbix_server -- -c /etc/zabbix/zabbix_server.conf |
Archives