public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in net-analyzer/zabbix/files/2.0/init.d: zabbix-agentd zabbix-server
@ 2012-05-22 11:34 Matthew Marlow (mattm)
  0 siblings, 0 replies; 4+ messages in thread
From: Matthew Marlow (mattm) @ 2012-05-22 11:34 UTC (permalink / raw
  To: gentoo-commits

mattm       12/05/22 11:34:02

  Modified:             zabbix-agentd
  Added:                zabbix-server
  Log:
  Bump for Zabbix 2.0! Everyone go wild!  Also, some minor init script and elog msg updates.
  
  (Portage version: 2.1.10.62/cvs/Linux x86_64)

Revision  Changes    Path
1.2                  net-analyzer/zabbix/files/2.0/init.d/zabbix-agentd

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/zabbix/files/2.0/init.d/zabbix-agentd?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/zabbix/files/2.0/init.d/zabbix-agentd?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/zabbix/files/2.0/init.d/zabbix-agentd?r1=1.1&r2=1.2

Index: zabbix-agentd
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/files/2.0/init.d/zabbix-agentd,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- zabbix-agentd	18 May 2012 05:31:08 -0000	1.1
+++ zabbix-agentd	22 May 2012 11:34:02 -0000	1.2
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/files/2.0/init.d/zabbix-agentd,v 1.1 2012/05/18 05:31:08 mattm Exp $
+# $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 $
 
 pid_file="/var/run/zabbix/zabbix_agentd.pid"
 
@@ -14,7 +14,7 @@
 start() {
 	ebegin "Starting Zabbix agent"
 	start-stop-daemon --start --pidfile ${pid_file} \
-		--user zabbix --group zabbix --exec /usr/sbin/zabbix_agentd
+		--user zabbix --group zabbix --exec /usr/sbin/zabbix_agentd -- -c /etc/zabbix/zabbix_agentd.conf
 	eend $?
 }
 



1.1                  net-analyzer/zabbix/files/2.0/init.d/zabbix-server

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/zabbix/files/2.0/init.d/zabbix-server?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/zabbix/files/2.0/init.d/zabbix-server?rev=1.1&content-type=text/plain

Index: zabbix-server
===================================================================
#!/sbin/runscript
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $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 $

depend() {
	need net
	use mysql postgresql
}

start() {
	ebegin "Starting Zabbix server"
	start-stop-daemon --start --user zabbix --group zabbix --exec /usr/sbin/zabbix_server -- -c /etc/zabbix/zabbix_server.conf
	eend $?
}

stop() {
	ebegin "Stopping Zabbix server"
	start-stop-daemon --stop --pidfile /var/run/zabbix/zabbix_server.pid
	eend $?
}






^ permalink raw reply	[flat|nested] 4+ messages in thread

* [gentoo-commits] gentoo-x86 commit in net-analyzer/zabbix/files/2.0/init.d: zabbix-agentd zabbix-server
@ 2012-08-01 22:27 Matthew Marlow (mattm)
  0 siblings, 0 replies; 4+ messages in thread
From: Matthew Marlow (mattm) @ 2012-08-01 22:27 UTC (permalink / raw
  To: gentoo-commits

mattm       12/08/01 22:27:49

  Modified:             zabbix-agentd zabbix-server
  Log:
  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.
  
  (Portage version: 2.1.11.9/cvs/Linux x86_64)

Revision  Changes    Path
1.3                  net-analyzer/zabbix/files/2.0/init.d/zabbix-agentd

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/zabbix/files/2.0/init.d/zabbix-agentd?rev=1.3&view=markup
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
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

Index: zabbix-agentd
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/files/2.0/init.d/zabbix-agentd,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- zabbix-agentd	22 May 2012 11:34:02 -0000	1.2
+++ zabbix-agentd	1 Aug 2012 22:27:49 -0000	1.3
@@ -1,9 +1,10 @@
 #!/sbin/runscript
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $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 $
+# $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 $
 
 pid_file="/var/run/zabbix/zabbix_agentd.pid"
+dir="/var/run/zabbix"
 
 depend() {
 	need net
@@ -12,6 +13,11 @@
 }
 
 start() {
+        if [ ! -d "${dir}" ]; then
+          einfo " Creating ${dir}"
+	  /bin/mkdir -p "${dir}"
+	  /bin/chown zabbix:zabbix "${dir}"
+	fi
 	ebegin "Starting Zabbix agent"
 	start-stop-daemon --start --pidfile ${pid_file} \
 		--user zabbix --group zabbix --exec /usr/sbin/zabbix_agentd -- -c /etc/zabbix/zabbix_agentd.conf



1.2                  net-analyzer/zabbix/files/2.0/init.d/zabbix-server

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/zabbix/files/2.0/init.d/zabbix-server?rev=1.2&view=markup
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
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

Index: zabbix-server
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/files/2.0/init.d/zabbix-server,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- zabbix-server	22 May 2012 11:34:02 -0000	1.1
+++ zabbix-server	1 Aug 2012 22:27:49 -0000	1.2
@@ -1,7 +1,10 @@
 #!/sbin/runscript
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $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 $
+# $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 $
+
+pid_file="/var/run/zabbix/zabbix_server.pid"
+dir="/var/run/zabbix"
 
 depend() {
 	need net
@@ -9,13 +12,19 @@
 }
 
 start() {
+	if [ ! -d "${dir}" ]; then
+	    einfo " Creating ${dir}"
+	    /bin/mkdir -p "${dir}"
+	    /bin/chown zabbix:zabbix "${dir}"
+	fi
 	ebegin "Starting Zabbix server"
-	start-stop-daemon --start --user zabbix --group zabbix --exec /usr/sbin/zabbix_server -- -c /etc/zabbix/zabbix_server.conf
+	start-stop-daemon --start --user zabbix --group zabbix --pidfile ${pid_file} \
+	        --exec /usr/sbin/zabbix_server -- -c /etc/zabbix/zabbix_server.conf
 	eend $?
 }
 
 stop() {
 	ebegin "Stopping Zabbix server"
-	start-stop-daemon --stop --pidfile /var/run/zabbix/zabbix_server.pid
+	start-stop-daemon --stop --pidfile ${pid_file} 
 	eend $?
 }





^ permalink raw reply	[flat|nested] 4+ messages in thread

* [gentoo-commits] gentoo-x86 commit in net-analyzer/zabbix/files/2.0/init.d: zabbix-agentd zabbix-server
@ 2012-12-27  2:55 Matthew Marlow (mattm)
  0 siblings, 0 replies; 4+ messages in thread
From: Matthew Marlow (mattm) @ 2012-12-27  2:55 UTC (permalink / raw
  To: gentoo-commits

mattm       12/12/27 02:55:43

  Modified:             zabbix-agentd zabbix-server
  Log:
  Bump for Zabbix 2.0.4
  Testing minor ebuild and init script changes, in particular with regard to new /var/run/subdirectory creation/handling.
  If testing goes well, 2.0.4 will eventually become the new stable after being keyworded ~amd64/~x86.
  It currently has no keywords.
  Current users of 1.8.x should consider 2.0.4 a future migration target.
  
  (Portage version: 2.1.11.31/cvs/Linux x86_64, signed Manifest commit with key 786037A7)

Revision  Changes    Path
1.4                  net-analyzer/zabbix/files/2.0/init.d/zabbix-agentd

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/zabbix/files/2.0/init.d/zabbix-agentd?rev=1.4&view=markup
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
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

Index: zabbix-agentd
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/files/2.0/init.d/zabbix-agentd,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- zabbix-agentd	1 Aug 2012 22:27:49 -0000	1.3
+++ zabbix-agentd	27 Dec 2012 02:55:43 -0000	1.4
@@ -1,10 +1,9 @@
 #!/sbin/runscript
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $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 $
+# $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 $
 
 pid_file="/var/run/zabbix/zabbix_agentd.pid"
-dir="/var/run/zabbix"
 
 depend() {
 	need net
@@ -12,12 +11,11 @@
 	use zabbix-server
 }
 
+start_pre() {
+	checkpath -d -m 0664 -o zabbix:zabbix /var/run/zabbix
+}
+
 start() {
-        if [ ! -d "${dir}" ]; then
-          einfo " Creating ${dir}"
-	  /bin/mkdir -p "${dir}"
-	  /bin/chown zabbix:zabbix "${dir}"
-	fi
 	ebegin "Starting Zabbix agent"
 	start-stop-daemon --start --pidfile ${pid_file} \
 		--user zabbix --group zabbix --exec /usr/sbin/zabbix_agentd -- -c /etc/zabbix/zabbix_agentd.conf



1.3                  net-analyzer/zabbix/files/2.0/init.d/zabbix-server

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/zabbix/files/2.0/init.d/zabbix-server?rev=1.3&view=markup
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
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

Index: zabbix-server
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/files/2.0/init.d/zabbix-server,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- zabbix-server	1 Aug 2012 22:27:49 -0000	1.2
+++ zabbix-server	27 Dec 2012 02:55:43 -0000	1.3
@@ -1,22 +1,19 @@
 #!/sbin/runscript
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $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 $
+# $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 $
 
 pid_file="/var/run/zabbix/zabbix_server.pid"
-dir="/var/run/zabbix"
 
 depend() {
 	need net
 	use mysql postgresql
 }
+start_pre() {
+	checkpath -d -m 0664 -o zabbix:zabbix /var/run/zabbix
+}
 
 start() {
-	if [ ! -d "${dir}" ]; then
-	    einfo " Creating ${dir}"
-	    /bin/mkdir -p "${dir}"
-	    /bin/chown zabbix:zabbix "${dir}"
-	fi
 	ebegin "Starting Zabbix server"
 	start-stop-daemon --start --user zabbix --group zabbix --pidfile ${pid_file} \
 	        --exec /usr/sbin/zabbix_server -- -c /etc/zabbix/zabbix_server.conf





^ permalink raw reply	[flat|nested] 4+ messages in thread

* [gentoo-commits] gentoo-x86 commit in net-analyzer/zabbix/files/2.0/init.d: zabbix-agentd zabbix-server
@ 2013-01-18 23:58 Matthew Marlow (mattm)
  0 siblings, 0 replies; 4+ messages in thread
From: Matthew Marlow (mattm) @ 2013-01-18 23:58 UTC (permalink / raw
  To: gentoo-commits

mattm       13/01/18 23:58:34

  Modified:             zabbix-agentd zabbix-server
  Log:
  Keyword change for 2.0.4-r1, ready for testing arches.  Also, minor fix for 2.0 init files.
  
  (Portage version: 2.1.11.43/cvs/Linux x86_64, signed Manifest commit with key 786037A7)

Revision  Changes    Path
1.5                  net-analyzer/zabbix/files/2.0/init.d/zabbix-agentd

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/zabbix/files/2.0/init.d/zabbix-agentd?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/zabbix/files/2.0/init.d/zabbix-agentd?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/zabbix/files/2.0/init.d/zabbix-agentd?r1=1.4&r2=1.5

Index: zabbix-agentd
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/files/2.0/init.d/zabbix-agentd,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- zabbix-agentd	27 Dec 2012 02:55:43 -0000	1.4
+++ zabbix-agentd	18 Jan 2013 23:58:34 -0000	1.5
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $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 $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/files/2.0/init.d/zabbix-agentd,v 1.5 2013/01/18 23:58:34 mattm Exp $
 
 pid_file="/var/run/zabbix/zabbix_agentd.pid"
 
@@ -12,7 +12,7 @@
 }
 
 start_pre() {
-	checkpath -d -m 0664 -o zabbix:zabbix /var/run/zabbix
+	checkpath -d -m 0775 -o zabbix:zabbix /var/run/zabbix
 }
 
 start() {



1.4                  net-analyzer/zabbix/files/2.0/init.d/zabbix-server

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/zabbix/files/2.0/init.d/zabbix-server?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/zabbix/files/2.0/init.d/zabbix-server?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/zabbix/files/2.0/init.d/zabbix-server?r1=1.3&r2=1.4

Index: zabbix-server
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/files/2.0/init.d/zabbix-server,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- zabbix-server	27 Dec 2012 02:55:43 -0000	1.3
+++ zabbix-server	18 Jan 2013 23:58:34 -0000	1.4
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $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 $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/files/2.0/init.d/zabbix-server,v 1.4 2013/01/18 23:58:34 mattm Exp $
 
 pid_file="/var/run/zabbix/zabbix_server.pid"
 
@@ -10,7 +10,7 @@
 	use mysql postgresql
 }
 start_pre() {
-	checkpath -d -m 0664 -o zabbix:zabbix /var/run/zabbix
+	checkpath -d -m 0775 -o zabbix:zabbix /var/run/zabbix
 }
 
 start() {





^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2013-01-18 23:59 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-01-18 23:58 [gentoo-commits] gentoo-x86 commit in net-analyzer/zabbix/files/2.0/init.d: zabbix-agentd zabbix-server Matthew Marlow (mattm)
  -- strict thread matches above, loose matches on Subject: below --
2012-12-27  2:55 Matthew Marlow (mattm)
2012-08-01 22:27 Matthew Marlow (mattm)
2012-05-22 11:34 Matthew Marlow (mattm)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox