Software / code / prosody
Changeset
6581:f2a7ad099e01
Merge 0.10->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Tue, 24 Feb 2015 15:22:34 +0000 |
| parents | 6573:afd638e9c6d0 (current diff) 6580:74946f050209 (diff) |
| children | 6588:93423244dc5b |
| files | plugins/mod_admin_telnet.lua |
| diffstat | 5 files changed, 22 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile Mon Feb 23 00:30:01 2015 +0000 +++ b/Makefile Tue Feb 24 15:22:34 2015 +0000 @@ -3,14 +3,14 @@ BIN = $(DESTDIR)$(PREFIX)/bin CONFIG = $(DESTDIR)$(SYSCONFDIR) -MODULES = $(DESTDIR)$(PREFIX)/lib/prosody/modules -SOURCE = $(DESTDIR)$(PREFIX)/lib/prosody +MODULES = $(DESTDIR)$(LIBDIR)/prosody/modules +SOURCE = $(DESTDIR)$(LIBDIR)/prosody DATA = $(DESTDIR)$(DATADIR) MAN = $(DESTDIR)$(PREFIX)/share/man -INSTALLEDSOURCE = $(PREFIX)/lib/prosody +INSTALLEDSOURCE = $(LIBDIR)/prosody INSTALLEDCONFIG = $(SYSCONFDIR) -INSTALLEDMODULES = $(PREFIX)/lib/prosody/modules +INSTALLEDMODULES = $(LIBDIR)/prosody/modules INSTALLEDDATA = $(DATADIR) .PHONY: all clean install
--- a/configure Mon Feb 23 00:30:01 2015 +0000 +++ b/configure Tue Feb 24 15:22:34 2015 +0000 @@ -4,6 +4,7 @@ PREFIX=/usr/local SYSCONFDIR="$PREFIX/etc/prosody" +LIBDIR="$PREFIX/lib" DATADIR="$PREFIX/var/lib/prosody" LUA_SUFFIX="" LUA_DIR="/usr" @@ -36,6 +37,8 @@ Default is $PREFIX --sysconfdir=DIR Location where the config file should be installed. Default is \$PREFIX/etc/prosody +--libdir=DIR Location where the server files should be stored. + Default is \$PREFIX/lib --datadir=DIR Location where the server data should be stored. Default is \$PREFIX/var/lib/prosody --lua-suffix=SUFFIX Versioning suffix to use in Lua filenames. @@ -133,6 +136,10 @@ LUA_INCDIR="/usr/local/include"; fi ;; + --libdir=*) + LIBDIR="$value" + LIBDIR_SET=yes + ;; --datadir=*) DATADIR="$value" DATADIR_SET=yes @@ -206,6 +213,11 @@ fi fi +if [ "$PREFIX_SET" = "yes" -a ! "$LIBDIR_SET" = "yes" ] +then + LIBDIR=$PREFIX/lib +fi + find_program() { path="$PATH" item="`echo "$path" | sed 's/\([^:]*\):.*/\1/'`" @@ -337,6 +349,7 @@ PREFIX=$PREFIX SYSCONFDIR=$SYSCONFDIR +LIBDIR=$LIBDIR DATADIR=$DATADIR LUA_SUFFIX=$LUA_SUFFIX LUA_DIR=$LUA_DIR
--- a/core/statsmanager.lua Mon Feb 23 00:30:01 2015 +0000 +++ b/core/statsmanager.lua Tue Feb 24 15:22:34 2015 +0000 @@ -48,6 +48,7 @@ end timer.add_task(stats_interval, collect); + prosody.events.add_handler("server-started", function () collect() end, -1); else log("debug", "Statistics collection is disabled"); -- nop
--- a/tools/migration/Makefile Mon Feb 23 00:30:01 2015 +0000 +++ b/tools/migration/Makefile Tue Feb 24 15:22:34 2015 +0000 @@ -3,13 +3,13 @@ BIN = $(DESTDIR)$(PREFIX)/bin CONFIG = $(DESTDIR)$(SYSCONFDIR) -SOURCE = $(DESTDIR)$(PREFIX)/lib/prosody +SOURCE = $(DESTDIR)$(LIBDIR)/prosody DATA = $(DESTDIR)$(DATADIR) MAN = $(DESTDIR)$(PREFIX)/share/man -INSTALLEDSOURCE = $(PREFIX)/lib/prosody +INSTALLEDSOURCE = $(LIBDIR)/prosody INSTALLEDCONFIG = $(SYSCONFDIR) -INSTALLEDMODULES = $(PREFIX)/lib/prosody/modules +INSTALLEDMODULES = $(LIBDIR)/prosody/modules INSTALLEDDATA = $(DATADIR) SOURCE_FILES = migrator/*.lua
--- a/util/datamanager.lua Mon Feb 23 00:30:01 2015 +0000 +++ b/util/datamanager.lua Tue Feb 24 15:22:34 2015 +0000 @@ -163,7 +163,7 @@ return nil, msg; end -if prosody.platform ~= "posix" then +if prosody and prosody.platform ~= "posix" then -- os.rename does not overwrite existing files on Windows -- TODO We could use Transactional NTFS on Vista and above function atomic_store(filename, data)
