diff options
author | 2014-01-21 03:24:40 +0000 | |
---|---|---|
committer | 2014-01-21 03:24:40 +0000 | |
commit | 9498616c812b820d54e9e15372b9dafe9aa00a03 (patch) | |
tree | a140d1b5fda6c0f799587ec5e400666684898b3a /tools | |
parent | mod_storage_sql2: Only attempt to delete conflicting items if an ID/key is given (diff) | |
parent | tools/ejabberd2prosody: Disable generating a config, as the format it generates is completely out of date. (diff) | |
download | prosody-9498616c812b820d54e9e15372b9dafe9aa00a03.tar.xz prosody-9498616c812b820d54e9e15372b9dafe9aa00a03.zip |
Merge 0.9->0.10
Diffstat (limited to 'tools')
-rwxr-xr-x | tools/ejabberd2prosody.lua | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/ejabberd2prosody.lua b/tools/ejabberd2prosody.lua index 4bc15eb7b..8297278fa 100755 --- a/tools/ejabberd2prosody.lua +++ b/tools/ejabberd2prosody.lua @@ -30,7 +30,7 @@ dm.set_data_path("data"); function build_stanza(tuple, stanza) assert(type(tuple) == "table", "XML node is of unexpected type: "..type(tuple)); - if tuple[1] == "xmlelement" then + if tuple[1] == "xmlelement" or tuple[1] == "xmlel" then assert(type(tuple[2]) == "string", "element name has type: "..type(tuple[2])); assert(type(tuple[3]) == "table", "element attribute array has type: "..type(tuple[3])); assert(type(tuple[4]) == "table", "element children array has type: "..type(tuple[4])); @@ -247,7 +247,7 @@ local filters = { end muc_room(tuple[2][1], tuple[2][2], properties); end; - config = function(tuple) + --[=[config = function(tuple) if tuple[2] == "hosts" then local output = io.output(); io.output("prosody.cfg.lua"); io.write("-- Configuration imported from ejabberd --\n"); @@ -275,7 +275,7 @@ local filters = { io.output(output); print("prosody.cfg.lua created"); end - end; + end;]=] }; local arg = ...; |