Mercurial > lxmppd-hg-xmllex / file comparison
comparison: prosody
prosody
- changeset 502
- 21dc299387a6
- parent 500
- 6468ea154296
- child 519
- cccd610a0ef9
- child 523
- c0f15538f358
equal
deleted
inserted
replaced
| 501:ea61e191043e | 502:21dc299387a6 |
|---|---|
| 3 -- Config here -- | 3 -- Config here -- |
| 4 | 4 |
| 5 CFG_SOURCEDIR=nil; | 5 CFG_SOURCEDIR=nil; |
| 6 CFG_CONFIGDIR=nil; | 6 CFG_CONFIGDIR=nil; |
| 7 CFG_PLUGINDIR=nil; | 7 CFG_PLUGINDIR=nil; |
| 8 CFG_DATADIR=nil; | |
| 8 | 9 |
| 9 -- -- -- -- -- -- | 10 -- -- -- -- -- -- |
| 10 | 11 |
| 11 if CFG_SOURCEDIR then | 12 if CFG_SOURCEDIR then |
| 12 if os.getenv("HOME") then | |
| 13 CFG_SOURCEDIR = CFG_SOURCEDIR:gsub("^~", os.getenv("HOME")); | |
| 14 end | |
| 15 package.path = CFG_SOURCEDIR.."/?.lua;"..package.path | 13 package.path = CFG_SOURCEDIR.."/?.lua;"..package.path |
| 16 package.cpath = CFG_SOURCEDIR.."/?.so;"..package.cpath | 14 package.cpath = CFG_SOURCEDIR.."/?.so;"..package.cpath |
| 17 end | 15 end |
| 18 | 16 |
| 19 if CFG_CONFIGDIR then | 17 if CFG_DATADIR then |
| 20 if os.getenv("HOME") then | 18 if os.getenv("HOME") then |
| 21 CFG_CONFIGDIR = CFG_CONFIGDIR:gsub("^~", os.getenv("HOME")); | 19 CFG_DATADIR = CFG_DATADIR:gsub("^~", os.getenv("HOME")); |
| 22 end | 20 end |
| 23 end | 21 end |
| 24 | |
| 25 if CFG_PLUGINDIR then | |
| 26 if os.getenv("HOME") then | |
| 27 CFG_PLUGINDIR = CFG_PLUGINDIR:gsub("^~", os.getenv("HOME")); | |
| 28 end | |
| 29 end | |
| 30 | 22 |
| 31 -- Required to be able to find packages installed with luarocks | 23 -- Required to be able to find packages installed with luarocks |
| 32 pcall(require, "luarocks.require") | 24 pcall(require, "luarocks.require") |
| 33 | 25 |
| 34 | 26 |
| 54 config.set("*", "core", "ssl", _G.config.ssl_ctx); | 46 config.set("*", "core", "ssl", _G.config.ssl_ctx); |
| 55 end | 47 end |
| 56 end | 48 end |
| 57 end | 49 end |
| 58 | 50 |
| 59 local data_path = config.get("*", "core", "data_path") or "data"; | 51 local data_path = config.get("*", "core", "data_path") or CFG_DATADIR or "data"; |
| 60 local path_separator = "/"; if os.getenv("WINDIR") then path_separator = "\\" end | 52 local path_separator = "/"; if os.getenv("WINDIR") then path_separator = "\\" end |
| 61 local _mkdir = {} | 53 local _mkdir = {} |
| 62 function mkdir(path) | 54 function mkdir(path) |
| 63 path = path:gsub("/", path_separator); | 55 path = path:gsub("/", path_separator); |
| 64 --print("mkdir",path); | 56 --print("mkdir",path); |
