mirror of
https://github.com/processone/ejabberd.git
synced 2024-12-20 17:27:00 +01:00
* src/win32/inetrc: Added (thanks to Sergei Golovan)
* src/Makefile.win32: Updated (thanks to Sergei Golovan) * src/win32/ejabberd.cfg: Likewise * src/win32/ejabberd.nsi: Likewise * doc/guide.tex: Updated * src/ejabberd.hrl: Updated version SVN Revision: 402
This commit is contained in:
parent
3e904a1bb8
commit
1baf1551be
12
ChangeLog
12
ChangeLog
@ -1,3 +1,15 @@
|
|||||||
|
2005-08-05 Alexey Shchepin <alexey@sevcom.net>
|
||||||
|
|
||||||
|
* src/win32/inetrc: Added (thanks to Sergei Golovan)
|
||||||
|
|
||||||
|
* src/Makefile.win32: Updated (thanks to Sergei Golovan)
|
||||||
|
* src/win32/ejabberd.cfg: Likewise
|
||||||
|
* src/win32/ejabberd.nsi: Likewise
|
||||||
|
|
||||||
|
* doc/guide.tex: Updated
|
||||||
|
|
||||||
|
* src/ejabberd.hrl: Updated version
|
||||||
|
|
||||||
2005-08-01 Alexey Shchepin <alexey@sevcom.net>
|
2005-08-01 Alexey Shchepin <alexey@sevcom.net>
|
||||||
|
|
||||||
* src/msgs/ru.msg: Updated (thanks to Sergei Golovan)
|
* src/msgs/ru.msg: Updated (thanks to Sergei Golovan)
|
||||||
|
@ -149,8 +149,6 @@ Works on most of popular platforms: *nix (tested on Linux, FreeBSD and
|
|||||||
The misfeatures of <TT>ejabberd</TT> are:
|
The misfeatures of <TT>ejabberd</TT> are:
|
||||||
<UL><LI>
|
<UL><LI>
|
||||||
No support for authentication and STARTTLS in S2S connections
|
No support for authentication and STARTTLS in S2S connections
|
||||||
<LI>Access rules can be defined only for global conext, not for specific
|
|
||||||
virtual host
|
|
||||||
</UL>
|
</UL>
|
||||||
<!--TOC section Installation from Source-->
|
<!--TOC section Installation from Source-->
|
||||||
|
|
||||||
|
@ -134,8 +134,6 @@ The main features of \ejabberd{} are:
|
|||||||
The misfeatures of \ejabberd{} are:
|
The misfeatures of \ejabberd{} are:
|
||||||
\begin{itemize}
|
\begin{itemize}
|
||||||
\item No support for authentication and STARTTLS in S2S connections
|
\item No support for authentication and STARTTLS in S2S connections
|
||||||
\item Access rules can be defined only for global conext, not for specific
|
|
||||||
virtual host
|
|
||||||
\end{itemize}
|
\end{itemize}
|
||||||
|
|
||||||
|
|
||||||
|
@ -8,8 +8,8 @@ EREL=$(REL)\ejabberd-$(EJABBERD_VERSION)
|
|||||||
EBIN_DIR=$(EREL)\ebin
|
EBIN_DIR=$(EREL)\ebin
|
||||||
SRC_DIR=$(EREL)\src
|
SRC_DIR=$(EREL)\src
|
||||||
PRIV_DIR=$(EREL)\priv
|
PRIV_DIR=$(EREL)\priv
|
||||||
SO_DIR=$(PRIV_DIR)\lib
|
SO_DIR=$(EREL)
|
||||||
MSGS_DIR=$(PRIV_DIR)\msgs
|
MSGS_DIR=$(EREL)\msgs
|
||||||
WIN32_DIR=$(EREL)\win32
|
WIN32_DIR=$(EREL)\win32
|
||||||
DOC_DIR=$(EREL)\doc
|
DOC_DIR=$(EREL)\doc
|
||||||
|
|
||||||
@ -35,13 +35,12 @@ release : build release_clean
|
|||||||
copy *.beam $(EBIN_DIR)
|
copy *.beam $(EBIN_DIR)
|
||||||
@erase $(EBIN_DIR)\configure.beam
|
@erase $(EBIN_DIR)\configure.beam
|
||||||
copy *.app $(EBIN_DIR)
|
copy *.app $(EBIN_DIR)
|
||||||
mkdir $(PRIV_DIR)
|
|
||||||
mkdir $(SO_DIR)
|
|
||||||
copy *.dll $(SO_DIR)
|
copy *.dll $(SO_DIR)
|
||||||
mkdir $(MSGS_DIR)
|
mkdir $(MSGS_DIR)
|
||||||
copy msgs\*.msg $(MSGS_DIR)
|
copy msgs\*.msg $(MSGS_DIR)
|
||||||
mkdir $(WIN32_DIR)
|
mkdir $(WIN32_DIR)
|
||||||
copy win32\ejabberd.cfg $(EREL)
|
copy win32\ejabberd.cfg $(EREL)
|
||||||
|
copy win32\inetrc $(EREL)
|
||||||
copy $(SYSTEMROOT)\system32\libeay32.dll $(EREL)
|
copy $(SYSTEMROOT)\system32\libeay32.dll $(EREL)
|
||||||
copy $(SYSTEMROOT)\system32\ssleay32.dll $(EREL)
|
copy $(SYSTEMROOT)\system32\ssleay32.dll $(EREL)
|
||||||
copy win32\ejabberd.ico $(WIN32_DIR)
|
copy win32\ejabberd.ico $(WIN32_DIR)
|
||||||
@ -71,6 +70,7 @@ release : build release_clean
|
|||||||
mkdir $(SRC_DIR)\odbc
|
mkdir $(SRC_DIR)\odbc
|
||||||
copy odbc\*.erl $(SRC_DIR)\odbc
|
copy odbc\*.erl $(SRC_DIR)\odbc
|
||||||
mkdir $(DOC_DIR)
|
mkdir $(DOC_DIR)
|
||||||
|
copy ..\doc\*.txt $(DOC_DIR)
|
||||||
copy ..\doc\*.html $(DOC_DIR)
|
copy ..\doc\*.html $(DOC_DIR)
|
||||||
copy ..\doc\*.png $(DOC_DIR)
|
copy ..\doc\*.png $(DOC_DIR)
|
||||||
|
|
||||||
|
@ -6,7 +6,7 @@
|
|||||||
%%% Id : $Id$
|
%%% Id : $Id$
|
||||||
%%%----------------------------------------------------------------------
|
%%%----------------------------------------------------------------------
|
||||||
|
|
||||||
-define(VERSION, "0.9.8").
|
-define(VERSION, "0.9.9-alpha").
|
||||||
|
|
||||||
%-define(ejabberd_debug, true).
|
%-define(ejabberd_debug, true).
|
||||||
%-define(DBGFSM, true).
|
%-define(DBGFSM, true).
|
||||||
|
@ -80,11 +80,17 @@
|
|||||||
%{ldap_servers, ["localhost"]}. % List of LDAP servers
|
%{ldap_servers, ["localhost"]}. % List of LDAP servers
|
||||||
%{ldap_uidattr, "uid"}. % LDAP attribute that holds user ID
|
%{ldap_uidattr, "uid"}. % LDAP attribute that holds user ID
|
||||||
%{ldap_base, "dc=example,dc=com"}. % Base of LDAP directory
|
%{ldap_base, "dc=example,dc=com"}. % Base of LDAP directory
|
||||||
|
%{ldap_rootdn, "dc=example,dc=com"}. % LDAP manager
|
||||||
|
%{ldap_password, "******"}. % Password to LDAP manager
|
||||||
|
|
||||||
% For authentification via external script use the following:
|
% For authentification via external script use the following:
|
||||||
%{auth_method, external}.
|
%{auth_method, external}.
|
||||||
%{extauth_program, "/path/to/authentification/script"}.
|
%{extauth_program, "/path/to/authentification/script"}.
|
||||||
|
|
||||||
|
% For authentification via ODBC use the following:
|
||||||
|
%{auth_method, odbc}.
|
||||||
|
%{odbc_server, "DSN=ejabberd;UID=ejabberd;PWD=ejabberd"}.
|
||||||
|
|
||||||
|
|
||||||
% Host name(s):
|
% Host name(s):
|
||||||
{hosts, ["localhost"]}.
|
{hosts, ["localhost"]}.
|
||||||
|
@ -159,10 +159,10 @@ SectionIn 1 RO
|
|||||||
SetOutPath "$INSTDIR"
|
SetOutPath "$INSTDIR"
|
||||||
File /r "${TESTDIR}\doc"
|
File /r "${TESTDIR}\doc"
|
||||||
File /r "${TESTDIR}\ebin"
|
File /r "${TESTDIR}\ebin"
|
||||||
File /r "${TESTDIR}\priv"
|
File /r "${TESTDIR}\msgs"
|
||||||
File /r "${TESTDIR}\win32"
|
File /r "${TESTDIR}\win32"
|
||||||
File "${TESTDIR}\libeay32.dll"
|
File "${TESTDIR}\*.dll"
|
||||||
File "${TESTDIR}\ssleay32.dll"
|
File "${TESTDIR}\inetrc"
|
||||||
File /oname=ejabberd.cfg.example "${TESTDIR}\ejabberd.cfg"
|
File /oname=ejabberd.cfg.example "${TESTDIR}\ejabberd.cfg"
|
||||||
SetOverwrite off
|
SetOverwrite off
|
||||||
File "${TESTDIR}\ejabberd.cfg"
|
File "${TESTDIR}\ejabberd.cfg"
|
||||||
@ -178,9 +178,8 @@ SectionIn 1 RO
|
|||||||
CreateDirectory "$0"
|
CreateDirectory "$0"
|
||||||
CreateShortCut "$0\Start Ejabberd.lnk" "$ERLANG_PATH\bin\werl.exe" \
|
CreateShortCut "$0\Start Ejabberd.lnk" "$ERLANG_PATH\bin\werl.exe" \
|
||||||
'-sname ejabberd -pa ebin \
|
'-sname ejabberd -pa ebin \
|
||||||
-env EJABBERD_SO_PATH priv/lib -env EJABBERD_MSGS_PATH priv/msgs \
|
|
||||||
-env EJABBERD_LOG_PATH log/ejabberd.log \
|
-env EJABBERD_LOG_PATH log/ejabberd.log \
|
||||||
-s ejabberd -ejabberd config \"ejabberd.cfg\" -mnesia dir \"spool\" \
|
-s ejabberd -kernel inetrc \"inetrc\" -mnesia dir \"spool\" \
|
||||||
-sasl sasl_error_logger {file,\"log/sasl.log\"}' \
|
-sasl sasl_error_logger {file,\"log/sasl.log\"}' \
|
||||||
$INSTDIR\win32\ejabberd.ico
|
$INSTDIR\win32\ejabberd.ico
|
||||||
CreateShortCut "$0\Edit Config.lnk" "%SystemRoot%\system32\notepad.exe" \
|
CreateShortCut "$0\Edit Config.lnk" "%SystemRoot%\system32\notepad.exe" \
|
||||||
@ -214,8 +213,7 @@ SectionIn 1 RO
|
|||||||
nsExec::ExecToLog '"$ERLSRV" add ejabberd -stopaction "init:stop()." \
|
nsExec::ExecToLog '"$ERLSRV" add ejabberd -stopaction "init:stop()." \
|
||||||
-onfail restart -workdir "$INSTDIR" \
|
-onfail restart -workdir "$INSTDIR" \
|
||||||
-args "-s ejabberd -pa ebin \
|
-args "-s ejabberd -pa ebin \
|
||||||
-ejabberd config \\\"ejabberd.cfg\\\" \
|
-kernel inetrc \\\"inetrc\\\" \
|
||||||
-env EJABBERD_SO_PATH priv/lib -env EJABBERD_MSGS_PATH priv/msgs \
|
|
||||||
-env EJABBERD_LOG_PATH log/ejabberd.log \
|
-env EJABBERD_LOG_PATH log/ejabberd.log \
|
||||||
-sasl sasl_error_logger {file,\\\"log/sasl.log\\\"} \
|
-sasl sasl_error_logger {file,\\\"log/sasl.log\\\"} \
|
||||||
-mnesia dir \\\"spool\\\"" -d'
|
-mnesia dir \\\"spool\\\"" -d'
|
||||||
@ -299,12 +297,13 @@ Section "Uninstall"
|
|||||||
skipservice:
|
skipservice:
|
||||||
RMDir /r "$INSTDIR\doc"
|
RMDir /r "$INSTDIR\doc"
|
||||||
RMDir /r "$INSTDIR\ebin"
|
RMDir /r "$INSTDIR\ebin"
|
||||||
RMDir /r "$INSTDIR\priv"
|
RMDir /r "$INSTDIR\msgs"
|
||||||
RMDir /r "$INSTDIR\win32"
|
RMDir /r "$INSTDIR\win32"
|
||||||
;RMDir /r "$INSTDIR\src"
|
;RMDir /r "$INSTDIR\src"
|
||||||
RMDir /r "$INSTDIR\log"
|
RMDir /r "$INSTDIR\log"
|
||||||
Delete "$INSTDIR\libeay32.dll"
|
Delete "$INSTDIR\*.dll"
|
||||||
Delete "$INSTDIR\ssleay32.dll"
|
Delete "$INSTDIR\inetrc"
|
||||||
|
Delete "$INSTDIR\ejabberd.cfg.example"
|
||||||
Delete "$INSTDIR\Uninstall.exe"
|
Delete "$INSTDIR\Uninstall.exe"
|
||||||
RMDir "$INSTDIR"
|
RMDir "$INSTDIR"
|
||||||
|
|
||||||
|
1
src/win32/inetrc
Normal file
1
src/win32/inetrc
Normal file
@ -0,0 +1 @@
|
|||||||
|
{registry, win32}.
|
Loading…
Reference in New Issue
Block a user