Software / code / prosody
Changeset
1816:1c0bde3db7d8
Merge with 0.5
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Thu, 24 Sep 2009 11:16:25 +0100 |
| parents | 1807:3bb0e5170692 (current diff) 1815:e2f0c514d039 (diff) |
| children | 1817:5a86a9826b96 |
| files | net/dns.lua plugins/mod_httpserver.lua plugins/mod_welcome.lua |
| diffstat | 4 files changed, 13 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Mon Sep 21 14:46:12 2009 +0100 +++ b/.hgtags Thu Sep 24 11:16:25 2009 +0100 @@ -28,3 +28,7 @@ 06030af44faddd7d3c20e7d380bb55b92b079c5f 0.5.0 a63ff2fbba8d0a29503e7552a29fc7c831faa23c 0.5.1 cea841708dd462c7634df68e84429402f6cdf71d 0.5.2 +cea841708dd462c7634df68e84429402f6cdf71d 0.5.2 +7c45ae42923a1ef03406e481af2a4a6f356361b8 0.5.2 +7c45ae42923a1ef03406e481af2a4a6f356361b8 0.5.2 +e32593074602a785d152f9e153825f29db4d0973 0.5.2
--- a/net/dns.lua Mon Sep 21 14:46:12 2009 +0100 +++ b/net/dns.lua Thu Sep 24 11:16:25 2009 +0100 @@ -507,8 +507,8 @@ 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")
--- a/plugins/mod_httpserver.lua Mon Sep 21 14:46:12 2009 +0100 +++ b/plugins/mod_httpserver.lua Thu Sep 24 11:16:25 2009 +0100 @@ -12,7 +12,7 @@ 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 :(" };
--- a/prosody.cfg.lua.dist Mon Sep 21 14:46:12 2009 +0100 +++ b/prosody.cfg.lua.dist Thu Sep 24 11:16:25 2009 +0100 @@ -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 = {
