aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2009-09-24 11:16:25 +0100
committerMatthew Wild <mwild1@gmail.com>2009-09-24 11:16:25 +0100
commit801957dc9674d71b01f56e37d15ac6ae12134588 (patch)
tree55b3940b2a750f2941e98376709b21663aa97dd3
parent68cbd6d4b0d8673edc08d42d61ab6c6603470c36 (diff)
parente0c4e19bab9f19717c626bba804f2421823d2be7 (diff)
downloadprosody-801957dc9674d71b01f56e37d15ac6ae12134588.tar.gz
prosody-801957dc9674d71b01f56e37d15ac6ae12134588.zip
Merge with 0.5
-rw-r--r--net/dns.lua4
-rw-r--r--plugins/mod_httpserver.lua2
-rw-r--r--prosody.cfg.lua.dist6
3 files changed, 9 insertions, 3 deletions
diff --git a/net/dns.lua b/net/dns.lua
index ff07d26e..da06ceaa 100644
--- a/net/dns.lua
+++ b/net/dns.lua
@@ -507,8 +507,8 @@ function resolver:adddefaultnameservers () -- - - - - adddefaultnameservers
local resolv_conf = io.open("/etc/resolv.conf");
if resolv_conf then
for line in resolv_conf:lines() do
- local address = string.match (line, 'nameserver%s+(%d+%.%d+%.%d+%.%d+)')
- if address then self:addnameserver (address) end
+ local address = string.match (line, '^%s*nameserver%s+(%d+%.%d+%.%d+%.%d+)')
+ if address then self:addnameserver (address) end
end
elseif os.getenv("WINDIR") then
self:addnameserver ("208.67.222.222")
diff --git a/plugins/mod_httpserver.lua b/plugins/mod_httpserver.lua
index f1f2150d..72a4506a 100644
--- a/plugins/mod_httpserver.lua
+++ b/plugins/mod_httpserver.lua
@@ -12,7 +12,7 @@ local httpserver = require "net.httpserver";
local open = io.open;
local t_concat = table.concat;
-local http_base = "www_files";
+local http_base = config.get("*", "core", "http_path") or "www_files";
local response_400 = { status = "400 Bad Request", body = "<h1>Bad Request</h1>Sorry, we didn't understand your request :(" };
local response_404 = { status = "404 Not Found", body = "<h1>Page Not Found</h1>Sorry, we couldn't find what you were looking for :(" };
diff --git a/prosody.cfg.lua.dist b/prosody.cfg.lua.dist
index 38618131..de460956 100644
--- a/prosody.cfg.lua.dist
+++ b/prosody.cfg.lua.dist
@@ -32,6 +32,12 @@
-- Server-wide settings go in this section
Host "*"
+ -- This is a (by default, empty) list of accounts that are admins
+ -- for the server. Note that you must create the accounts separately
+ -- (see http://prosody.im/doc/creating_accounts for info)
+ -- Example: admins = { "user1@example.com", "user2@example.net" }
+ admins = { }
+
-- This is the list of modules Prosody will load on startup.
-- It looks for mod_modulename.lua in the plugins folder, so make sure that exists too.
modules_enabled = {