From 4279543f739d8897061cde16a92147a30343468f Mon Sep 17 00:00:00 2001
From: valenok <devnull@localhost>
Date: Fri, 3 Sep 2010 04:01:55 +0100
Subject: [PATCH] fixed installer setup

---
 win32/installer.nsi |  5 ++---
 win32/mongoose.conf | 43 +++++++++++++++++++++----------------------
 2 files changed, 23 insertions(+), 25 deletions(-)

diff --git a/win32/installer.nsi b/win32/installer.nsi
index 343ad016..1923ff28 100644
--- a/win32/installer.nsi
+++ b/win32/installer.nsi
@@ -2,7 +2,7 @@
 !define MENUDIR "Mongoose web server"
 !define	SVC "Mongoose ${VERSION}"
 
-OutFile mongoose-${VERSION}.install.exe
+OutFile c:\mongoose-${VERSION}.install.exe
 Name "Mongoose ${VERSION}"
 InstallDir C:\mongoose-${VERSION}
 
@@ -30,7 +30,6 @@ Section "SSL files"
   File ssl_cert.pem
 
   # Following lines add full path to the certificate file in the mongoose.conf
-  # The -ssl_cert option must go before -ports option.
   FileOpen $0 mongoose.conf a
   FileRead $0 $1
   FileRead $0 $1
@@ -38,7 +37,7 @@ Section "SSL files"
   FileRead $0 $1
   FileRead $0 $1
   FileRead $0 $1
-  FileWrite $0 "ssl_cert	$INSTDIR\ssl_cert.pem"
+  FileWrite $0 "ssl_certificate $INSTDIR\ssl_cert.pem"
   FileClose $0
 SectionEnd
 
diff --git a/win32/mongoose.conf b/win32/mongoose.conf
index 001f790f..10f33e4e 100644
--- a/win32/mongoose.conf
+++ b/win32/mongoose.conf
@@ -3,29 +3,28 @@
 # For detailed description of every option, visit
 # http://code.google.com/p/mongoose/wiki/MongooseManual
 
-root            c:\
-                                                                                                                                                                                                                                           
-ports           80,443s
-access_log      c:\mongoose_access_log.txt
-error_log       c:\mongoose_error_log.txt
+document_root c:\
+
+                                                                      
+
+listening_ports 80,443s
+access_log_file c:\mongoose_access_log.txt
+error_log_file c:\mongoose_error_log.txt
 
 # NOTE FOR PHP USERS:
 # Correct PHP binary to use is php-cgi.exe, NOT php.exe!
-# cgi_interp    c:\php\php-cgi.exe
-# cgi_interp    c:\perl\bin\perl.exe
+# cgi_interpreter    c:\php\php-cgi.exe
 
-# cgi_ext       cgi,pl,php
-# ssi_ext       shtml,shtm
-# auth_realm    mydomain.com
-# dir_list      no
-# index_files   index.html,index.htm,index.php,index.cgi
-# aliases	/my_d_disk=d:\,/my_e_disk=e:\
-# acl           -0.0.0.0/0,+10.0.0.0/8,+192.168.0.0/16
-# admin_uri     /remote_admin
-# protect       /remote_admin=c:\passwords.txt
-# cgi_env       FOO=BAR,BAZ=POO
-# auth_gpass    c:\mongoose_global_web_passwords.txt
-# auth_PUT      c:\mongoose_put_delete_passwords.txt
-# ssl_cert      ssl_cert.pem
-# max_threads	100
-# idle_time	10
+# cgi_extensions cgi,pl,php
+# ssi_extensions shtml,shtm
+# authentication_domain mydomain.com
+# enable_directory_listing no
+# index_files index.html,index.htm,index.php,index.cgi
+# access_control_list -0.0.0.0/0,+10.0.0.0/8,+192.168.0.0/16
+# protect_uri /foo=c:\passwords.txt
+# cgi_environment FOO=BAR,BAZ=POO
+# global_passwords_file c:\mongoose_global_web_passwords.txt
+# put_delete_passwords_file c:\mongoose_put_delete_passwords.txt
+# ssl_certificate ssl_cert.pem
+# num_threads 10
+# enable_keep_alive no