aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2008-11-29 02:28:00 +0000
committerMatthew Wild <mwild1@gmail.com>2008-11-29 02:28:00 +0000
commit46d4eaa6188ebfd25f37d9f114a65dbdbfa0a3e3 (patch)
treefdc3b300bdd46555a27cacf0987a852fe9a03ae7
parent2e0ae8ed92e4801866f5486c6595c7e6c74d3a0a (diff)
downloadprosody-46d4eaa6188ebfd25f37d9f114a65dbdbfa0a3e3.tar.gz
prosody-46d4eaa6188ebfd25f37d9f114a65dbdbfa0a3e3.zip
Rename and update config. Update Makefile for this change.
-rw-r--r--Makefile2
-rw-r--r--prosody.cfg.lua.dist (renamed from lxmppd.cfg.lua.dist)11
2 files changed, 6 insertions, 7 deletions
diff --git a/Makefile b/Makefile
index cca246a6..f1c1a286 100644
--- a/Makefile
+++ b/Makefile
@@ -18,7 +18,7 @@ install: prosody util/encodings.so util/encodings.so
install -m644 net/* $(SOURCE)/net
install -m644 util/* $(SOURCE)/util
install -m644 plugins/* $(MODULES)
- install -m644 prosody.cfg.lua $(CONFIG)
+ install -m644 prosody.cfg.lua.dist $(CONFIG)/prosody.cfg.lua
$(MAKE) install -C util-src
clean:
diff --git a/lxmppd.cfg.lua.dist b/prosody.cfg.lua.dist
index d2c6d3ff..7b9fe4dd 100644
--- a/lxmppd.cfg.lua.dist
+++ b/prosody.cfg.lua.dist
@@ -1,7 +1,7 @@
--- lxmppd Example Configuration File
+-- Prosody Example Configuration File
--
-- If it wasn't already obvious, -- starts a comment, and all
--- text after it is ignored by lxmppd.
+-- text after it is ignored by Prosody.
--
-- The config is split into sections, a global section, and one
-- for each defined host that we serve. You can add as many host
@@ -23,7 +23,7 @@
--sonsIdon'trecommendit.
--
-- Tip: You can check that the syntax of this file is correct when you have finished
--- by running: luac -p lxmppd.cfg.lua
+-- by running: luac -p prosody.cfg.lua
-- If there are any errors, it will let you know what and where they are, otherwise it
-- will keep quiet.
--
@@ -33,8 +33,8 @@
-- Global settings go in this section
Host "*"
- -- This is the list of modules lxmppd will load on startup.
- -- It looks for plugins/mod_modulename.lua, so make sure that exists too.
+ -- 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 = {
"saslauth"; -- Authentication for clients and servers. Recommended if you want to log in.
"legacyauth"; -- Legacy authentication. Only used by some old clients and bots.
@@ -69,6 +69,5 @@ Host "example.com"
certificate = "certs/example.com.crt";
}
-Host "example.org"
enabled = false -- This will disable the host, preserving the config, but denying connections