diff options
Diffstat (limited to 'testing/prosody/prosody.cfg.lua.patch')
| -rw-r--r-- | testing/prosody/prosody.cfg.lua.patch | 40 |
1 files changed, 21 insertions, 19 deletions
diff --git a/testing/prosody/prosody.cfg.lua.patch b/testing/prosody/prosody.cfg.lua.patch index ca1c9b331f..9b837c85b5 100644 --- a/testing/prosody/prosody.cfg.lua.patch +++ b/testing/prosody/prosody.cfg.lua.patch @@ -1,32 +1,34 @@ ---- prosody.cfg.lua.org -+++ prosody.cfg.lua -@@ -22,6 +22,9 @@ - -- Example: admins = { "user1@example.com", "user2@example.net" } - admins = { } +diff -wbBur prosody-0.9.0.q/prosody.cfg.lua.dist prosody-0.9.0/prosody.cfg.lua.dist +--- prosody-0.9.0.q/prosody.cfg.lua.dist 2013-08-19 23:37:36.000000000 +0400 ++++ prosody-0.9.0/prosody.cfg.lua.dist 2013-08-21 16:17:49.175521891 +0400 +@@ -11,6 +11,8 @@ + -- 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! -+daemonize = true; -+pidfile = "/var/run/prosody/prosody.pid"; -+ - -- Enable use of libevent for better performance under high load - -- For more information see: http://prosody.im/doc/libevent - --use_libevent = true; -@@ -59,7 +62,7 @@ - --"admin_telnet"; -- Opens telnet console interface on localhost port 5582 ++daemonize = true ++pidfile = "/run/prosody/prosody.pid" + + ---------- Server-wide settings ---------- + -- Settings in this section apply to the whole server and are the default settings +@@ -63,7 +65,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. - --"bosh"; -- Enable BOSH clients, aka "Jabber over HTTP" - --"httpserver"; -- Serve static files from a directory over HTTP --"groups"; -- Shared roster support -@@ -123,8 +126,8 @@ + --"announce"; -- Send announcement to all online users + --"welcome"; -- Welcome users who register accounts +@@ -139,9 +141,9 @@ -- 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/prosody.log"; -- Change 'info' to 'debug' for verbose logging -+ error = "/var/log/prosody.err"; - -- "*syslog"; -- Uncomment this for logging to syslog +- -- "*syslog"; -- Uncomment this for logging to syslog ++ -- info = "prosody.log"; -- Change 'info' to 'debug' for verbose logging ++ -- error = "prosody.err"; ++ "*syslog"; -- Uncomment this for logging to syslog -- "*console"; -- Log to the console, useful for debugging with daemonize=false } + |