diff options
| author | Alexey Shchepin <alexey@process-one.net> | 2004-10-10 17:15:24 +0000 |
|---|---|---|
| committer | Alexey Shchepin <alexey@process-one.net> | 2004-10-10 17:15:24 +0000 |
| commit | e9f6529ead1f87a996a89616a7bddb91dfbf629d (patch) | |
| tree | f183c6f2f57119564638ef4de77d80c35b05cc50 /src/win32 | |
| parent | * src/msgs/uk.msg: Updated (thanks to Sergei Golovan) (diff) | |
* src/tls/Makefile.win32: Added (thanks to Sergei Golovan)
* src/win32/: Updated (thanks to Sergei Golovan)
SVN Revision: 281
Diffstat (limited to 'src/win32')
| -rw-r--r-- | src/win32/ejabberd.cfg | 6 | ||||
| -rw-r--r-- | src/win32/ejabberd.nsi | 43 |
2 files changed, 45 insertions, 4 deletions
diff --git a/src/win32/ejabberd.cfg b/src/win32/ejabberd.cfg index 237761e5..8f88ca48 100644 --- a/src/win32/ejabberd.cfg +++ b/src/win32/ejabberd.cfg @@ -75,12 +75,16 @@ % this line: {auth_method, internal}. -% For LDAP uthentification use these lines instead of above one: +% For LDAP authentification use these lines instead of above one: %{auth_method, ldap}. %{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 +% For authentification via external script use the following: +%{auth_method, external}. +%{extauth_program, "/path/to/authentification/script"}. + % Host name: {host, "localhost"}. diff --git a/src/win32/ejabberd.nsi b/src/win32/ejabberd.nsi index 8c7d3fe5..d91d3ea4 100644 --- a/src/win32/ejabberd.nsi +++ b/src/win32/ejabberd.nsi @@ -36,6 +36,7 @@ ReserveFile "CheckReqs1.ini" !endif ReserveFile "CheckReqs.ini" + ReserveFile "CheckService.ini" !insertmacro MUI_RESERVEFILE_INSTALLOPTIONS ;-------------------------------- @@ -44,6 +45,7 @@ Var MUI_TEMP Var STARTMENU_FOLDER Var ADMIN + Var ENABLE_SERVICE Var ERLANG_PATH Var ERLANG_VERSION Var REQUIRED_ERLANG_VERSION @@ -82,6 +84,7 @@ Function .onInit !insertmacro MUI_INSTALLOPTIONS_EXTRACT "CheckReqs1.ini" !endif !insertmacro MUI_INSTALLOPTIONS_EXTRACT "CheckReqs.ini" + !insertmacro MUI_INSTALLOPTIONS_EXTRACT "CheckService.ini" ClearErrors UserInfo::GetName @@ -112,6 +115,7 @@ FunctionEnd !insertmacro MUI_PAGE_WELCOME Page custom CheckUser LeaveCheckUser + Page custom CheckService LeaveCheckService !insertmacro MUI_PAGE_LICENSE "..\..\COPYING" Page custom CheckReqs LeaveCheckReqs Page custom CheckReqs1 LeaveCheckReqs1 @@ -200,7 +204,7 @@ SectionIn 1 RO installsrv: nsExec::ExecToLog '"$ERLSRV" add ejabberd -stopaction "init:stop()." \ - -onfail reboot -workdir "$INSTDIR" \ + -onfail restart -workdir "$INSTDIR" \ -args "-s ejabberd -pa ebin \ -ejabberd config \\\"ejabberd.cfg\\\" \ -env EJABBERD_SO_PATH priv/lib -env EJABBERD_MSGS_PATH msgs \ @@ -208,8 +212,10 @@ SectionIn 1 RO -sasl sasl_error_logger {file,\\\"log/sasl.log\\\"} \ -mnesia dir \\\"spool\\\"" -d' Pop $0 - ;nsExec::ExecToLog '"$ERLSRV" disable ejabberd' - ;Pop $0 + + StrCmp $ENABLE_SERVICE 0 0 skipservice + nsExec::ExecToLog '"$ERLSRV" disable ejabberd' + Pop $0 skipservice: @@ -369,6 +375,37 @@ Function LeaveCheckUser FunctionEnd +LangString TEXT_CU_TITLE ${LANG_ENGLISH} "Configuring Ejabberd Service" +LangString TEXT_CU_SUBTITLE ${LANG_ENGLISH} "Configuring Ejabberd Service." + +Function CheckService + + StrCmp $ADMIN 0 0 showpage + Abort + + showpage: + !insertmacro MUI_HEADER_TEXT $(TEXT_CU_TITLE) $(TEXT_CU_SUBTITLE) + + !insertmacro MUI_INSTALLOPTIONS_INITDIALOG "CheckService.ini" + + !insertmacro MUI_INSTALLOPTIONS_SHOW + +FunctionEnd + +Function LeaveCheckService + + !insertmacro MUI_INSTALLOPTIONS_READ $0 "CheckService.ini" "Field 2" "State" + StrCmp $0 0 0 autostart + StrCpy $ENABLE_SERVICE 0 + Goto endfun + + autostart: + StrCpy $ENABLE_SERVICE 1 + + endfun: + +FunctionEnd + LangString TEXT_CR_TITLE ${LANG_ENGLISH} "Unsatisfied Requirements" LangString TEXT_CR_SUBTITLE ${LANG_ENGLISH} "Unsatisfied Ejabberd requirements found." |