[gentoo-commits] gentoo-x86 commit in net-im/prosody/files: prosody.initd prosody-0.9.2-cfg.lua.patch prosody.initd.old

[Jason Donenfeld (zx2c4)]

zx2c4       14/01/27 02:21:51

  Modified:             prosody.initd
  Added:                prosody-0.9.2-cfg.lua.patch prosody.initd.old
  Log:
  Version bump and rework init system.
  
  (Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key A5DE03AE)

Revision  Changes    Path
1.3                  net-im/prosody/files/prosody.initd

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/prosody/files/prosody.initd?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/prosody/files/prosody.initd?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/prosody/files/prosody.initd?r1=1.2&r2=1.3

Index: prosody.initd
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-im/prosody/files/prosody.initd,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- prosody.initd	27 Nov 2012 09:20:26 -0000	1.2
+++ prosody.initd	27 Jan 2014 02:21:51 -0000	1.3
@@ -1,15 +1,12 @@
 #!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/prosody/files/prosody.initd,v 1.2 2012/11/27 09:20:26 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/prosody/files/prosody.initd,v 1.3 2014/01/27 02:21:51 zx2c4 Exp $
 
 description="Prosody is a server for Jabber/XMPP written in Lua."
 description_reload="Reload configuration and reopen log files."
 extra_started_commands="reload"
-
-PIDFILE="/var/run/jabber/prosody.pid"
-USER="jabber"
-COMMAND="/usr/bin/prosody"
+pidfile="/var/run/jabber/prosody.pid"
 
 depend() {
 	use dns
@@ -22,26 +19,28 @@
 		eerror "You need a /etc/jabber/prosody.cfg.lua file to run prosody"
 		return 1
 	fi
+	luac -p /etc/jabber/prosody.cfg.lua
+	return $?
 }
 
 start() {
 	checkconfig || return 1
 	checkpath -q -d -m 0770 -o jabber:jabber /var/run/jabber
+	checkpath -q -d -m 0750 -o jabber:jabber /var/log/jabber
 	ebegin "Starting Prosody XMPP Server"
-	start-stop-daemon --start -b --pidfile ${PIDFILE} \
-		--make-pidfile --user ${USER} --exec ${COMMAND}
+	prosodyctl start
 	eend $?
 }
 
 stop() {
 	ebegin "Stopping Prosody XMPP Server"
-	start-stop-daemon --stop --pidfile ${PIDFILE} \
-		--user ${USER} --exec ${COMMAND}
+	prosodyctl stop
 	eend $?
 }
 
 reload() {
+	checkconfig || return 1
 	ebegin "Reloading configuration of Prosody XMPP Server"
-	start-stop-daemon --pidfile ${PIDFILE} --signal HUP
+	prosodyctl reload
 	eend $?
 }



1.1                  net-im/prosody/files/prosody-0.9.2-cfg.lua.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/prosody/files/prosody-0.9.2-cfg.lua.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/prosody/files/prosody-0.9.2-cfg.lua.patch?rev=1.1&content-type=text/plain

Index: prosody-0.9.2-cfg.lua.patch
===================================================================
diff -ru prosody-0.9.2/prosody.cfg.lua.dist prosody-0.9.2-gentoo/prosody.cfg.lua.dist
--- prosody-0.9.2/prosody.cfg.lua.dist	2013-12-08 19:05:39.000000000 +0100
+++ prosody-0.9.2-gentoo/prosody.cfg.lua.dist	2014-01-27 03:00:44.929196948 +0100
@@ -1,5 +1,3 @@
--- Prosody Example Configuration File
---
 -- Information on configuring Prosody can be found on our
 -- website at http://prosody.im/doc/configure
 --
@@ -7,9 +5,6 @@
 -- when you have finished by running: luac -p prosody.cfg.lua
 -- If there are any errors, it will let you know what and where
 -- they are, otherwise it will keep quiet.
---
--- The only thing left to do is rename this file to remove the .dist ending, and fill in the
--- blanks. Good luck, and happy Jabbering!
 
 
 ---------- Server-wide settings ----------
@@ -63,7 +58,7 @@
 		--"http_files"; -- Serve static files from a directory over HTTP
 
 	-- Other specific functionality
-		--"posix"; -- POSIX functionality, sends server to background, enables syslog, etc.
+		"posix"; -- POSIX functionality, sends server to background, enables syslog, etc. (Keep enabled for Gentoo.)
 		--"groups"; -- Shared roster support
 		--"announce"; -- Send announcement to all online users
 		--"welcome"; -- Welcome users who register accounts
@@ -72,6 +67,12 @@
 		--"legacyauth"; -- Legacy authentication. Only used by some old clients and bots.
 };
 
+-- Settings for Gentoo init script and net-im/jabber-base permissions system:
+daemonize = true;
+prosody_user = "jabber";
+prosody_group = "jabber";
+pidfile = "/var/run/jabber/prosody.pid";
+
 -- These modules are auto-loaded, but should you want
 -- to disable them then uncomment them here:
 modules_disabled = {
@@ -139,8 +140,8 @@
 -- Logging configuration
 -- For advanced logging see http://prosody.im/doc/logging
 log = {
-	info = "prosody.log"; -- Change 'info' to 'debug' for verbose logging
-	error = "prosody.err";
+	info = "/var/log/jabber/prosody.log"; -- Change 'info' to 'debug' for verbose logging
+	error = "/var/log/jabber/prosody.err";
 	-- "*syslog"; -- Uncomment this for logging to syslog
 	-- "*console"; -- Log to the console, useful for debugging with daemonize=false
 }



1.1                  net-im/prosody/files/prosody.initd.old

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/prosody/files/prosody.initd.old?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/prosody/files/prosody.initd.old?rev=1.1&content-type=text/plain

Index: prosody.initd.old
===================================================================
#!/sbin/runscript
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/net-im/prosody/files/prosody.initd.old,v 1.1 2014/01/27 02:21:51 zx2c4 Exp $

description="Prosody is a server for Jabber/XMPP written in Lua."
description_reload="Reload configuration and reopen log files."
extra_started_commands="reload"

PIDFILE="/var/run/jabber/prosody.pid"
USER="jabber"
COMMAND="/usr/bin/prosody"

depend() {
	use dns
	need net
	provide jabber-server
}

checkconfig() {
	if [ ! -e /etc/jabber/prosody.cfg.lua ] ; then
		eerror "You need a /etc/jabber/prosody.cfg.lua file to run prosody"
		return 1
	fi
}

start() {
	checkconfig || return 1
	checkpath -q -d -m 0770 -o jabber:jabber /var/run/jabber
	ebegin "Starting Prosody XMPP Server"
	start-stop-daemon --start -b --pidfile ${PIDFILE} \
		--make-pidfile --user ${USER} --exec ${COMMAND}
	eend $?
}

stop() {
	ebegin "Stopping Prosody XMPP Server"
	start-stop-daemon --stop --pidfile ${PIDFILE} \
		--user ${USER} --exec ${COMMAND}
	eend $?
}

reload() {
	ebegin "Reloading configuration of Prosody XMPP Server"
	start-stop-daemon --pidfile ${PIDFILE} --signal HUP
	eend $?
}