Minor changes; outgoing TLS works.

[prosody.git] / prosody

diff --git a/prosody b/prosody
index e9f00598875278829e720cc1b79f6e23b5fccc0e..01f2a982342d48e3431c1d42c801baf03eae21a2 100755 (executable)
--- a/prosody
+++ b/prosody
@@ -9,9 +9,9 @@
 
 -- Will be modified by configure script if run --
 
-CFG_SOURCEDIR=nil;
+CFG_SOURCEDIR=os.getenv("PROSODY_SRCDIR");
 CFG_CONFIGDIR=os.getenv("PROSODY_CFGDIR");
-CFG_PLUGINDIR=nil;
+CFG_PLUGINDIR=os.getenv("PROSODY_PLUGINDIR");
 CFG_DATADIR=os.getenv("PROSODY_DATADIR");
 
 -- -- -- -- -- -- -- ---- -- -- -- -- -- -- -- --
@@ -93,6 +93,17 @@ function init_global_state()
 
        prosody.events = require "util.events".new();
        
+       prosody.platform = "unknown";
+       if os.getenv("WINDIR") then
+               prosody.platform = "windows";
+       elseif package.config:sub(1,1) == "/" then
+               prosody.platform = "posix";
+       end
+       
+       prosody.installed = nil;
+       if CFG_SOURCEDIR and (prosody.platform == "windows" or CFG_SOURCEDIR:match("^/")) then
+               prosody.installed = true;
+       end
        
        -- Function to reload the config file
        function prosody.reload_config()
@@ -220,7 +231,7 @@ function prepare_to_start()
        end
 
        net_activate_ports("c2s", "xmppclient", {5222}, (global_ssl_ctx and "tls") or "tcp");
-       net_activate_ports("s2s", "xmppserver", {5269}, "tcp");
+       net_activate_ports("s2s", "xmppserver", {5269}, (global_ssl_ctx and "tls") or "tcp");
        net_activate_ports("component", "xmppcomponent", {}, "tcp");
        net_activate_ports("legacy_ssl", "xmppclient", {}, "ssl");
        net_activate_ports("console", "console", {5582}, "tcp");