Automated merge.

10 files changed, 753 insertions, 7 deletions

diff --git a/COPYING b/COPYING
new file mode 100644
index 00000000..8b325f53
--- /dev/null
+++ b/COPYING
@@ -0,0 +1,343 @@
+As a special exception, the authors give permission to link this program
+with the OpenSSL library and distribute the resulting binary.
+
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+		    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+			    NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+	    How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year  name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General
+Public License instead of this License.
diff --git a/LICENSE b/LICENSE
deleted file mode 100644
index 7aaf5a9f..00000000
--- a/LICENSE
+++ /dev/null
@@ -1 +0,0 @@
-Suggestions welcome.
diff --git a/Makefile b/Makefile
index 0a96d2e5..9fca034c 100644
--- a/Makefile
+++ b/Makefile
@@ -6,22 +6,31 @@ CONFIG = $(DESTDIR)$(SYSCONFDIR)
 MODULES = $(DESTDIR)$(PREFIX)/lib/prosody/modules
 SOURCE = $(DESTDIR)$(PREFIX)/lib/prosody
 
+INSTALLEDSOURCE = $(PREFIX)/lib/prosody
+INSTALLEDCONFIG = $(SYSCONFDIR)
+INSTALLEDMODULES = $(PREFIX)/lib/prosody/modules
+
+
 all:
 	$(MAKE) all -C util-src
 
-install: prosody.install util/encodings.so util/encodings.so
+install: prosody.install prosody.cfg.lua util/encodings.so util/encodings.so
 	install -d $(BIN) $(CONFIG) $(MODULES) $(SOURCE)
+	install -d $(CONFIG)/certs
 	install -d $(SOURCE)/core $(SOURCE)/net $(SOURCE)/util
 	install ./prosody.install $(BIN)/prosody
 	install -m644 core/* $(SOURCE)/core
 	install -m644 net/* $(SOURCE)/net
 	install -m644 util/* $(SOURCE)/util
 	install -m644 plugins/* $(MODULES)
-	install -m644 prosody.cfg.lua.dist $(CONFIG)/prosody.cfg.lua
+	install -m644 certs/* $(CONFIG)/certs
+	install -m644 plugins/* $(MODULES)
+	install -m644 prosody.cfg.lua $(CONFIG)/prosody.cfg.lua
 	$(MAKE) install -C util-src
 
 clean:
 	rm -f prosody.install
+	rm -f prosody.cfg.lua
 	$(MAKE) clean -C util-src
 
 util/encodings.so:
@@ -31,5 +40,8 @@ util/hashes.so:
 	$(MAKE) install -C util-src
 
 prosody.install: prosody
-	sed "s|^CFG_SOURCEDIR=.*;$$|CFG_SOURCEDIR='$(SOURCE)';|;s|^CFG_CONFIGDIR=.*;$$|CFG_CONFIGDIR='$(CONFIG)';|;s|^CFG_PLUGINDIR=.*;$$|CFG_PLUGINDIR='$(MODULES)/';|;" prosody > prosody.install
+	sed "s|^CFG_SOURCEDIR=.*;$$|CFG_SOURCEDIR='$(INSTALLEDSOURCE)';|;s|^CFG_CONFIGDIR=.*;$$|CFG_CONFIGDIR='$(INSTALLEDCONFIG)';|;s|^CFG_PLUGINDIR=.*;$$|CFG_PLUGINDIR='$(INSTALLEDMODULES)/';|;" prosody > prosody.install
+
+prosody.cfg.lua:
+	sed 's|certs/|$(INSTALLEDCONFIG)/certs/|' prosody.cfg.lua.dist > prosody.cfg.lua
 
diff --git a/certs/localhost.cert b/certs/localhost.cert
new file mode 100644
index 00000000..2459b913
--- /dev/null
+++ b/certs/localhost.cert
@@ -0,0 +1,22 @@
+-----BEGIN CERTIFICATE-----
+MIIDkDCCAvmgAwIBAgIJAO6CeZTVrfDwMA0GCSqGSIb3DQEBBQUAMIGNMQswCQYD
+VQQGEwJHQjETMBEGA1UECBMKU29tZS1TdGF0ZTETMBEGA1UEBxMKSmFiYmVybGFu
+ZDETMBEGA1UEChMKUHJvc29keSBJTTEcMBoGA1UEAxMTRXhhbXBsZSBjZXJ0aWZp
+Y2F0ZTEhMB8GCSqGSIb3DQEJARYScHJvc29keUBwcm9zb2R5LmltMB4XDTA4MTEy
+OTE3MTQyNFoXDTA5MTEyOTE3MTQyNFowgY0xCzAJBgNVBAYTAkdCMRMwEQYDVQQI
+EwpTb21lLVN0YXRlMRMwEQYDVQQHEwpKYWJiZXJsYW5kMRMwEQYDVQQKEwpQcm9z
+b2R5IElNMRwwGgYDVQQDExNFeGFtcGxlIGNlcnRpZmljYXRlMSEwHwYJKoZIhvcN
+AQkBFhJwcm9zb2R5QHByb3NvZHkuaW0wgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
+AoGBALVAPZ/hONuU5P1okNPNfE/bSDj3AsOrRb+Kj4a7MPyRzVCARAm5KvCkPwI3
+zfDoemp6PpjVk+K8buYTKD+FT3ZxHu8mVHOnnDid/Z3KjxXOh0q1fnzKCCWH49Lu
+hKz7AtAXxvyGvTqTrfquxYVu3U4jxNIVdy//8K0+qPt69aJTAgMBAAGjgfUwgfIw
+HQYDVR0OBBYEFA7Ehhe9zSpASafg6MXFXjAA5jTcMIHCBgNVHSMEgbowgbeAFA7E
+hhe9zSpASafg6MXFXjAA5jTcoYGTpIGQMIGNMQswCQYDVQQGEwJHQjETMBEGA1UE
+CBMKU29tZS1TdGF0ZTETMBEGA1UEBxMKSmFiYmVybGFuZDETMBEGA1UEChMKUHJv
+c29keSBJTTEcMBoGA1UEAxMTRXhhbXBsZSBjZXJ0aWZpY2F0ZTEhMB8GCSqGSIb3
+DQEJARYScHJvc29keUBwcm9zb2R5LmltggkA7oJ5lNWt8PAwDAYDVR0TBAUwAwEB
+/zANBgkqhkiG9w0BAQUFAAOBgQBCYiXpGULtMCsIi/yo3NxdeC7SjgsY8KKxxkB9
+VynZpC+R6+BMtEloOgl0uvjnGy1cu7l2ddQBN4NxpZjezo9KQjRjJxXSBgMKglXH
+ybsPjB5b61zmCnr/uvjuthRCVuHfcVD0wptoHkb1VDd+lQT1/+QQCm1hlDbgb8NI
+nfxA7A==
+-----END CERTIFICATE-----
diff --git a/certs/localhost.key b/certs/localhost.key
new file mode 100644
index 00000000..8fb6e514
--- /dev/null
+++ b/certs/localhost.key
@@ -0,0 +1,15 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIICXAIBAAKBgQC1QD2f4TjblOT9aJDTzXxP20g49wLDq0W/io+GuzD8kc1QgEQJ
+uSrwpD8CN83w6Hpqej6Y1ZPivG7mEyg/hU92cR7vJlRzp5w4nf2dyo8VzodKtX58
+ygglh+PS7oSs+wLQF8b8hr06k636rsWFbt1OI8TSFXcv//CtPqj7evWiUwIDAQAB
+AoGAbk0w83oxite630hiUrMLguGUuy3/Xap+YMlm/PwwHJRyWRolzbEFI7sgqS3i
+w0gHL4NDUuku/V3lM1jXNojfSNOq2T+M8L7G8q5e+Ch89RKiJvqKPqBsxu5bEL4m
+lyJi+Vt0SXUqJkxBHWLRJb8W6++aM2ByZ7CKDyjomg5fplkCQQDhnMMIyVSKM7a1
+VTbUbeqfcJmyDRaCkbA5X7NsEtatrEWusulFtPExCUUdpgFACJYj35PhCqLzmCpJ
+MxKL8zGdAkEAzanffEouT1eDlqdfLc/LVcKj3QTMmLck9KP0AhRy0vaiCqkYE/tE
+M+l9HTwxGmveLngfuw8p0HdztUFO6lAYrwJBAJhpHzRjVfIa51XuoCC3tGVLWvj2
+cHt6UhMgPIRI4a/njhdrk7zcdIeM3J0f1P5eDpdjZXIEjnqDFCXpE6Fpg90CQC1l
+a8FBlotI4/DjLO0tytI5TnZA0vB6rJubfQbggJ/0dLwpqvjuI5XZ2hYT7TrJyJc1
+SLu/kxlC5LWDnum1mF0CQDHt9x7DnGLquBhRUzcKmFcmaYsVl37A9tAfQSnrGqq+
+GBc3K1k0bhYc1/I1Ym1PfVCfLENXhhA0hHmaYviHF6U=
+-----END RSA PRIVATE KEY-----
diff --git a/net/connlisteners.lua b/net/connlisteners.lua
index cfb6aa39..a02dd2a6 100644
--- a/net/connlisteners.lua
+++ b/net/connlisteners.lua
@@ -1,5 +1,5 @@
 
-local listeners_dir = (CFG_SOURCEDIR or "").."/net/";
+local listeners_dir = (CFG_SOURCEDIR or ".").."/net/";
 local server_add = require "net.server".add;
 local log = require "util.logger".init("connlisteners");
 
diff --git a/prosody.cfg.lua.dist b/prosody.cfg.lua.dist
index 7b9fe4dd..81d747c0 100644
--- a/prosody.cfg.lua.dist
+++ b/prosody.cfg.lua.dist
@@ -45,13 +45,18 @@ Host "*"
 				"private"; -- Private XML storage (for room bookmarks, etc.)
 				"version"; -- Replies to server version requests
 				"dialback"; -- s2s dialback support
+			  	"disco"; -- Service discovery
+			  	"ping"; -- XMPP Ping
+			  	"time"; -- Let others know the time here
+			  	"uptime"; -- Uptime reporting
+			  	"console"; -- telnet to port 5528 (needs console_enabled = true)
 			  };
 	
 	-- These are the SSL/TLS-related settings. If you don't want
 	-- to use SSL/TLS, you may comment or remove this
 	ssl = { 
-		key = "certs/server.key";
-		certificate = "certs/server.crt";
+		key = "certs/localhost.key";
+		certificate = "certs/localhost.cert";
 		}
 
 -- This allows clients to connect to localhost. No harm in it.
diff --git a/tools/ejabberd2prosody.lua b/tools/ejabberd2prosody.lua
new file mode 100755
index 00000000..01114133
--- /dev/null
+++ b/tools/ejabberd2prosody.lua
@@ -0,0 +1,175 @@
+#!/usr/bin/env lua

+

+require "erlparse";

+require "serialize";

+

+package.path = package.path ..";../?.lua";

+local st = require "util.stanza";

+package.loaded["util.logger"] = {init = function() return function() end; end}

+local dm = require "util.datamanager"

+local data_path = "data";

+dm.set_data_path(data_path);

+

+local _mkdir = {}

+function mkdir(path)

+	path = path:gsub("/", "\\");

+	--print("mkdir",path);

+	local x = io.popen("mkdir "..path.." 2>&1"):read("*a");

+end

+function encode(s) return s and (s:gsub("%W", function (c) return string.format("%%%x", c:byte()); end)); end

+function getpath(username, host, datastore, ext)

+	ext = ext or "dat";

+	if username then

+		return format("%s/%s/%s/%s.%s", data_path, encode(host), datastore, encode(username), ext);

+	elseif host then

+		return format("%s/%s/%s.%s", data_path, encode(host), datastore, ext);

+	else

+		return format("%s/%s.%s", data_path, datastore, ext);

+	end

+end

+function mkdirs(host)

+	if not _mkdir[host] then

+		local host_dir = string.format("%s/%s", data_path, encode(host));

+		mkdir(host_dir);

+		mkdir(host_dir.."/accounts");

+		mkdir(host_dir.."/vcard");

+		mkdir(host_dir.."/roster");

+		mkdir(host_dir.."/private");

+		mkdir(host_dir.."/offline");

+		_mkdir[host] = true;

+	end

+end

+mkdir(data_path);

+

+function build_stanza(tuple, stanza)

+	if tuple[1] == "xmlelement" then

+		local name = tuple[2];

+		local attr = {};

+		for _, a in ipairs(tuple[3]) do attr[a[1]] = a[2]; end

+		local up;

+		if stanza then stanza:tag(name, attr); up = true; else stanza = st.stanza(name, attr); end

+		for _, a in ipairs(tuple[4]) do build_stanza(a, stanza); end

+		if up then stanza:up(); else return stanza end

+	elseif tuple[1] == "xmlcdata" then

+		stanza:text(tuple[2]);

+	else

+		error("unknown element type: "..serialize.serialize(tuple));

+	end

+end

+function build_time(tuple)

+	local Megaseconds,Seconds,Microseconds = unpack(tuple);

+	return Megaseconds * 1000000 + Seconds;

+end

+

+function vcard(node, host, stanza)

+	mkdirs(host);

+	local ret, err = dm.store(node, host, "vcard", st.preserialize(stanza));

+	print("["..(err or "success").."] vCard: "..node.."@"..host);

+end

+function password(node, host, password)

+	mkdirs(host);

+	local ret, err = dm.store(node, host, "accounts", {password = password});

+	print("["..(err or "success").."] accounts: "..node.."@"..host.." = "..password);

+end

+function roster(node, host, jid, item)

+	mkdirs(host);

+	local roster = dm.load(node, host, "roster") or {};

+	roster[jid] = item;

+	local ret, err = dm.store(node, host, "roster", roster);

+	print("["..(err or "success").."] roster: " ..node.."@"..host.." - "..jid);

+end

+function private_storage(node, host, xmlns, stanza)

+	mkdirs(host);

+	local private = dm.load(node, host, "private") or {};

+	private[xmlns] = st.preserialize(stanza);

+	local ret, err = dm.store(node, host, "private", private);

+	print("["..(err or "success").."] private: " ..node.."@"..host.." - "..xmlns);

+end

+function offline_msg(node, host, t, stanza)

+	mkdirs(host);

+	stanza.attr.stamp = os.date("!%Y-%m-%dT%H:%M:%SZ", t);

+	stanza.attr.stamp_legacy = os.date("!%Y%m%dT%H:%M:%S", t);

+	local ret, err = dm.list_append(node, host, "offline", st.preserialize(stanza));

+	print("["..(err or "success").."] offline: " ..node.."@"..host.." - "..os.date("!%Y-%m-%dT%H:%M:%SZ", t));

+end

+

+

+local filters = {

+	passwd = function(tuple)

+		password(tuple[2][1], tuple[2][2], tuple[3]);

+	end;

+	vcard = function(tuple)

+		vcard(tuple[2][1], tuple[2][2], build_stanza(tuple[3]));

+	end;

+	roster = function(tuple)

+		local node = tuple[3][1]; local host = tuple[3][2];

+		local contact = tuple[4][1].."@"..tuple[4][2];

+		local name = tuple[5]; local subscription = tuple[6];

+		local ask = tuple[7]; local groups = tuple[8];

+		if type(name) ~= type("") then name = nil; end

+		if ask == "none" then ask = nil; elseif ask == "out" then ask = "subscribe" else error(ask) end

+		if subscription ~= "both" and subscription ~= "from" and subscription ~= "to" and subscription ~= "none" then error(subscription) end

+		local item = {name = name, ask = ask, subscription = subscription, groups = {}};

+		for _, g in ipairs(groups) do item.groups[g] = true; end

+		roster(node, host, contact, item);

+	end;

+	private_storage = function(tuple)

+		private_storage(tuple[2][1], tuple[2][2], tuple[2][3], build_stanza(tuple[3]));

+	end;

+	offline_msg = function(tuple)

+		offline_msg(tuple[2][1], tuple[2][2], build_time(tuple[3]), build_stanza(tuple[7]));

+	end;

+	config = function(tuple)

+		if tuple[2] == "hosts" then

+			local output = io.output(); io.output("prosody.cfg.lua");

+			io.write("-- Configuration imported from ejabberd --\n");

+			io.write([[Host "*"

+	modules_enabled = {

+		"saslauth"; -- Authentication for clients and servers. Recommended if you want to log in.

+		"legacyauth"; -- Legacy authentication. Only used by some old clients and bots.

+		"roster"; -- Allow users to have a roster. Recommended ;)

+		"register"; -- Allow users to register on this server using a client

+		"tls"; -- Add support for secure TLS on c2s/s2s connections

+		"vcard"; -- Allow users to set vCards

+		"private"; -- Private XML storage (for room bookmarks, etc.)

+		"version"; -- Replies to server version requests

+		"dialback"; -- s2s dialback support

+		"uptime";

+		"disco";

+		"time";

+		"ping";

+		--"selftests";

+	};

+]]);

+			for _, h in ipairs(tuple[3]) do

+				io.write("Host \"" .. h .. "\"\n");

+			end

+			io.output(output);

+			print("prosody.cfg.lua created");

+		end

+	end;

+};

+

+local arg = ...;

+local help = "/? -? ? /h -h /help -help --help";

+if not arg or help:find(arg, 1, true) then

+	print([[ejabberd db dump importer for Prosody

+

+  Usage: ejabberd2prosody.lua filename.txt

+

+The file can be generated from ejabberd using:

+  sudo ./bin/ejabberdctl dump filename.txt

+

+Note: The path of ejabberdctl depends on your ejabberd installation, and ejabberd needs to be running for ejabberdctl to work.]]);

+	os.exit(1);

+end

+local count = 0;

+local t = {};

+for item in erlparse.parseFile(arg) do

+	count = count + 1;

+	local name = item[1];

+	t[name] = (t[name] or 0) + 1;

+	--print(count, serialize.serialize(item));

+	if filters[name] then filters[name](item); end

+end

+--print(serialize.serialize(t));

diff --git a/tools/erlparse.lua b/tools/erlparse.lua
new file mode 100644
index 00000000..c4372243
--- /dev/null
+++ b/tools/erlparse.lua
@@ -0,0 +1,130 @@
+

+local file = nil;

+local last = nil;

+local function read(expected)

+	local ch;

+	if last then

+		ch = last; last = nil;

+	else ch = file:read(1); end

+	if expected and ch ~= expected then error("expected: "..expected.."; got: "..(ch or "nil")); end

+	return ch;

+end

+local function pushback(ch)

+	if last then error(); end

+	last = ch;

+end

+local function peek()

+	if not last then last = read(); end

+	return last;

+end

+

+local _A, _a, _Z, _z, _0, _9, __, _space = string.byte("AaZz09_ ", 1, 8);

+local function isAlpha(ch)

+	ch = string.byte(ch) or 0;

+	return (ch >= _A and ch <= _Z) or (ch >= _a and ch <= _z);

+end

+local function isNumeric(ch)

+	ch = string.byte(ch) or 0;

+	return (ch >= _0 and ch <= _9);

+end

+local function isVar(ch)

+	ch = string.byte(ch) or 0;

+	return (ch >= _A and ch <= _Z) or (ch >= _a and ch <= _z) or (ch >= _0 and ch <= _9) or ch == __;

+end

+local function isSpace(ch)

+	ch = string.byte(ch) or "x";

+	return ch <= _space;

+end

+

+local function readString()

+	read("\""); -- skip quote

+	local slash = nil;

+	local str = "";

+	while true do

+		local ch = read();

+		if ch == "\"" and not slash then break; end

+		str = str..ch;

+	end

+	str = str:gsub("\\.", {["\\b"]="\b", ["\\d"]="\d", ["\\e"]="\e", ["\\f"]="\f", ["\\n"]="\n", ["\\r"]="\r", ["\\s"]="\s", ["\\t"]="\t", ["\\v"]="\v", ["\\\""]="\"", ["\\'"]="'", ["\\\\"]="\\"});

+	return str;

+end

+local function readSpecialString()

+	read("<"); read("<"); -- read <<

+	local str = "";

+	if peek() == "\"" then

+		local str = readString();

+	elseif peek() ~= ">" then

+		error();

+	end

+	read(">"); read(">"); -- read >>

+	return str;

+end

+local function readVar()

+	local var = read();

+	while isVar(peek()) do

+		var = var..read();

+	end

+	return var;

+end

+local function readNumber()

+	local num = read();

+	while isNumeric(peek()) do

+		num = num..read();

+	end

+	return tonumber(num);

+end

+local readItem = nil;

+local function readTuple()

+	local t = {};

+	read(); -- read { or [

+	while true do

+		local item = readItem();

+		if not item then break; end

+		table.insert(t, item);

+	end

+	read(); -- read } or ]

+	return t;

+end

+readItem = function()

+	local ch = peek();

+	if ch == nil then return nil end

+	if ch == "{" or ch == "[" then

+		return readTuple();

+	elseif isAlpha(ch) then

+		return readVar();

+	elseif isNumeric(ch) then

+		return readNumber();

+	elseif ch == "\"" then

+		return readString();

+	elseif ch == "<" then

+		return readSpecialString();

+	elseif isSpace(ch) or ch == "," then

+		read();

+		return readItem();

+	else

+		--print("Unknown char: "..ch);

+		return nil;

+	end

+end

+local function readChunk()

+	local x = readItem();

+	if x then read("."); end

+	return x;

+end

+local function readFile(filename)

+	file = io.open(filename);

+	if not file then error("File not found: "..filename); os.exit(0); end

+	return function()

+		local x = readChunk();

+		if not x and peek() then error("Invalid char: "..peek()); end

+		return x;

+	end;

+end

+

+module "erlparse"

+

+function parseFile(file)

+	return readFile(file);

+end

+

+return _M;

diff --git a/tools/serialize.lua b/tools/serialize.lua
new file mode 100644
index 00000000..57e0eb42
--- /dev/null
+++ b/tools/serialize.lua
@@ -0,0 +1,45 @@
+

+local indent = function(i)

+	return string.rep("\t", i);

+end

+local function basicSerialize (o)

+	if type(o) == "number" or type(o) == "boolean" then

+		return tostring(o);

+	else -- assume it is a string -- FIXME make sure it's a string. throw an error otherwise.

+		return (string.format("%q", tostring(o)):gsub("\\\n", "\\n"));

+	end

+end

+local function _simplesave (o, ind, t)

+	if type(o) == "number" then

+		table.insert(t, tostring(o));

+	elseif type(o) == "string" then

+		table.insert(t, (string.format("%q", o):gsub("\\\n", "\\n")));

+	elseif type(o) == "table" then

+		table.insert(t, "{\n");

+		for k,v in pairs(o) do

+			table.insert(t, indent(ind));

+			table.insert(t, "[");

+			table.insert(t, basicSerialize(k));

+			table.insert(t, "] = ");

+			_simplesave(v, ind+1, t);

+			table.insert(t, ",\n");

+		end

+		table.insert(t, indent(ind-1));

+		table.insert(t, "}");

+	elseif type(o) == "boolean" then

+		table.insert(t, (o and "true" or "false"));

+	else

+		error("cannot serialize a " .. type(o))

+	end

+end

+local t_concat = table.concat;

+

+module "serialize"

+

+function serialize(o)

+	local t = {};

+	_simplesave(o, 1, t);

+	return t_concat(t);

+end

+

+return _M;