http://hg.omfa.de/prosody-hg/ en-us prosody-hg: tools/migration/prosody-migrator.lua history tools/migration/prosody-migrator.lua revision history Merge 13.0->trunk http://hg.omfa.de/prosody-hg/log/af28d6debaca/tools/migration/prosody-migrator.lua Kim Alvefur <zash@zash.se> Mon, 09 Feb 2026 18:38:35 +0100 prosody, prosodyctl: Always search installation directory first http://hg.omfa.de/prosody-hg/log/2462247ec377/tools/migration/prosody-migrator.lua
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.]]> Kim Alvefur <zash@zash.se> Mon, 09 Feb 2026 18:30:57 +0100 Merge 13.0->trunk http://hg.omfa.de/prosody-hg/log/6ccc6e0ece29/tools/migration/prosody-migrator.lua Kim Alvefur <zash@zash.se> Mon, 09 Feb 2026 17:11:52 +0100 prosody, prosodyctl: Load loader directly from source directory http://hg.omfa.de/prosody-hg/log/b085d32af140/tools/migration/prosody-migrator.lua
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`]]> Kim Alvefur <zash@zash.se> Mon, 09 Feb 2026 16:59:42 +0100 loader: Revert bad idea http://hg.omfa.de/prosody-hg/log/50b8d732c905/tools/migration/prosody-migrator.lua
Reverts 76ece4dd9782]]> Kim Alvefur <zash@zash.se> Mon, 09 Feb 2026 15:54:02 +0100 loader: Move all path setup here from all executables http://hg.omfa.de/prosody-hg/log/76ece4dd9782/tools/migration/prosody-migrator.lua
So it is done in the same way for all the executables, with less code
duplication.]]> Kim Alvefur <zash@zash.se> Mon, 09 Feb 2026 01:57:40 +0100 migrator: Apply loader fix here too http://hg.omfa.de/prosody-hg/log/2bdddcfad61d/tools/migration/prosody-migrator.lua
Copied from ./prosody]]> Kim Alvefur <zash@zash.se> Sun, 08 Feb 2026 17:44:17 +0100 migrator: Allow migrating between different configs of the same driver http://hg.omfa.de/prosody-hg/log/2169be3581ae/tools/migration/prosody-migrator.lua
This was notably a problem with SQL since mod_storage_sql is a single
module that connects to different SQL databases. The problem was that
since it was already loaded once, the output configuration was not
applied and it would have migrated to the origin database.

This essentially reloads the module after updating the configuration,
which should work with all storage modules as long as everything they
need are kept in the 'provider' or driver table.]]> Kim Alvefur <zash@zash.se> Sun, 03 Aug 2025 15:14:20 +0200 migrator: Add an escape hatch to allow arbitrary config options http://hg.omfa.de/prosody-hg/log/47ede3d51833/tools/migration/prosody-migrator.lua
Previously only SQL settings and the 'path' for internal storage could
be set, and only for SQL and internal storage.

input {
type = "whatever";
config = {
whatever_foobar = "something"
}
}]]> Kim Alvefur <zash@zash.se> Mon, 27 Nov 2023 17:19:16 +0100 tools: Update imports to use new prosody.* namespace http://hg.omfa.de/prosody-hg/log/879a6a33c21b/tools/migration/prosody-migrator.lua Kim Alvefur <zash@zash.se> Thu, 08 Jun 2023 09:37:01 +0200 Spelling: Fix various spelling mistakes (thanks timeless) http://hg.omfa.de/prosody-hg/log/05c250fa335a/tools/migration/prosody-migrator.lua
Words, sometimes I wonder how they even work

Maybe I missed something.]]> Kim Alvefur <zash@zash.se> Mon, 07 Mar 2022 00:13:56 +0100 migrator: Support pubsub and pep as a special-case http://hg.omfa.de/prosody-hg/log/33e856c65033/tools/migration/prosody-migrator.lua
This sorta overloads the type suffix but PEP is used for enough stuff
to justify this hack]]> Kim Alvefur <zash@zash.se> Sun, 09 Jan 2022 18:52:58 +0100 migrator: Enhance logging http://hg.omfa.de/prosody-hg/log/03f551510b1e/tools/migration/prosody-migrator.lua Kim Alvefur <zash@zash.se> Sun, 09 Jan 2022 16:35:43 +0100 migrator: Add option to keep going despite errors http://hg.omfa.de/prosody-hg/log/39483b4099b4/tools/migration/prosody-migrator.lua Kim Alvefur <zash@zash.se> Sun, 09 Jan 2022 16:08:15 +0100 migrator: Also migrate host/non-user archive data http://hg.omfa.de/prosody-hg/log/79a51a48bdaf/tools/migration/prosody-migrator.lua
Needed for things like mod_http_file_share]]> Kim Alvefur <zash@zash.se> Sun, 09 Jan 2022 15:52:50 +0100 migrator: Refactor out individual item migrator for code deduplication http://hg.omfa.de/prosody-hg/log/85f03b29ec72/tools/migration/prosody-migrator.lua Kim Alvefur <zash@zash.se> Sun, 09 Jan 2022 15:50:21 +0100 migrator: Include --options in usage info http://hg.omfa.de/prosody-hg/log/59b65cc6312f/tools/migration/prosody-migrator.lua Kim Alvefur <zash@zash.se> Sun, 09 Jan 2022 16:15:21 +0100 migrator: Reuse earlier usage text http://hg.omfa.de/prosody-hg/log/b7ee14ba09c9/tools/migration/prosody-migrator.lua Kim Alvefur <zash@zash.se> Sun, 09 Jan 2022 15:57:59 +0100 migrator: Customise cli argument parsing (--help, --verbose) http://hg.omfa.de/prosody-hg/log/6e7678f6fe9a/tools/migration/prosody-migrator.lua
Previously -v etc would do nothing and --config without argument would
not have worked correctly.]]> Kim Alvefur <zash@zash.se> Sun, 09 Jan 2022 15:19:55 +0100 migrator: Silence assert in core.moduleapi http://hg.omfa.de/prosody-hg/log/076ceb405b94/tools/migration/prosody-migrator.lua
The assert triggers because we're not loading the stanza route, because
we are unlikely to need it during migration.]]> Kim Alvefur <zash@zash.se> Thu, 29 Jul 2021 14:11:29 +0200 migrator: Use parsed command line flags already parsed by util.startup http://hg.omfa.de/prosody-hg/log/9bf8a0607d12/tools/migration/prosody-migrator.lua Kim Alvefur <zash@zash.se> Thu, 29 Jul 2021 14:10:56 +0200 migrator: Trick net.server into thinking the config is loaded http://hg.omfa.de/prosody-hg/log/f37cafeb75d6/tools/migration/prosody-migrator.lua
Fixes "Loading outside Prosody or Prosody not yet initialized"]]> Kim Alvefur <zash@zash.se> Thu, 29 Jul 2021 14:06:14 +0200 migrator: Customise startup sequence to fix #1673 (Thanks acidsys) http://hg.omfa.de/prosody-hg/log/826d57c16d1c/tools/migration/prosody-migrator.lua
Diverge from util.startup.prosodyctl() in order to skip unneeded
behavior, such as loading the *Prosody* config file, which we do not
need here, based on the `--config` flag which should point at the
migrator config file instead.

Notably removed:
* read_config() since this loads the Prosody config
* check_unwriteable() which checks logfiles specified in the Prosody config, so not relevant
* make_dummy_hosts() but the migrator sets up its own hosts during migration]]> Kim Alvefur <zash@zash.se> Thu, 29 Jul 2021 13:47:26 +0200 migrator: Add support for archives (fixes #651) http://hg.omfa.de/prosody-hg/log/e057e8318130/tools/migration/prosody-migrator.lua Kim Alvefur <zash@zash.se> Sun, 05 May 2019 21:31:15 +0200 migrator: Rewrite to use storage modules http://hg.omfa.de/prosody-hg/log/4d702f0c6273/tools/migration/prosody-migrator.lua
This allows migrating to and from any storage module that supports the
right methods. Based on experimental mod_migrate work.]]> Kim Alvefur <zash@zash.se> Sun, 05 May 2019 21:32:34 +0200 migrator: Remove broken distinction between a load error or a missing storage handler (worked with module()?) http://hg.omfa.de/prosody-hg/log/739bb455cafd/tools/migration/prosody-migrator.lua Kim Alvefur <zash@zash.se> Fri, 07 Apr 2017 13:06:06 +0200 migrator: Fix missing word http://hg.omfa.de/prosody-hg/log/1e1c18012048/tools/migration/prosody-migrator.lua Kim Alvefur <zash@zash.se> Wed, 15 Feb 2017 15:30:34 +0100 migrator: Fix argument parsing http://hg.omfa.de/prosody-hg/log/217412da818f/tools/migration/prosody-migrator.lua Kim Alvefur <zash@zash.se> Wed, 15 Feb 2017 15:30:19 +0100 migrator: Unexpand whitespace http://hg.omfa.de/prosody-hg/log/432f721b0fdf/tools/migration/prosody-migrator.lua Kim Alvefur <zash@zash.se> Wed, 15 Feb 2017 15:29:37 +0100 migrator: Remove wrapper around envloadfile since envloadfile does the right thing in a compatible way http://hg.omfa.de/prosody-hg/log/1d998891c967/tools/migration/prosody-migrator.lua Kim Alvefur <zash@zash.se> Thu, 02 Feb 2017 20:11:25 +0100 Remove all trailing whitespace http://hg.omfa.de/prosody-hg/log/bd0ff8ae98a8/tools/migration/prosody-migrator.lua Florian Zeitz <florob@babelmonkeys.de> Fri, 09 Aug 2013 17:48:21 +0200 Eliminate direct setfenv usage http://hg.omfa.de/prosody-hg/log/85b2689dbcfe/tools/migration/prosody-migrator.lua Florian Zeitz <florob@babelmonkeys.de> Fri, 08 Jun 2012 05:04:38 +0200 tools/migration/prosody-migrator.lua: Add messages to show when migration is in progress http://hg.omfa.de/prosody-hg/log/b3d9063aad4d/tools/migration/prosody-migrator.lua Matthew Wild <mwild1@gmail.com> Tue, 05 Apr 2011 14:34:06 +0100 tools/migration: Support for ~/ in paths http://hg.omfa.de/prosody-hg/log/69fe5fd861e7/tools/migration/prosody-migrator.lua Matthew Wild <mwild1@gmail.com> Tue, 05 Apr 2011 14:11:25 +0100 tools/migration/prosody-migrator.lua: Refactor store handler loading to report errors they throw http://hg.omfa.de/prosody-hg/log/899ffc1674b5/tools/migration/prosody-migrator.lua Matthew Wild <mwild1@gmail.com> Tue, 05 Apr 2011 12:59:24 +0100 tools/migration: Rename main.lua -> prosody-migrator.lua and update the Makefile http://hg.omfa.de/prosody-hg/log/f15b4e9ba688/tools/migration/prosody-migrator.lua Matthew Wild <mwild1@gmail.com> Mon, 21 Mar 2011 19:39:04 +0000