Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-im/prosody/files/
Date: Fri, 01 Mar 2019 19:04:33
Message-Id: 1551467028.dabee5b7a40a5914d00b2b501314c55ed0c61843.asturm@gentoo
1 commit: dabee5b7a40a5914d00b2b501314c55ed0c61843
2 Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
3 AuthorDate: Fri Mar 1 17:19:37 2019 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Fri Mar 1 19:03:48 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dabee5b7
7
8 net-im/prosody: remove unused patch
9
10 Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
11 Closes: https://github.com/gentoo/gentoo/pull/11189
12 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
13
14 net-im/prosody/files/prosody-0.10.0-cfg.lua.patch | 41 -----------------------
15 1 file changed, 41 deletions(-)
16
17 diff --git a/net-im/prosody/files/prosody-0.10.0-cfg.lua.patch b/net-im/prosody/files/prosody-0.10.0-cfg.lua.patch
18 deleted file mode 100644
19 index d0600ac6d67..00000000000
20 --- a/net-im/prosody/files/prosody-0.10.0-cfg.lua.patch
21 +++ /dev/null
22 @@ -1,41 +0,0 @@
23 ---- prosody-0.10.0/prosody.cfg.lua.dist 2017-10-05 11:27:20.852452270 +0200
24 -+++ prosody-0.10.0-gentoo/prosody.cfg.lua.dist 2017-10-05 11:29:07.151997654 +0200
25 -@@ -1,5 +1,3 @@
26 ---- Prosody Example Configuration File
27 ----
28 - -- Information on configuring Prosody can be found on our
29 - -- website at https://prosody.im/doc/configure
30 - --
31 -@@ -9,8 +7,6 @@
32 - -- If there are any errors, it will let you know what and where
33 - -- they are, otherwise it will keep quiet.
34 - --
35 ---- The only thing left to do is rename this file to remove the .dist ending, and fill in the
36 ---- blanks. Good luck, and happy Jabbering!
37 -
38 -
39 - ---------- Server-wide settings ----------
40 -@@ -80,6 +76,12 @@
41 - --"proxy65"; -- Enables a file transfer proxy service which clients behind NAT can use
42 - }
43 -
44 -+-- Settings for Gentoo init script and net-im/jabber-base permissions system:
45 -+daemonize = true;
46 -+prosody_user = "jabber";
47 -+prosody_group = "jabber";
48 -+pidfile = "/var/run/jabber/prosody.pid";
49 -+
50 - -- These modules are auto-loaded, but should you want
51 - -- to disable them then uncomment them here:
52 - modules_disabled = {
53 -@@ -161,8 +163,8 @@
54 - -- Logging configuration
55 - -- For advanced logging see https://prosody.im/doc/logging
56 - log = {
57 -- info = "prosody.log"; -- Change 'info' to 'debug' for verbose logging
58 -- error = "prosody.err";
59 -+ info = "/var/log/jabber/prosody.log"; -- Change 'info' to 'debug' for verbose logging
60 -+ error = "/var/log/jabber/prosody.err";
61 - -- "*syslog"; -- Uncomment this for logging to syslog
62 - -- "*console"; -- Log to the console, useful for debugging with daemonize=false
63 - }