mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-05 06:07:37 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 0.10->trunk

Browse source
This commit is contained in:
Kim Alvefur 2017-03-20 03:11:27 +01:00
commit c160b029b0
5 changed files with 18 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

26
configure vendored
View file

@ -2,10 +2,12 @@
# Defaults # Defaults
APP_NAME="Prosody"
APP_DIRNAME="prosody"
PREFIX="/usr/local" PREFIX="/usr/local"
SYSCONFDIR="$PREFIX/etc/prosody" SYSCONFDIR="$PREFIX/etc/$APP_DIRNAME"
LIBDIR="$PREFIX/lib" LIBDIR="$PREFIX/lib"
DATADIR="$PREFIX/var/lib/prosody" DATADIR="$PREFIX/var/lib/$APP_DIRNAME"
LUA_SUFFIX="" LUA_SUFFIX=""
LUA_DIR="/usr" LUA_DIR="/usr"
LUA_BINDIR="/usr/bin" LUA_BINDIR="/usr/bin"
@ -29,19 +31,19 @@ IDN_LIBRARY="idn"
show_help() { show_help() {
cat <<EOF cat <<EOF
Configure Prosody prior to building. Configure $APP_NAME prior to building.
--help This help. --help This help.
--ostype=OS Use one of the OS presets. May be one of: --ostype=OS Use one of the OS presets. May be one of:
debian, macosx, linux, freebsd, openbsd, netbsd debian, macosx, linux, freebsd, openbsd, netbsd
--prefix=DIR Prefix where Prosody should be installed. --prefix=DIR Prefix where $APP_NAME should be installed.
Default is $PREFIX Default is $PREFIX
--sysconfdir=DIR Location where the config file should be installed. --sysconfdir=DIR Location where the config file should be installed.
Default is \$PREFIX/etc/prosody Default is \$PREFIX/etc/$APP_DIRNAME
--libdir=DIR Location where the server files should be stored. --libdir=DIR Location where the server files should be stored.
Default is \$PREFIX/lib Default is \$PREFIX/lib
--datadir=DIR Location where the server data should be stored. --datadir=DIR Location where the server data should be stored.
Default is \$PREFIX/var/lib/prosody Default is \$PREFIX/var/lib/$APP_DIRNAME
--lua-version=VERSION Use specific Lua version: 5.1, 5.2, or 5.3 --lua-version=VERSION Use specific Lua version: 5.1, 5.2, or 5.3
Default is auto-detected. Default is auto-detected.
--lua-suffix=SUFFIX Versioning suffix to use in Lua filenames. --lua-suffix=SUFFIX Versioning suffix to use in Lua filenames.
@ -77,7 +79,7 @@ Configure Prosody prior to building.
Default is $CC Default is $CC
--linker=CC The linker to use when building modules. --linker=CC The linker to use when building modules.
Default is $LD Default is $LD
--require-config Will cause Prosody to refuse to run when --require-config Will cause $APP_NAME to refuse to run when
it fails to find a configuration file it fails to find a configuration file
--no-example-certs Disables generation of example certificates. --no-example-certs Disables generation of example certificates.
EOF EOF
@ -325,16 +327,16 @@ done
if [ "$PREFIX_SET" = "yes" -a ! "$SYSCONFDIR_SET" = "yes" ] if [ "$PREFIX_SET" = "yes" -a ! "$SYSCONFDIR_SET" = "yes" ]
then then
if [ "$PREFIX" = "/usr" ] if [ "$PREFIX" = "/usr" ]
then SYSCONFDIR=/etc/prosody then SYSCONFDIR=/etc/$APP_DIRNAME
else SYSCONFDIR=$PREFIX/etc/prosody else SYSCONFDIR=$PREFIX/etc/$APP_DIRNAME
fi fi
fi fi
if [ "$PREFIX_SET" = "yes" -a ! "$DATADIR_SET" = "yes" ] if [ "$PREFIX_SET" = "yes" -a ! "$DATADIR_SET" = "yes" ]
then then
if [ "$PREFIX" = "/usr" ] if [ "$PREFIX" = "/usr" ]
then DATADIR=/var/lib/prosody then DATADIR=/var/lib/$APP_DIRNAME
else DATADIR=$PREFIX/var/lib/prosody else DATADIR=$PREFIX/var/lib/$APP_DIRNAME
fi fi
fi fi
@ -581,7 +583,7 @@ RANDOM_LIBS=$PRNGLIBS
EOF EOF
echo "Installation prefix: $PREFIX" echo "Installation prefix: $PREFIX"
echo "Prosody configuration directory: $SYSCONFDIR" echo "$APP_NAME configuration directory: $SYSCONFDIR"
echo "Using Lua from: $LUA_DIR" echo "Using Lua from: $LUA_DIR"
make clean > /dev/null 2> /dev/null make clean > /dev/null 2> /dev/null

2
util/statistics.lua
View file

@ -1,6 +1,6 @@
local t_sort = table.sort local t_sort = table.sort
local m_floor = math.floor; local m_floor = math.floor;
local time = require "socket".gettime; local time = require "util.time".now;
local function nop_function() end local function nop_function() end

2
util/statsd.lua
View file

@ -1,6 +1,6 @@
local socket = require "socket"; local socket = require "socket";
local time = require "socket".gettime; local time = require "util.time".now
local function new(config) local function new(config)
if not config or not config.statsd_server then if not config or not config.statsd_server then

2
util/throttle.lua
View file

@ -1,5 +1,5 @@
local gettime = require "socket".gettime; local gettime = require "util.time".now
local setmetatable = setmetatable; local setmetatable = setmetatable;
local floor = math.floor; local floor = math.floor;

2
util/timer.lua
View file

@ -9,7 +9,7 @@
local indexedbheap = require "util.indexedbheap"; local indexedbheap = require "util.indexedbheap";
local log = require "util.logger".init("timer"); local log = require "util.logger".init("timer");
local server = require "net.server"; local server = require "net.server";
local get_time = require "socket".gettime; local get_time = require "util.time".now
local type = type; local type = type;
local debug_traceback = debug.traceback; local debug_traceback = debug.traceback;
local tostring = tostring; local tostring = tostring;