prosody-hg: prosodyctl history

prosodyctl: Remove unused variable [luacheck]

Fri, 13 Feb 2026 20:32:54 +0100

prosodyctl: Remove unused variable [luacheck]

util.time: Import sleep from luasocket

Fri, 30 Jan 2026 14:08:53 +0100

util.time: Import sleep from luasocket

We might not want to use the full LuaSocket for such a tiny function which will
never change.

This drops win32 support but that should be fine.

Merge 13.0->trunk

Mon, 09 Feb 2026 18:38:35 +0100

Merge 13.0->trunk

prosody, prosodyctl: Always search installation directory first

Mon, 09 Feb 2026 18:30:57 +0100

prosody, prosodyctl: Always search installation directory first

Should solve for:
- Running from a source directory like looks for ./{core,net,util}/*.lua first
- `make install && prosody` looks for $prefix/prosody/{core,net,util}/*.lua first
- Installation with luarocks or dh-lua into Lua search paths does not
look for resources in the working directory.

Merge 13.0->trunk

Mon, 09 Feb 2026 17:11:52 +0100

Merge 13.0->trunk

prosody, prosodyctl: Load loader directly from source directory

Mon, 09 Feb 2026 16:59:42 +0100

prosody, prosodyctl: Load loader directly from source directory

This should ensure that loader.lua is loaded from the source directory
and does the right thing when installed with `make install`

There are currently three ways Prosody can be run:

- Directly from the source directory, like `./prosody`
- Installed with `make install`
- Installed into Lua paths with e.g. dh-lua or luarocks

In the first two cases, Lua search paths need to include the source
directory and ensure that `require "prosody.util.json"` ends up loading
`util/json.lua` relative to the installation (CFG_SOURCEDIR) or the
source checkout.

Finally, in the last case where Prosody resources are installed under the
'prosody.*' namespace in regular Lua search paths, then loader.lua should
activate the compatibility mode that makes sure that both
`require"util.json"` and `require"prosody.util.json"` both resolve to
`(one path from of package.path)/prosody/util/json.lua`

loader: Revert bad idea

Mon, 09 Feb 2026 15:54:02 +0100

loader: Revert bad idea

Reverts 76ece4dd9782

loader: Move all path setup here from all executables

Mon, 09 Feb 2026 01:57:40 +0100

loader: Move all path setup here from all executables

So it is done in the same way for all the executables, with less code
duplication.

Merge 13.0->trunk

Sat, 07 Feb 2026 19:12:27 +0100

Merge 13.0->trunk

prosody: Fix loading local code when also installed system-wide

Sun, 01 Feb 2026 15:22:53 +0100

prosody: Fix loading local code when also installed system-wide

loader.lua is responsible for adjusting the Lua module loading behavior
to account for legacy code (mostly community modules) that don't load
resources with the 'prosody' namespace prefix, like
`require"prosody.util.json"` rather than `require"util.json"`, as well
as the opposite problem of finding resources with the namespace prefix
in a local source directory, where Lua would look for
`./prosody/util/json.lua` instead of `./util/json.lua`.

Which of these two behaviors is active depends on whether the loader is
loaded as `require"prosody.loader"` or `require"loader"`, the former
being intended for system-wide installations and the later for running
from source.

When you have a system-wide Prosody installed to the standard Lua search
paths, the first attempt to require "prosody.loader" would succeed,
leading to system-wide resources being preferred.

This makes it difficult to run Prosody from source, e.g. a different
version or with local patches, as those changes would be ignored.

This change should make it more likely that the loader is invoked as
just "loader" instead of "prosody.loader", which determines

prosody: Move function only used once into block where it is used

Sun, 01 Feb 2026 15:21:40 +0100

prosody: Move function only used once into block where it is used

So it is not even instantiated when not used, for whatever tiny
performance gain

prosody: Abort earlier on incompatible Lua version

Sun, 01 Feb 2026 15:18:14 +0100

prosody: Abort earlier on incompatible Lua version

In order to minimize the amount of code we run before we bail out, as
well as to prepare for rearranging loader and search paths.

various: Do not mutate loop variables as they are treated as const in Lua 5.5

Fri, 23 Feb 2024 18:44:13 +0100

various: Do not mutate loop variables as they are treated as const in Lua 5.5

Loop variables are treated as in Lua 5.5 and can't be modified
without declaring another local.

Ref https://github.com/lua/lua/commit/b2f7b3b79f3117885b265575f6c5dbf934757797

prosodyctl: Fix spacing in warning message

Tue, 01 Apr 2025 14:38:37 +0100

prosodyctl: Fix spacing in warning message

prosodyctl: Fix check for whether to show init system warning

Thu, 06 Feb 2025 15:43:23 +0000

prosodyctl: Fix check for whether to show init system warning

Overlooked from testing.

prosodyctl: Further deprecate start/stop/restart commands when installed

Thu, 06 Feb 2025 14:51:31 +0000

prosodyctl: Further deprecate start/stop/restart commands when installed

Despite the warning we introduced, many people continue to try using
prosodyctl to manage Prosody in the presence of systemctl (e.g. #1688).

Also, despite the warning, prosodyctl proceeded with the operation. This means
the commands could be invoked by accident, and cause a situation that is hard
to recover from (needing to manually track down stray processes).

This commit disables all the problematic commands by default, but this can
still be overridden using --force or via a config option.

We only perform this check when we believe Prosody has been "installed" for
system-wide use (i.e. running it from a source directory is still supported).

prosodyctl: reload: Assume reload-via-socket if any arguments passed

Thu, 06 Feb 2025 14:47:45 +0000

prosodyctl: reload: Assume reload-via-socket if any arguments passed

prosodyctl: Fix luacheck warning

Thu, 06 Feb 2025 14:46:36 +0000

prosodyctl: Fix luacheck warning

prosodyctl: reload: Remove redundant require

Thu, 06 Feb 2025 14:45:56 +0000

prosodyctl: reload: Remove redundant require

prosodyctl: stop: Fix detection of whether Prosody is running

Thu, 06 Feb 2025 14:35:29 +0000

prosodyctl: stop: Fix detection of whether Prosody is running

prosodyctl: reload: Fix detection of whether prosody is running

Thu, 06 Feb 2025 14:34:47 +0000

prosodyctl: reload: Fix detection of whether prosody is running

isrunning() returns two values (success, status) and we were only checking the
first one.

prosodyctl: reload: use admin socket to issue reload command, if available

Thu, 06 Feb 2025 14:24:16 +0000

prosodyctl: reload: use admin socket to issue reload command, if available

prosodyctl: Hide the 'lua_paths' command from default command listing

Wed, 08 Jan 2025 22:46:21 +0100

prosodyctl: Hide the 'lua_paths' command from default command listing

All commands are called with a '-h' argument, but this one doesn't have
that. Since it's meant to be machine readable, hiding it seems
marginally more sensible than implementing '-h'.

prosodyctl: Add lua_paths command to print the LUA_PATH and LUA_CPATH used

Wed, 08 Jan 2025 20:37:35 +0000

prosodyctl: Add lua_paths command to print the LUA_PATH and LUA_CPATH used

This can be useful to run scripts and stuff with access to the same Lua paths
as Prosody uses.

prosodyctl: 'about' becomes 'version -v', 'version' prints only version

Wed, 08 Jan 2025 20:35:05 +0000

prosodyctl: 'about' becomes 'version -v', 'version' prints only version

The 'about' command remains for backwards compatibility, but hidden.

prosodyctl: Remove unused import

Wed, 08 Jan 2025 08:52:50 +0100

prosodyctl: Remove unused import

Leftover after 854df134274f

prosodyctl: deluser: Use user:delete() shell command for implementation

Tue, 07 Jan 2025 19:28:06 +0000

prosodyctl: deluser: Use user:delete() shell command for implementation

prosodyctl: passwd: Use user:password() shell command for implementation

Tue, 07 Jan 2025 19:25:35 +0000

prosodyctl: passwd: Use user:password() shell command for implementation

prosodyctl: adduser: use shell user:create() to provide the implementation

Tue, 07 Jan 2025 18:47:24 +0000

prosodyctl: adduser: use shell user:create() to provide the implementation

This allows user creation to happen inside the running Prosody process, which
improves a number of things - such as executing event handlers for user
creation, fixing issues and race conditions with some storage drivers, etc.

The intent is to do the same for the other prosodyctl commands, but this is
the first proof of concept for the approach.

prosodyctl: Add experimental way to reload specific modules directly

Sun, 25 Jun 2023 17:34:13 +0200

prosodyctl: Add experimental way to reload specific modules directly

Mostly thinking out loud about how various actions may use the shell

This enables the following sequence of commands:

prosodyctl install mod_example
prosodyctl reload mod_example

which is simpler than

prosodyctl shell module reload example

Merge 0.12->trunk

Fri, 07 Apr 2023 16:00:23 +0100

Merge 0.12->trunk

prosodyctl: Fix using variable content in a format string

Fri, 07 Apr 2023 15:54:59 +0100

prosodyctl: Fix using variable content in a format string

This broke if the error message contained a format specified such as '%s'.

executables: Prefix module imports with prosody namespace

Fri, 17 Mar 2023 16:29:54 +0100

executables: Prefix module imports with prosody namespace

executables: Invoke loader to allow mixing of old and new import style

Fri, 17 Mar 2023 16:29:07 +0100

executables: Invoke loader to allow mixing of old and new import style

Now both require"util.foo" and require"prosody.util.foo" should be
equivalent.

Merge 0.12->trunk

Sun, 22 Jan 2023 15:43:44 +0100

Merge 0.12->trunk

util.startup: Close state on exit to ensure GC finalizers are called

Sun, 22 Jan 2023 14:45:47 +0100

util.startup: Close state on exit to ensure GC finalizers are called

Ensures a last round of garbage collection and that finalizers are
called. Fixes things like proper closing of SQLite3 state.

There are more calls to os.exit() but most of them exit with an error or
in a case where a final GC sweep might not matter as much.

It would be nice if this was the default.

Calling util.statup.exit() everywhere may be sensible, but would be more
involved, requiring imports everywhere.

compat: Remove handling of Lua 5.1 location of 'unpack' function

Mon, 11 Jul 2022 19:07:38 +0200

compat: Remove handling of Lua 5.1 location of 'unpack' function

executables: Reject Lua 5.1 early

Sat, 02 Jul 2022 17:27:39 +0200

executables: Reject Lua 5.1 early

Prevents attempting to load libraries that may no longer be found and
crashing with a traceback.

Platforms like Debian where multiple Lua versions can be installed at
the same time and 'lua' pointing to one of the installed interpreters
via symlinks, there's the possibility that prosody/prosodyctl may be
invoked with Lua 5.1, which will no longer have any of the rest of
Prosody libraries available to be require(), and thus would immediately
fail with an unfriendly traceback.

Checking and aborting early with a friendlier message and reference to
more information is better.

Part of #1600

prosodyctl: Pass server when listing (outdated) plugins (fix #1738)

Tue, 05 Apr 2022 14:27:37 +0200

prosodyctl: Pass server when listing (outdated) plugins (fix #1738)

Needed since it checks the manifest of the repository and most likely
defaults to luarocks.org unless specified

prosodyctl about: Report version of lua-readline

Sun, 27 Mar 2022 14:05:56 +0200

prosodyctl about: Report version of lua-readline

Good to know since it affects how well the shell works

prosodyctl: Restore 'list --outdated'

Thu, 17 Feb 2022 01:39:35 +0100

prosodyctl: Restore 'list --outdated'

Parsing --flags puts it into 'opts', so --outdated wasn't passed to
luarocks, breaking that functionality

prosodyctl: Allow passing server on command line with --server

Fri, 04 Feb 2022 19:04:32 +0100

prosodyctl: Allow passing server on command line with --server

Because why not I guess. This mirrors the corresponding luarocks command

prosodyctl: Allow install plugin via explicit path or URL

Fri, 04 Feb 2022 19:03:02 +0100

prosodyctl: Allow install plugin via explicit path or URL

This way you don't need to set the server URL in the config to use this,
you could just ^C^V an install line from a web page that says

prosodyctl install https://modules.example.com/mod_example.src.rock

Drop the help message in this case since it'll be all messed up by being
given an URL or rock filename.

prosodyctl: Return success status code from --help

Fri, 04 Feb 2022 19:01:34 +0100

prosodyctl: Return success status code from --help

Only when the help is shown because of invalid arguments should a
non-zero status code be returned to indicate a problem.

prosodyctl: Use argument parsing library to parse --help, -h, -?

Fri, 04 Feb 2022 18:56:01 +0100

prosodyctl: Use argument parsing library to parse --help, -h, -?

Reads nicer, but adds more code. Can always be reverted later I suppose.

prosodyctl: Hide process management commands when init system should be used instead

Tue, 21 Dec 2021 14:23:09 +0100

prosodyctl: Hide process management commands when init system should be used instead

prosodyctl: Reorder help sections

Tue, 21 Dec 2021 13:11:41 +0100

prosodyctl: Reorder help sections

By how old the commands are?
Or how disruptive the changes are?
Or just by what feels best?

prosodyctl: Fix weird indentation

Sat, 06 Nov 2021 18:45:44 +0100

prosodyctl: Fix weird indentation

Merge 0.11->trunk

Mon, 20 Sep 2021 15:51:43 +0200

Merge 0.11->trunk

prosodyctl: Fix later import of LuaFileSystem

Sat, 11 Sep 2021 22:26:50 +0200

prosodyctl: Fix later import of LuaFileSystem

lfs or WHAT

How did this even happen?

prosodyctl: Add a note about checking the order of listed commands

Thu, 15 Jul 2021 00:38:27 +0200

prosodyctl: Add a note about checking the order of listed commands

Should Plugin really be first? What order makes the most sense?

prosodyctl: Add cert to command listing

Thu, 15 Jul 2021 00:37:47 +0200

prosodyctl: Add cert to command listing

This hides a whole bunch of subcommands tho, maybe those should be
explicitly listed?

prosodyctl: Add 'shell' to command listing

Thu, 15 Jul 2021 00:35:57 +0200

prosodyctl: Add 'shell' to command listing

prosodyctl: Add 'check' to command listing (fixes #1622)

Sun, 30 May 2021 12:27:12 +0200

prosodyctl: Add 'check' to command listing (fixes #1622)

Along with infrastructure for the other commands that live in external
modules.

Merge 0.11->trunk

Thu, 27 May 2021 12:51:07 +0200

Merge 0.11->trunk

prosodyctl: Add 'limits' to known globals to warn about misplacing it

Thu, 27 May 2021 12:35:55 +0200

prosodyctl: Add 'limits' to known globals to warn about misplacing it

It will do nothing in a VirtualHost section for example.

prosodyctl: Reorganize help / command list

Fri, 22 Jan 2021 00:11:39 +0100

prosodyctl: Reorganize help / command list

prosodyctl: Report OpenSSL version

Wed, 12 May 2021 01:11:42 +0200

prosodyctl: Report OpenSSL version

Merge 0.11->trunk

Thu, 13 May 2021 11:17:13 +0100

Merge 0.11->trunk

prosodyctl about: Report libexpat version if known

Tue, 11 May 2021 14:15:22 +0100

prosodyctl about: Report libexpat version if known