prosody
21dc299387a6
prosody

Find changesets by keywords by author, files, the commit message, revision number or hash, or revset expression.

Software / code / prosody

Annotate

prosody @ 502:21dc299387a6

Installation improvements (auto-creation of data directories)
author Matthew Wild <mwild1@gmail.com>
date Sun, 30 Nov 2008 04:22:43 +0000
parent 500:6468ea154296
child 519:cccd610a0ef9
child 523:c0f15538f358
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
455
2eeae9c314b0 main.lua -> prosody
Matthew Wild <mwild1@gmail.com>
parents: 452
diff changeset
1 #!/usr/bin/env lua
2eeae9c314b0 main.lua -> prosody
Matthew Wild <mwild1@gmail.com>
parents: 452
diff changeset
2
2eeae9c314b0 main.lua -> prosody
Matthew Wild <mwild1@gmail.com>
parents: 452
diff changeset
3 -- Config here --
2eeae9c314b0 main.lua -> prosody
Matthew Wild <mwild1@gmail.com>
parents: 452
diff changeset
4
467
66f145f5c932 Update Makefile to now pass config paths to prosody. Update prosody, modulemanager and connectionlisteners to obey these paths.
Matthew Wild <mwild1@gmail.com>
parents: 455
diff changeset
5 CFG_SOURCEDIR=nil;
66f145f5c932 Update Makefile to now pass config paths to prosody. Update prosody, modulemanager and connectionlisteners to obey these paths.
Matthew Wild <mwild1@gmail.com>
parents: 455
diff changeset
6 CFG_CONFIGDIR=nil;
66f145f5c932 Update Makefile to now pass config paths to prosody. Update prosody, modulemanager and connectionlisteners to obey these paths.
Matthew Wild <mwild1@gmail.com>
parents: 455
diff changeset
7 CFG_PLUGINDIR=nil;
502
21dc299387a6 Installation improvements (auto-creation of data directories)
Matthew Wild <mwild1@gmail.com>
parents: 500
diff changeset
8 CFG_DATADIR=nil;
455
2eeae9c314b0 main.lua -> prosody
Matthew Wild <mwild1@gmail.com>
parents: 452
diff changeset
9
2eeae9c314b0 main.lua -> prosody
Matthew Wild <mwild1@gmail.com>
parents: 452
diff changeset
10 -- -- -- -- -- --
2eeae9c314b0 main.lua -> prosody
Matthew Wild <mwild1@gmail.com>
parents: 452
diff changeset
11
2eeae9c314b0 main.lua -> prosody
Matthew Wild <mwild1@gmail.com>
parents: 452
diff changeset
12 if CFG_SOURCEDIR then
2eeae9c314b0 main.lua -> prosody
Matthew Wild <mwild1@gmail.com>
parents: 452
diff changeset
13 package.path = CFG_SOURCEDIR.."/?.lua;"..package.path
467
66f145f5c932 Update Makefile to now pass config paths to prosody. Update prosody, modulemanager and connectionlisteners to obey these paths.
Matthew Wild <mwild1@gmail.com>
parents: 455
diff changeset
14 package.cpath = CFG_SOURCEDIR.."/?.so;"..package.cpath
455
2eeae9c314b0 main.lua -> prosody
Matthew Wild <mwild1@gmail.com>
parents: 452
diff changeset
15 end
2eeae9c314b0 main.lua -> prosody
Matthew Wild <mwild1@gmail.com>
parents: 452
diff changeset
16
502
21dc299387a6 Installation improvements (auto-creation of data directories)
Matthew Wild <mwild1@gmail.com>
parents: 500
diff changeset
17 if CFG_DATADIR then
467
66f145f5c932 Update Makefile to now pass config paths to prosody. Update prosody, modulemanager and connectionlisteners to obey these paths.
Matthew Wild <mwild1@gmail.com>
parents: 455
diff changeset
18 if os.getenv("HOME") then
502
21dc299387a6 Installation improvements (auto-creation of data directories)
Matthew Wild <mwild1@gmail.com>
parents: 500
diff changeset
19 CFG_DATADIR = CFG_DATADIR:gsub("^~", os.getenv("HOME"));
467
66f145f5c932 Update Makefile to now pass config paths to prosody. Update prosody, modulemanager and connectionlisteners to obey these paths.
Matthew Wild <mwild1@gmail.com>
parents: 455
diff changeset
20 end
502
21dc299387a6 Installation improvements (auto-creation of data directories)
Matthew Wild <mwild1@gmail.com>
parents: 500
diff changeset
21 end
467
66f145f5c932 Update Makefile to now pass config paths to prosody. Update prosody, modulemanager and connectionlisteners to obey these paths.
Matthew Wild <mwild1@gmail.com>
parents: 455
diff changeset
22
455
2eeae9c314b0 main.lua -> prosody
Matthew Wild <mwild1@gmail.com>
parents: 452
diff changeset
23 -- Required to be able to find packages installed with luarocks
133
b92493ea6fd7 Fixed: Works when LuaRocks is not present
Waqas Hussain <waqas20@gmail.com>
parents: 99
diff changeset
24 pcall(require, "luarocks.require")
0
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
25
455
2eeae9c314b0 main.lua -> prosody
Matthew Wild <mwild1@gmail.com>
parents: 452
diff changeset
26
433
afbf29498123 Fix to make a global configmanager instance
Matthew Wild <mwild1@gmail.com>
parents: 412
diff changeset
27 config = require "core.configmanager"
376
6d87944df37c New configmanager. Old-style config files still work, but will print a warning
Matthew Wild <mwild1@gmail.com>
parents: 359
diff changeset
28 log = require "util.logger".init("general");
6d87944df37c New configmanager. Old-style config files still work, but will print a warning
Matthew Wild <mwild1@gmail.com>
parents: 359
diff changeset
29
6d87944df37c New configmanager. Old-style config files still work, but will print a warning
Matthew Wild <mwild1@gmail.com>
parents: 359
diff changeset
30 do
6d87944df37c New configmanager. Old-style config files still work, but will print a warning
Matthew Wild <mwild1@gmail.com>
parents: 359
diff changeset
31 -- TODO: Check for other formats when we add support for them
6d87944df37c New configmanager. Old-style config files still work, but will print a warning
Matthew Wild <mwild1@gmail.com>
parents: 359
diff changeset
32 -- Use lfs? Make a new conf/ dir?
467
66f145f5c932 Update Makefile to now pass config paths to prosody. Update prosody, modulemanager and connectionlisteners to obey these paths.
Matthew Wild <mwild1@gmail.com>
parents: 455
diff changeset
33 local ok, err = config.load((CFG_CONFIGDIR or ".").."/prosody.cfg.lua");
376
6d87944df37c New configmanager. Old-style config files still work, but will print a warning
Matthew Wild <mwild1@gmail.com>
parents: 359
diff changeset
34 if not ok then
6d87944df37c New configmanager. Old-style config files still work, but will print a warning
Matthew Wild <mwild1@gmail.com>
parents: 359
diff changeset
35 log("error", "Couldn't load config file: %s", err);
6d87944df37c New configmanager. Old-style config files still work, but will print a warning
Matthew Wild <mwild1@gmail.com>
parents: 359
diff changeset
36 log("info", "Falling back to old config file format...")
6d87944df37c New configmanager. Old-style config files still work, but will print a warning
Matthew Wild <mwild1@gmail.com>
parents: 359
diff changeset
37 ok, err = pcall(dofile, "lxmppd.cfg");
6d87944df37c New configmanager. Old-style config files still work, but will print a warning
Matthew Wild <mwild1@gmail.com>
parents: 359
diff changeset
38 if not ok then
6d87944df37c New configmanager. Old-style config files still work, but will print a warning
Matthew Wild <mwild1@gmail.com>
parents: 359
diff changeset
39 log("error", "Old config format loading failed too: %s", err);
6d87944df37c New configmanager. Old-style config files still work, but will print a warning
Matthew Wild <mwild1@gmail.com>
parents: 359
diff changeset
40 else
6d87944df37c New configmanager. Old-style config files still work, but will print a warning
Matthew Wild <mwild1@gmail.com>
parents: 359
diff changeset
41 for _, host in ipairs(_G.config.hosts) do
6d87944df37c New configmanager. Old-style config files still work, but will print a warning
Matthew Wild <mwild1@gmail.com>
parents: 359
diff changeset
42 config.set(host, "core", "defined", true);
6d87944df37c New configmanager. Old-style config files still work, but will print a warning
Matthew Wild <mwild1@gmail.com>
parents: 359
diff changeset
43 end
6d87944df37c New configmanager. Old-style config files still work, but will print a warning
Matthew Wild <mwild1@gmail.com>
parents: 359
diff changeset
44
6d87944df37c New configmanager. Old-style config files still work, but will print a warning
Matthew Wild <mwild1@gmail.com>
parents: 359
diff changeset
45 config.set("*", "core", "modules_enabled", _G.config.modules);
6d87944df37c New configmanager. Old-style config files still work, but will print a warning
Matthew Wild <mwild1@gmail.com>
parents: 359
diff changeset
46 config.set("*", "core", "ssl", _G.config.ssl_ctx);
6d87944df37c New configmanager. Old-style config files still work, but will print a warning
Matthew Wild <mwild1@gmail.com>
parents: 359
diff changeset
47 end
6d87944df37c New configmanager. Old-style config files still work, but will print a warning
Matthew Wild <mwild1@gmail.com>
parents: 359
diff changeset
48 end
0
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
49 end
36
62998e5319e3 Moved hosts to a config file, still need better config though
Matthew Wild <mwild1@gmail.com>
parents: 34
diff changeset
50
502
21dc299387a6 Installation improvements (auto-creation of data directories)
Matthew Wild <mwild1@gmail.com>
parents: 500
diff changeset
51 local data_path = config.get("*", "core", "data_path") or CFG_DATADIR or "data";
498
0862416befe3 Auto-create data directories on start
Waqas Hussain <waqas20@gmail.com>
parents: 467
diff changeset
52 local path_separator = "/"; if os.getenv("WINDIR") then path_separator = "\\" end
0862416befe3 Auto-create data directories on start
Waqas Hussain <waqas20@gmail.com>
parents: 467
diff changeset
53 local _mkdir = {}
0862416befe3 Auto-create data directories on start
Waqas Hussain <waqas20@gmail.com>
parents: 467
diff changeset
54 function mkdir(path)
0862416befe3 Auto-create data directories on start
Waqas Hussain <waqas20@gmail.com>
parents: 467
diff changeset
55 path = path:gsub("/", path_separator);
0862416befe3 Auto-create data directories on start
Waqas Hussain <waqas20@gmail.com>
parents: 467
diff changeset
56 --print("mkdir",path);
0862416befe3 Auto-create data directories on start
Waqas Hussain <waqas20@gmail.com>
parents: 467
diff changeset
57 local x = io.popen("mkdir "..path.." 2>&1"):read("*a");
0862416befe3 Auto-create data directories on start
Waqas Hussain <waqas20@gmail.com>
parents: 467
diff changeset
58 end
0862416befe3 Auto-create data directories on start
Waqas Hussain <waqas20@gmail.com>
parents: 467
diff changeset
59 function encode(s) return s and (s:gsub("%W", function (c) return string.format("%%%x", c:byte()); end)); end
0862416befe3 Auto-create data directories on start
Waqas Hussain <waqas20@gmail.com>
parents: 467
diff changeset
60 function mkdirs(host)
0862416befe3 Auto-create data directories on start
Waqas Hussain <waqas20@gmail.com>
parents: 467
diff changeset
61 if not _mkdir[host] then
0862416befe3 Auto-create data directories on start
Waqas Hussain <waqas20@gmail.com>
parents: 467
diff changeset
62 local host_dir = string.format("%s/%s", data_path, encode(host));
0862416befe3 Auto-create data directories on start
Waqas Hussain <waqas20@gmail.com>
parents: 467
diff changeset
63 mkdir(host_dir);
0862416befe3 Auto-create data directories on start
Waqas Hussain <waqas20@gmail.com>
parents: 467
diff changeset
64 mkdir(host_dir.."/accounts");
0862416befe3 Auto-create data directories on start
Waqas Hussain <waqas20@gmail.com>
parents: 467
diff changeset
65 mkdir(host_dir.."/vcard");
0862416befe3 Auto-create data directories on start
Waqas Hussain <waqas20@gmail.com>
parents: 467
diff changeset
66 mkdir(host_dir.."/roster");
0862416befe3 Auto-create data directories on start
Waqas Hussain <waqas20@gmail.com>
parents: 467
diff changeset
67 mkdir(host_dir.."/private");
0862416befe3 Auto-create data directories on start
Waqas Hussain <waqas20@gmail.com>
parents: 467
diff changeset
68 mkdir(host_dir.."/offline");
0862416befe3 Auto-create data directories on start
Waqas Hussain <waqas20@gmail.com>
parents: 467
diff changeset
69 _mkdir[host] = true;
0862416befe3 Auto-create data directories on start
Waqas Hussain <waqas20@gmail.com>
parents: 467
diff changeset
70 end
0862416befe3 Auto-create data directories on start
Waqas Hussain <waqas20@gmail.com>
parents: 467
diff changeset
71 end
0862416befe3 Auto-create data directories on start
Waqas Hussain <waqas20@gmail.com>
parents: 467
diff changeset
72 mkdir(data_path);
0862416befe3 Auto-create data directories on start
Waqas Hussain <waqas20@gmail.com>
parents: 467
diff changeset
73
0862416befe3 Auto-create data directories on start
Waqas Hussain <waqas20@gmail.com>
parents: 467
diff changeset
74 require "util.datamanager".set_data_path(data_path);
452
613c5c6bdce4 Added option core.data_path
Waqas Hussain <waqas20@gmail.com>
parents: 438
diff changeset
75
412
b5b4ec28feec Change loading order of modules, config before dependency checking
Matthew Wild <mwild1@gmail.com>
parents: 408
diff changeset
76 local server = require "net.server"
b5b4ec28feec Change loading order of modules, config before dependency checking
Matthew Wild <mwild1@gmail.com>
parents: 408
diff changeset
77
b5b4ec28feec Change loading order of modules, config before dependency checking
Matthew Wild <mwild1@gmail.com>
parents: 408
diff changeset
78 require "util.dependencies"
b5b4ec28feec Change loading order of modules, config before dependency checking
Matthew Wild <mwild1@gmail.com>
parents: 408
diff changeset
79
99
ba08b8a4eeef Abstract connections with "connection listeners"
Matthew Wild <mwild1@gmail.com>
parents: 97
diff changeset
80 -- Maps connections to sessions --
36
62998e5319e3 Moved hosts to a config file, still need better config though
Matthew Wild <mwild1@gmail.com>
parents: 34
diff changeset
81 sessions = {};
218
1263896ab2f1 Reworked the way lxmppd.cfg is used
Waqas Hussain <waqas20@gmail.com>
parents: 207
diff changeset
82 hosts = {};
1263896ab2f1 Reworked the way lxmppd.cfg is used
Waqas Hussain <waqas20@gmail.com>
parents: 207
diff changeset
83
376
6d87944df37c New configmanager. Old-style config files still work, but will print a warning
Matthew Wild <mwild1@gmail.com>
parents: 359
diff changeset
84 local defined_hosts = config.getconfig();
6d87944df37c New configmanager. Old-style config files still work, but will print a warning
Matthew Wild <mwild1@gmail.com>
parents: 359
diff changeset
85
6d87944df37c New configmanager. Old-style config files still work, but will print a warning
Matthew Wild <mwild1@gmail.com>
parents: 359
diff changeset
86 for host, host_config in pairs(defined_hosts) do
6d87944df37c New configmanager. Old-style config files still work, but will print a warning
Matthew Wild <mwild1@gmail.com>
parents: 359
diff changeset
87 if host ~= "*" and (host_config.core.enabled == nil or host_config.core.enabled) then
260
182f0c895676 Now outgoing s2s sessions are associated with their from_host, fixes #15
Matthew Wild <mwild1@gmail.com>
parents: 245
diff changeset
88 hosts[host] = {type = "local", connected = true, sessions = {}, host = host, s2sout = {} };
500
6468ea154296 Path fix for auto-creating directories
Waqas Hussain <waqas20@gmail.com>
parents: 498
diff changeset
89 mkdirs(host);
218
1263896ab2f1 Reworked the way lxmppd.cfg is used
Waqas Hussain <waqas20@gmail.com>
parents: 207
diff changeset
90 end
376
6d87944df37c New configmanager. Old-style config files still work, but will print a warning
Matthew Wild <mwild1@gmail.com>
parents: 359
diff changeset
91 end
207
90c387884234 A little whitespace fix
Waqas Hussain <waqas20@gmail.com>
parents: 203
diff changeset
92
99
ba08b8a4eeef Abstract connections with "connection listeners"
Matthew Wild <mwild1@gmail.com>
parents: 97
diff changeset
93 -- Load and initialise core modules --
207
90c387884234 A little whitespace fix
Waqas Hussain <waqas20@gmail.com>
parents: 203
diff changeset
94
49
1cd2a8db392d New "import" module to help tidy up all the local declarations at the top of modules
Matthew Wild <mwild1@gmail.com>
parents: 38
diff changeset
95 require "util.import"
20
6885fd2cf51f Remove some debugging messages
Matthew Wild <mwild1@gmail.com>
parents: 18
diff changeset
96 require "core.xmlhandlers"
0
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
97 require "core.rostermanager"
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
98 require "core.offlinemessage"
30
bcf539295f2d Huge commit to:
Matthew Wild <mwild1@gmail.com>
parents: 20
diff changeset
99 require "core.modulemanager"
1
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
100 require "core.usermanager"
30
bcf539295f2d Huge commit to:
Matthew Wild <mwild1@gmail.com>
parents: 20
diff changeset
101 require "core.sessionmanager"
bcf539295f2d Huge commit to:
Matthew Wild <mwild1@gmail.com>
parents: 20
diff changeset
102 require "core.stanza_router"
99
ba08b8a4eeef Abstract connections with "connection listeners"
Matthew Wild <mwild1@gmail.com>
parents: 97
diff changeset
103
381
e967f162501e Comment out remote debug, will later be enabled via config
Matthew Wild <mwild1@gmail.com>
parents: 376
diff changeset
104 --[[
245
5dc6ae7b5ce8 Add support for remote debugger
Matthew Wild <mwild1@gmail.com>
parents: 230
diff changeset
105 pcall(require, "remdebug.engine");
5dc6ae7b5ce8 Add support for remote debugger
Matthew Wild <mwild1@gmail.com>
parents: 230
diff changeset
106 if remdebug then remdebug.engine.start() end
381
e967f162501e Comment out remote debug, will later be enabled via config
Matthew Wild <mwild1@gmail.com>
parents: 376
diff changeset
107 ]]
245
5dc6ae7b5ce8 Add support for remote debugger
Matthew Wild <mwild1@gmail.com>
parents: 230
diff changeset
108
99
ba08b8a4eeef Abstract connections with "connection listeners"
Matthew Wild <mwild1@gmail.com>
parents: 97
diff changeset
109 local start = require "net.connlisteners".start;
0
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
110 require "util.stanza"
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
111 require "util.jid"
49
1cd2a8db392d New "import" module to help tidy up all the local declarations at the top of modules
Matthew Wild <mwild1@gmail.com>
parents: 38
diff changeset
112
99
ba08b8a4eeef Abstract connections with "connection listeners"
Matthew Wild <mwild1@gmail.com>
parents: 97
diff changeset
113 ------------------------------------------------------------------------
133
b92493ea6fd7 Fixed: Works when LuaRocks is not present
Waqas Hussain <waqas20@gmail.com>
parents: 99
diff changeset
114
218
1263896ab2f1 Reworked the way lxmppd.cfg is used
Waqas Hussain <waqas20@gmail.com>
parents: 207
diff changeset
115 -- Initialise modules
438
193f9dd64f17 Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store.
Matthew Wild <mwild1@gmail.com>
parents: 433
diff changeset
116
193f9dd64f17 Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store.
Matthew Wild <mwild1@gmail.com>
parents: 433
diff changeset
117 for host in pairs(hosts) do
193f9dd64f17 Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store.
Matthew Wild <mwild1@gmail.com>
parents: 433
diff changeset
118 if host ~= "*" then
193f9dd64f17 Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store.
Matthew Wild <mwild1@gmail.com>
parents: 433
diff changeset
119 local modules_enabled = config.get(host, "core", "modules_enabled");
193f9dd64f17 Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store.
Matthew Wild <mwild1@gmail.com>
parents: 433
diff changeset
120 if modules_enabled then
193f9dd64f17 Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store.
Matthew Wild <mwild1@gmail.com>
parents: 433
diff changeset
121 for _, module in pairs(modules_enabled) do
193f9dd64f17 Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store.
Matthew Wild <mwild1@gmail.com>
parents: 433
diff changeset
122 modulemanager.load(host, module);
193f9dd64f17 Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store.
Matthew Wild <mwild1@gmail.com>
parents: 433
diff changeset
123 end
193f9dd64f17 Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store.
Matthew Wild <mwild1@gmail.com>
parents: 433
diff changeset
124 end
218
1263896ab2f1 Reworked the way lxmppd.cfg is used
Waqas Hussain <waqas20@gmail.com>
parents: 207
diff changeset
125 end
376
6d87944df37c New configmanager. Old-style config files still work, but will print a warning
Matthew Wild <mwild1@gmail.com>
parents: 359
diff changeset
126 end
0
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
127
218
1263896ab2f1 Reworked the way lxmppd.cfg is used
Waqas Hussain <waqas20@gmail.com>
parents: 207
diff changeset
128 -- setup error handling
1
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
129 setmetatable(_G, { __index = function (t, k) print("WARNING: ATTEMPT TO READ A NIL GLOBAL!!!", k); error("Attempt to read a non-existent global. Naughty boy.", 2); end, __newindex = function (t, k, v) print("ATTEMPT TO SET A GLOBAL!!!!", tostring(k).." = "..tostring(v)); error("Attempt to set a global. Naughty boy.", 2); end }) --]][][[]][];
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
130
20
6885fd2cf51f Remove some debugging messages
Matthew Wild <mwild1@gmail.com>
parents: 18
diff changeset
131 local protected_handler = function (conn, data, err) local success, ret = pcall(handler, conn, data, err); if not success then print("ERROR on "..tostring(conn)..": "..ret); conn:close(); end end;
6885fd2cf51f Remove some debugging messages
Matthew Wild <mwild1@gmail.com>
parents: 18
diff changeset
132 local protected_disconnect = function (conn, err) local success, ret = pcall(disconnect, conn, err); if not success then print("ERROR on "..tostring(conn).." disconnect: "..ret); conn:close(); end end;
1
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
133
376
6d87944df37c New configmanager. Old-style config files still work, but will print a warning
Matthew Wild <mwild1@gmail.com>
parents: 359
diff changeset
134
6d87944df37c New configmanager. Old-style config files still work, but will print a warning
Matthew Wild <mwild1@gmail.com>
parents: 359
diff changeset
135 local global_ssl_ctx = config.get("*", "core", "ssl");
6d87944df37c New configmanager. Old-style config files still work, but will print a warning
Matthew Wild <mwild1@gmail.com>
parents: 359
diff changeset
136 if global_ssl_ctx then
6d87944df37c New configmanager. Old-style config files still work, but will print a warning
Matthew Wild <mwild1@gmail.com>
parents: 359
diff changeset
137 local default_ssl_ctx = { mode = "server", protocol = "sslv23", capath = "/etc/ssl/certs", verify = "none"; };
6d87944df37c New configmanager. Old-style config files still work, but will print a warning
Matthew Wild <mwild1@gmail.com>
parents: 359
diff changeset
138 setmetatable(global_ssl_ctx, { __index = default_ssl_ctx });
6d87944df37c New configmanager. Old-style config files still work, but will print a warning
Matthew Wild <mwild1@gmail.com>
parents: 359
diff changeset
139 end
6d87944df37c New configmanager. Old-style config files still work, but will print a warning
Matthew Wild <mwild1@gmail.com>
parents: 359
diff changeset
140
218
1263896ab2f1 Reworked the way lxmppd.cfg is used
Waqas Hussain <waqas20@gmail.com>
parents: 207
diff changeset
141 -- start listening on sockets
376
6d87944df37c New configmanager. Old-style config files still work, but will print a warning
Matthew Wild <mwild1@gmail.com>
parents: 359
diff changeset
142 start("xmppclient", { ssl = global_ssl_ctx })
6d87944df37c New configmanager. Old-style config files still work, but will print a warning
Matthew Wild <mwild1@gmail.com>
parents: 359
diff changeset
143 start("xmppserver", { ssl = global_ssl_ctx })
1
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
144
383
32b586d9e915 Only start console if it is enabled in the config. Note that the exact option is going to change tomorrow.
Matthew Wild <mwild1@gmail.com>
parents: 382
diff changeset
145 if config.get("*", "core", "console_enabled") then
32b586d9e915 Only start console if it is enabled in the config. Note that the exact option is going to change tomorrow.
Matthew Wild <mwild1@gmail.com>
parents: 382
diff changeset
146 start("console")
32b586d9e915 Only start console if it is enabled in the config. Note that the exact option is going to change tomorrow.
Matthew Wild <mwild1@gmail.com>
parents: 382
diff changeset
147 end
382
9daf1e3d278e Add initial mod_console
Matthew Wild <mwild1@gmail.com>
parents: 381
diff changeset
148
359
8fbfa8f885a6 Add event for server startup completed: server-started
Matthew Wild <mwild1@gmail.com>
parents: 260
diff changeset
149 modulemanager.fire_event("server-started");
8fbfa8f885a6 Add event for server startup completed: server-started
Matthew Wild <mwild1@gmail.com>
parents: 260
diff changeset
150
1
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
151 server.loop();