diff --git a/srcpkgs/prosody/patches/config.patch b/srcpkgs/prosody/patches/config.patch new file mode 100644 index 00000000000000..8db93e59785644 --- /dev/null +++ b/srcpkgs/prosody/patches/config.patch @@ -0,0 +1,23 @@ +--- a/prosody.cfg.lua.dist Sun Mar 22 15:12:41 2026 +0100 ++++ b/prosody.cfg.lua.dist Tue Mar 24 12:21:26 2026 +0100 +@@ -15,6 +15,9 @@ + -- blanks. Good luck, and happy Jabbering! + + ++------ Void settings ------ ++pidfile = "/run/prosody/prosody.pid" ++ + ---------- Server-wide settings ---------- + -- Settings in this section apply to the whole server and are the default settings + -- for any virtual hosts +@@ -185,8 +188,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/prosody/prosody.log"; -- Change 'info' to 'debug' for verbose logging ++ error = "/var/log/prosody/prosody.err"; + -- "*syslog"; -- Uncomment this for logging to syslog + -- "*console"; -- Log to the console, useful for debugging when running in the foreground + } diff --git a/srcpkgs/prosody/patches/pidfile.patch b/srcpkgs/prosody/patches/pidfile.patch deleted file mode 100644 index 8fed22cd6d09d7..00000000000000 --- a/srcpkgs/prosody/patches/pidfile.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/prosody.cfg.lua.dist 2025-03-28 22:24:48.477067815 +0100 -+++ b/prosody.cfg.lua.dist 2025-03-28 22:24:28.531068661 +0100 -@@ -15,6 +15,9 @@ - -- blanks. Good luck, and happy Jabbering! - - -+------ Void settings ------ -+pidfile = "/run/prosody/prosody.pid" -+ - ---------- Server-wide settings ---------- - -- Settings in this section apply to the whole server and are the default settings - -- for any virtual hosts diff --git a/srcpkgs/prosody/template b/srcpkgs/prosody/template index c9271c9bffdba2..f03748d22da382 100644 --- a/srcpkgs/prosody/template +++ b/srcpkgs/prosody/template @@ -1,7 +1,7 @@ # Template file for 'prosody' pkgname=prosody version=13.0.4 -revision=1 +revision=2 build_style=configure configure_args=" --ostype=linux @@ -18,7 +18,8 @@ conf_files=" /etc/prosody/certs/openssl.cnf /etc/prosody/certs/makefile /etc/prosody/certs/GNUmakefile" -make_dirs="/var/lib/prosody 0755 prosody prosody" +make_dirs="/var/lib/prosody 0750 prosody prosody + /var/log/prosody 0750 prosody prosody" makedepends="lua54-devel openssl-devel libidn-devel icu-devel" depends="lua54-luasocket lua54-luafilesystem lua54-luaexpat lua54-luasec lua54-unbound" short_desc="Lightweight and extensible Jabber/XMPP server written in Lua"