[gentoo-commits] repo/gentoo:master commit in: net-im/prosody/files/

[gentoo-commits] repo/gentoo:master commit in: net-im/prosody/files/

[Patrice Clement]

commit:     1dcfab84164d20827525beaecd6f4ffc8f34b46a
Author:     jgeboski <jgeboski <AT> gmail <DOT> com>
AuthorDate: Sun May 22 21:50:11 2016 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Sun Jun  5 08:33:44 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1dcfab84

net-im/prosody: added the reload action to the systemd service

Package-Manager: portage-2.3.0_rc1
Acked-by: Michał Górny <mgorny <AT> gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/1517

Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>

 net-im/prosody/files/prosody.service | 1 +
 1 file changed, 1 insertion(+)

diff --git a/net-im/prosody/files/prosody.service b/net-im/prosody/files/prosody.service
index ec00e54..5c5ea87 100644
--- a/net-im/prosody/files/prosody.service
+++ b/net-im/prosody/files/prosody.service
@@ -6,6 +6,7 @@ After=network.target
 Type=forking
 PIDFile=/var/run/jabber/prosody.pid
 ExecStart=/usr/bin/prosodyctl start
+ExecReload=/usr/bin/prosodyctl reload
 ExecStop=/usr/bin/prosodyctl stop
 
 [Install]

[gentoo-commits] repo/gentoo:master commit in: net-im/prosody/files/

[Andreas Sturmlechner]

commit:     dabee5b7a40a5914d00b2b501314c55ed0c61843
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Fri Mar  1 17:19:37 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Mar  1 19:03:48 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dabee5b7

net-im/prosody: remove unused patch

Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/11189
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 net-im/prosody/files/prosody-0.10.0-cfg.lua.patch | 41 -----------------------
 1 file changed, 41 deletions(-)

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
deleted file mode 100644
index d0600ac6d67..00000000000
--- a/net-im/prosody/files/prosody-0.10.0-cfg.lua.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- prosody-0.10.0/prosody.cfg.lua.dist	2017-10-05 11:27:20.852452270 +0200
-+++ prosody-0.10.0-gentoo/prosody.cfg.lua.dist	2017-10-05 11:29:07.151997654 +0200
-@@ -1,5 +1,3 @@
---- Prosody Example Configuration File
----
- -- Information on configuring Prosody can be found on our
- -- website at https://prosody.im/doc/configure
- --
-@@ -9,8 +7,6 @@
- -- 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 ----------
-@@ -80,6 +76,12 @@
- 		--"proxy65"; -- Enables a file transfer proxy service which clients behind NAT can use
- }
- 
-+-- 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 = {
-@@ -161,8 +163,8 @@
- -- Logging configuration
- -- For advanced logging see https://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
- }

[gentoo-commits] repo/gentoo:master commit in: net-im/prosody/files/

[Aaron Bauman]

commit:     40548982669f3da305444b43e313dba30f10be2a
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Wed Jun 17 14:17:50 2020 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Wed Jun 17 17:49:43 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40548982

net-im/prosody: remove unused patch

Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/16297
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>

 net-im/prosody/files/prosody-0.9.2-cfg.lua.patch | 52 ------------------------
 1 file changed, 52 deletions(-)

diff --git a/net-im/prosody/files/prosody-0.9.2-cfg.lua.patch b/net-im/prosody/files/prosody-0.9.2-cfg.lua.patch
deleted file mode 100644
index 15c09a24fd8..00000000000
--- a/net-im/prosody/files/prosody-0.9.2-cfg.lua.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-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
- }