diff options
| author | Alexey Shchepin <alexey@process-one.net> | 2005-08-05 20:49:24 +0000 |
|---|---|---|
| committer | Alexey Shchepin <alexey@process-one.net> | 2005-08-05 20:49:24 +0000 |
| commit | 1baf1551bef1b1b6adda6bf9b0821826f9d6b556 (patch) | |
| tree | 8fc6eccf8f75e7f6bd27831b300dd85d2e601512 /src/win32 | |
| parent | Release 0.9.8 (diff) | |
* 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
Diffstat (limited to 'src/win32')
| -rw-r--r-- | src/win32/ejabberd.cfg | 6 | ||||
| -rw-r--r-- | src/win32/ejabberd.nsi | 19 | ||||
| -rw-r--r-- | src/win32/inetrc | 1 |
3 files changed, 16 insertions, 10 deletions
diff --git a/src/win32/ejabberd.cfg b/src/win32/ejabberd.cfg index f882f7cc..7ba191be 100644 --- a/src/win32/ejabberd.cfg +++ b/src/win32/ejabberd.cfg @@ -80,11 +80,17 @@ %{ldap_servers, ["localhost"]}. % List of LDAP servers
%{ldap_uidattr, "uid"}. % LDAP attribute that holds user ID
%{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:
%{auth_method, external}.
%{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):
{hosts, ["localhost"]}.
diff --git a/src/win32/ejabberd.nsi b/src/win32/ejabberd.nsi index 984d4be2..fcc11e5d 100644 --- a/src/win32/ejabberd.nsi +++ b/src/win32/ejabberd.nsi @@ -159,10 +159,10 @@ SectionIn 1 RO SetOutPath "$INSTDIR" File /r "${TESTDIR}\doc" File /r "${TESTDIR}\ebin" - File /r "${TESTDIR}\priv" + File /r "${TESTDIR}\msgs" File /r "${TESTDIR}\win32" - File "${TESTDIR}\libeay32.dll" - File "${TESTDIR}\ssleay32.dll" + File "${TESTDIR}\*.dll" + File "${TESTDIR}\inetrc" File /oname=ejabberd.cfg.example "${TESTDIR}\ejabberd.cfg" SetOverwrite off File "${TESTDIR}\ejabberd.cfg" @@ -178,9 +178,8 @@ SectionIn 1 RO CreateDirectory "$0" CreateShortCut "$0\Start Ejabberd.lnk" "$ERLANG_PATH\bin\werl.exe" \ '-sname ejabberd -pa ebin \ - -env EJABBERD_SO_PATH priv/lib -env EJABBERD_MSGS_PATH priv/msgs \ -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\"}' \ $INSTDIR\win32\ejabberd.ico CreateShortCut "$0\Edit Config.lnk" "%SystemRoot%\system32\notepad.exe" \ @@ -214,8 +213,7 @@ SectionIn 1 RO nsExec::ExecToLog '"$ERLSRV" add ejabberd -stopaction "init:stop()." \ -onfail restart -workdir "$INSTDIR" \ -args "-s ejabberd -pa ebin \ - -ejabberd config \\\"ejabberd.cfg\\\" \ - -env EJABBERD_SO_PATH priv/lib -env EJABBERD_MSGS_PATH priv/msgs \ + -kernel inetrc \\\"inetrc\\\" \ -env EJABBERD_LOG_PATH log/ejabberd.log \ -sasl sasl_error_logger {file,\\\"log/sasl.log\\\"} \ -mnesia dir \\\"spool\\\"" -d' @@ -299,12 +297,13 @@ Section "Uninstall" skipservice: RMDir /r "$INSTDIR\doc" RMDir /r "$INSTDIR\ebin" - RMDir /r "$INSTDIR\priv" + RMDir /r "$INSTDIR\msgs" RMDir /r "$INSTDIR\win32" ;RMDir /r "$INSTDIR\src" RMDir /r "$INSTDIR\log" - Delete "$INSTDIR\libeay32.dll" - Delete "$INSTDIR\ssleay32.dll" + Delete "$INSTDIR\*.dll" + Delete "$INSTDIR\inetrc" + Delete "$INSTDIR\ejabberd.cfg.example" Delete "$INSTDIR\Uninstall.exe" RMDir "$INSTDIR" diff --git a/src/win32/inetrc b/src/win32/inetrc new file mode 100644 index 00000000..49b18c2e --- /dev/null +++ b/src/win32/inetrc @@ -0,0 +1 @@ +{registry, win32}. |