aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2008-11-29 01:01:19 +0000
committerMatthew Wild <mwild1@gmail.com>2008-11-29 01:01:19 +0000
commitf5b359dac7ea0289da1e0893ed352a484e436e64 (patch)
tree6c6ccf8872470bbde678241bf5ead83a6ea93e4b
parentc070aa7279f57db0e954ca8004f514e4c8afdcaa (diff)
parentdd37be1f32ea1d3751e5fe6079543d1c359c3c36 (diff)
downloadprosody-f5b359dac7ea0289da1e0893ed352a484e436e64.tar.gz
prosody-f5b359dac7ea0289da1e0893ed352a484e436e64.zip
Automated merge with http://waqas.ath.cx/
-rw-r--r--prosody (renamed from main.lua)15
1 files changed, 15 insertions, 0 deletions
diff --git a/main.lua b/prosody
index 7e41012c..6f13decd 100644
--- a/main.lua
+++ b/prosody
@@ -1,5 +1,20 @@
+#!/usr/bin/env lua
+
+-- Config here --
+
+
+
+-- -- -- -- -- --
+
+if CFG_SOURCEDIR then
+ package.path = CFG_SOURCEDIR.."/?.lua;"..package.path
+ package.cpath = CFG_SOURCEDIR.."/?.lua;"..package.cpath
+end
+
+-- Required to be able to find packages installed with luarocks
pcall(require, "luarocks.require")
+
config = require "core.configmanager"
log = require "util.logger".init("general");