Fix prosody

2 files changed, 36 insertions, 26 deletions

diff --git a/net-im/prosody/files/prosody-0.8.0-cfg.lua.patch b/net-im/prosody/files/prosody-0.8.0-cfg.lua.patch
new file mode 100644
index 0000000..6444a6b
--- /dev/null
+++ b/net-im/prosody/files/prosody-0.8.0-cfg.lua.patch
@@ -0,0 +1,36 @@
+diff --git a/prosody.cfg.lua.dist b/prosody.cfg.lua.dist
+index e513b11..08ebca6 100644
+--- a/prosody.cfg.lua.dist
++++ b/prosody.cfg.lua.dist
+@@ -105,6 +105,8 @@ ssl = {
+ -- default provider stores passwords in plaintext. If you do not trust your
+ -- server please see http://prosody.im/doc/modules/mod_auth_internal_hashed
+ -- for information about using the hashed backend.
++-- See http://prosody.im/doc/authentication for other possibilities including
++-- Cyrus SASL.
+ 
+ authentication = "internal_plain"
+ 
+@@ -123,12 +125,19 @@ authentication = "internal_plain"
+ -- 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";
+-	-- "*syslog"; -- Uncomment this for logging to syslog
++	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; needs mod_posix
+ 	-- "*console"; -- Log to the console, useful for debugging with daemonize=false
+ }
+ 
++-- Pidfile, used by prosodyctl and the init.d script
++pidfile = "/var/run/jabber/prosody.pid"
++
++-- User and group, used for daemon
++prosody_user = "jabber"
++prosody_group = "jabber"
++
+ ----------- Virtual hosts -----------
+ -- You need to add a VirtualHost entry for each domain you wish Prosody to serve.
+ -- Settings under each VirtualHost entry apply *only* to that host.
diff --git a/net-im/prosody/files/prosody-0.8.0.cfg.lua.patch b/net-im/prosody/files/prosody-0.8.0.cfg.lua.patch
deleted file mode 100644
index a5cbab2..0000000
--- a/net-im/prosody/files/prosody-0.8.0.cfg.lua.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- prosody.cfg.lua.dist.old	2011-01-13 02:29:32.000000000 +0100
-+++ prosody.cfg.lua.dist	2011-01-14 17:17:28.000000000 +0100
-@@ -114,15 +114,20 @@
- -- to update the logrotate config at /etc/logrotate.d/prosody
- log = {
-         -- Log all error messages to prosody.err
--	error = "/var/log/prosody/prosody.err";
-+	error = "/var/log/jabber/prosody.err";
-         -- Log everything of level "info" and higher (that is, all except "debug" messages)
-         -- to prosody.log
--        info = "/var/log/prosody/prosody.log"; -- Change 'info' to 'debug' for more verbose logging
-+        info = "/var/log/jabber/prosody.log"; -- Change 'info' to 'debug' for more verbose logging
-         --"*syslog"; -- Uncomment this for logging to syslog
- }
- 
- -- Pidfile, used by prosodyctl and the init.d script
--pidfile = "/var/run/prosody/prosody.pid";
-+pidfile = "/var/run/jabber/prosody.pid";
-+
-+-- User and group, used for daemon
-+prosody_user = "jabber";
-+prosody_group = "jabber";
-+
- 
- ----------- Virtual hosts -----------
- -- You need to add a VirtualHost entry for each domain you wish Prosody to serve.