mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-03 21:27:38 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions
13815 commits 12 branches 100 tags 40 MiB
Commit graph

64 commits

Author SHA1 Message Date
Kim Alvefur
2f2551e6d2 migrator: Add an escape hatch to allow arbitrary config options 
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"
	}
}
 2023-11-27 17:19:16 +01:00
Kim Alvefur
918bb97dd5 migrator: Add mod_http_file_share example to config template 2023-11-01 19:02:07 +01:00
Kim Alvefur
607bfafe36 migrator: Update default config template with new stores 
* mod_authz_internal adds account_roles
* mod_cron has its state
* mod_smacks also has some non-critical state
 2023-11-01 19:02:02 +01:00
Kim Alvefur
1541284108 tools: Update imports to use new prosody.* namespace 2023-06-08 09:37:01 +02:00
Kim Alvefur
43351d2b54 Spelling: Fix various spelling mistakes (thanks timeless) 
Words, sometimes I wonder how they even work

Maybe I missed something.
 2022-03-07 00:13:56 +01:00
Kim Alvefur
3854d0c090 migrator: Support pubsub and pep as a special-case 
This sorta overloads the type suffix but PEP is used for enough stuff
to justify this hack
 2022-01-09 18:52:58 +01:00
Kim Alvefur
f04a5512a7 migrator: Enhance logging 2022-01-09 16:35:43 +01:00
Kim Alvefur
b21bc2b374 migrator: Add option to keep going despite errors 2022-01-09 16:08:15 +01:00
Kim Alvefur
07c3f35ab8 migrator: Also migrate host/non-user archive data 
Needed for things like mod_http_file_share
 2022-01-09 15:52:50 +01:00
Kim Alvefur
e9b2be9e44 migrator: Refactor out individual item migrator for code deduplication 2022-01-09 15:50:21 +01:00
Kim Alvefur
25a9fd3fdd migrator: Include --options in usage info 2022-01-09 16:15:21 +01:00
Kim Alvefur
bf60d226b8 migrator: Reuse earlier usage text 2022-01-09 15:57:59 +01:00
Kim Alvefur
6852806c10 migrator: Customise cli argument parsing (--help, --verbose) 
Previously -v etc would do nothing and --config without argument would
not have worked correctly.
 2022-01-09 15:19:55 +01:00
Kim Alvefur
d1fe0504e7 migrator: Silence assert in core.moduleapi 
The assert triggers because we're not loading the stanza route, because
we are unlikely to need it during migration.
 2021-07-29 14:11:29 +02:00
Kim Alvefur
f98cf38994 migrator: Use parsed command line flags already parsed by util.startup 2021-07-29 14:10:56 +02:00
Kim Alvefur
08e7a84274 migrator: Trick net.server into thinking the config is loaded 
Fixes "Loading outside Prosody or Prosody not yet initialized"
 2021-07-29 14:06:14 +02:00
Kim Alvefur
cc0f3b6f24 migrator: Customise startup sequence to fix #1673 (Thanks acidsys) 
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
 2021-07-29 13:47:26 +02:00
Kim Alvefur
25685a3d1b migrator: Don't create unused directory 
I guess this contained the old per-store migrators
 2020-04-19 01:17:48 +02:00
Kim Alvefur
8dceed3e9e migrator: Inject data- and plugin paths during build 
Same way as with the prosody and prosodyctl executables
 2020-04-19 01:09:21 +02:00
Kim Alvefur
037fc25b4c migrator: Add support for archives (fixes #651) 2019-05-05 21:31:15 +02:00
Kim Alvefur
6041d3e4e8 migrator: Rewrite to use storage modules 
This allows migrating to and from any storage module that supports the
right methods. Based on experimental mod_migrate work.
 2019-05-05 21:32:34 +02:00
Kim Alvefur
8a9dd05b08 Merge 0.10->trunk 2017-04-10 23:16:13 +02:00
Kim Alvefur
91baabfede SQL: Use standard quotes for columns and other identifiers, rewrite to grave accents for MySQL only (fixes #885) 2017-04-10 23:13:39 +02:00
Kim Alvefur
f01822fbfc Merge 0.10->trunk 2017-04-09 01:25:58 +02:00
Kim Alvefur
699dab7c6d migration/prosody_sql: Commit transaction when all items have been processed 2017-04-08 16:33:42 +02:00
Kim Alvefur
f2f1aa7473 Merge 0.10->trunk 2017-04-08 00:48:15 +02:00
Kim Alvefur
6b3a33a083 migrator/prosody_sql: Abort and demand database be upgraded if it needs to be (#635) 2017-04-07 13:17:00 +02:00
Kim Alvefur
8a7bc589b3 migrator.prosody_sql: Switch to util.sql (#635) 2017-04-07 13:16:12 +02:00
Kim Alvefur
8716255d0c migrator: Remove broken distinction between a load error or a missing storage handler (worked with module()?) 2017-04-07 13:06:06 +02:00
Kim Alvefur
f21bbbab60 Merge 0.10->trunk 2017-02-15 23:05:03 +01:00
Kim Alvefur
fc7dadb6a7 migrator: Fix missing word 2017-02-15 15:30:34 +01:00
Kim Alvefur
00b6eff872 migrator: Fix argument parsing 2017-02-15 15:30:19 +01:00
Kim Alvefur
ff26455099 migrator: Unexpand whitespace 2017-02-15 15:29:37 +01:00
Kim Alvefur
e902bcea2e Merge 0.10->trunk 2017-02-04 01:08:27 +01:00
Kim Alvefur
0a385a3953 tools/migration/migrator/*: Remove use of module() 2017-02-02 20:49:09 +01:00
Kim Alvefur
f0918f4e1b migrator: Remove wrapper around envloadfile since envloadfile does the right thing in a compatible way 2017-02-02 20:11:25 +01:00
Emmanuel Gil Peyrot
c6048a7cb4 Update every link to the documentation to use HTTPS 2016-04-16 21:08:05 +01:00
Kim Alvefur
f67cdc6ec6 Merge 0.9->0.10 2015-02-21 10:34:56 +01:00
Matthew Wild
83ca1bd5d1 configure, Makefile: Add --libdir option to ./configure, allowing you to override the $PREFIX/lib/ default. Fixes #470. 2015-02-20 15:51:05 +00:00
Matthew Wild
e60a10abca Merge 0.9->0.10 2014-01-12 06:19:37 -05:00
Waqas Hussain
814d446911 tools/migration/migrator/prosody_files: Fix undefined global access of ‘error’, print the actual error message and correct file path in the error message when we fail to load a file, skip broken files instead of failing migration. 2014-01-03 15:52:52 -05:00
Florian Zeitz
1d833bb807 Remove all trailing whitespace 2013-08-09 17:48:21 +02:00
Kim Alvefur
4d156831cb tools/migration/Makefile: Apply Lua runtime override (see 53f741a5a73a) 2013-03-31 20:09:14 +02:00
Waqas Hussain
20a28d166c tools/migration/migrator/jabberd14: Use util.xml. 2012-12-03 05:44:48 +05:00
Florian Zeitz
d49b9bc2ab Eliminate direct setfenv usage 2012-06-08 05:04:38 +02:00
Waqas Hussain
a329f8193f migrator/jabberd14: Minor refactoring. 2011-12-09 11:37:30 +05:00
Waqas Hussain
5785bdb7b6 migrator/jabberd14: Support for reading jabberd14 spool files. 2011-11-19 21:12:23 +05:00
Matthew Wild
2c97611fed migrator/prosody_sql.lua: Fix for compatibility with non-MySQL databases 2011-06-05 11:53:41 +01:00
Matthew Wild
27bc9300b8 migrator/prosody_sql.lua: Create (and upgrade) MySQL tables to use MEDIUMTEXT for the 'value' column to avoid truncation 2011-06-03 00:57:25 +01:00
Matthew Wild
aded9653e0 migrator/prosody_files: Don't choke on empty data stores for a user (thanks @eoranged) 2011-06-02 17:18:23 +01:00