diff --git a/build/exe/doliwamp/Languages/MyEnglish.isl b/build/exe/doliwamp/Languages/MyEnglish.isl index b066a5f87f6..371e724d6d0 100644 --- a/build/exe/doliwamp/Languages/MyEnglish.isl +++ b/build/exe/doliwamp/Languages/MyEnglish.isl @@ -11,11 +11,11 @@ LaunchProgram=Launch %1 AssocFileExtension=&Associate %1 with the %2 file extension AssocingFileExtension=Associating %1 with the %2 file extension... -YouWillInstallDoliWamp=You will install or upgrade DoliWamp (so Dolibarr + all required third party software like Apache, Mysql and PHP) on your computer. +YouWillInstallDoliWamp=You will install DoliWamp (so Dolibarr + all required third party software like Apache, Mysql and PHP) on your computer. ThisAssistantInstallOrUpgrade=WARNING: Using an ERP CRM installed on a local computer can be dangerous: if your computer break down, you can lose all your data. Do this if you are ready to manage backup yourself seriously. If not, use an installation in Saas instead (see https://saas.dolibarr.org). IfYouHaveTechnicalKnowledge=Moreover, if you have technical knowledges and want to manage your Apache, Mysql and PHP yourself, you should not use this assistant and make a manual installation of Dolibarr on your existing server with Apache, Mysql and PHP. ButIfYouLook=But if you look for an automatic setup on your local computer, you''re on the good way... -DoYouWantToStart=Do you want to start installation/upgrade process ? +DoYouWantToStart=Do you want to start installation process ? TechnicalParameters=Technical parameters IfFirstInstall=If first install, please specify some technical parameters. If you don't understand, are not sure, or are doing an upgrade, just leave the default values. diff --git a/build/exe/doliwamp/Languages/MyFrench.isl b/build/exe/doliwamp/Languages/MyFrench.isl index 2e93a44081e..c3fd15cbac8 100644 --- a/build/exe/doliwamp/Languages/MyFrench.isl +++ b/build/exe/doliwamp/Languages/MyFrench.isl @@ -11,11 +11,11 @@ LaunchProgram=Ex AssocFileExtension=&Associer %1 avec l'extension de fichier %2 AssocingFileExtension=Associe %1 avec l'extension de fichier %2... -YouWillInstallDoliWamp=Vous allez installer ou mettre à jour DoliWamp sur votre ordinateur (donc Dolibarr + tous ses composants prérequis comme Apache, Mysql et PHP). +YouWillInstallDoliWamp=Vous allez installer DoliWamp sur votre ordinateur (donc Dolibarr + tous ses composants prérequis comme Apache, Mysql et PHP). ThisAssistantInstallOrUpgrade=AVERTISSEMENT: L'utilisation d'un ERP CRM installé sur un ordinateur local peut être dangereuse: si votre ordinateur tombe en panne, vous pouvez perdre toutes vos données. Faites-le si vous êtes prêt à gérer les sauvegardes vous-même sérieusement. Sinon, utilisez plutôt une installation en Saas (voir https://saas.dolibarr.org). IfYouHaveTechnicalKnowledge=De plus, si vous avez des compétences techniques et envisagez de partager votre Apache, Mysql et PHP avec d''autres applications que Dolibarr, vous ne devriez pas utiliser cet assistant mais faire plutôt une installation manuelle de Dolibarr sur un serveur existant équipé de Apache, Mysql et PHP. ButIfYouLook=Mais si vous recherchez une installation clé en main automatisée sur une poste local, vous êtes sur la bonne voie... -DoYouWantToStart=Voulez-vous démarrer le processus d'installation/mise à jour ? +DoYouWantToStart=Voulez-vous démarrer le processus d'installation ? TechnicalParameters=Paramètres techniques IfFirstInstall=S'il s'agit de la première installation, merci de spécifier ces quelques paramètres techniques. Si vous ne les comprennez pas, êtes non sûr, ou procédez à une mise à jour, laissez les champs avec les valeurs proposées par défaut. diff --git a/build/exe/doliwamp/doliwamp.iss b/build/exe/doliwamp/doliwamp.iss index b9a6b837d7f..9705cc198da 100644 --- a/build/exe/doliwamp/doliwamp.iss +++ b/build/exe/doliwamp/doliwamp.iss @@ -32,7 +32,7 @@ AppPublisherURL=https://www.nltechno.com AppSupportURL=https://www.dolibarr.org AppUpdatesURL=https://www.dolibarr.org AppComments=DoliWamp includes Dolibarr, Apache, PHP and Mysql software. -AppCopyright=Copyright (C) 2008-2019 Laurent Destailleur (NLTechno), Fabian Rodriguez (Le Goût du Libre) +AppCopyright=Copyright (C) 2008-2020 Laurent Destailleur (NLTechno), Fabian Rodriguez (Le Goût du Libre) DefaultDirName=c:\dolibarr DefaultGroupName=Dolibarr ;LicenseFile=COPYING @@ -81,7 +81,7 @@ Name: "desktopicon"; Description: {cm:CreateDesktopIcon}; GroupDescription: {cm: Name: "{app}\logs" Name: "{app}\tmp" Name: "{app}\dolibarr_documents" -Name: "{app}\bin\apache\apache2.4.9\logs" +Name: "{app}\bin\apache\apache2.4.41\logs" [Files] ; Stop/start @@ -98,6 +98,7 @@ Source: "build\exe\doliwamp\mysqltestinstall.bat.install"; DestDir: "{app}\"; Fl Source: "build\exe\doliwamp\startdoliwamp_manual_donotuse.bat.install"; DestDir: "{app}\"; Flags: ignoreversion; Source: "build\exe\doliwamp\builddemosslfiles.bat.install"; DestDir: "{app}\"; Flags: ignoreversion; Source: "build\exe\doliwamp\UsedPort.exe"; DestDir: "{app}\"; Flags: ignoreversion; + ; PhpMyAdmin, Apache, Php, Mysql ; Put here path of Wampserver applications ; Value OK: apache 2.2.6, php 5.2.5 (5.2.11, 5.3.0 and 5.3.1 fails if php_exif, php_pgsql, php_zip is on), mysql 5.0.45 @@ -109,15 +110,20 @@ Source: "C:\Program Files\Wamp\apps\phpmyadmin4.1.14\*.*"; DestDir: "{app}\apps\ Source: "C:\wamp64\bin\apache\apache2.4.41\*.*"; DestDir: "{app}\bin\apache\apache2.4.41"; Flags: ignoreversion recursesubdirs; Excludes: "php.ini,httpd.conf,wampserver.conf,*.log,*_log" ;Source: "C:\Program Files\Wamp\bin\php\php5.5.12\*.*"; DestDir: "{app}\bin\php\php5.5.12"; Flags: ignoreversion recursesubdirs; Excludes: "php.ini,phpForApache.ini,wampserver.conf,*.log,*_log" Source: "C:\wamp64\bin\php\php7.3.12\*.*"; DestDir: "{app}\bin\php\php7.3.12"; Flags: ignoreversion recursesubdirs; Excludes: "php.ini,phpForApache.ini,wampserver.conf,*.log,*_log" -Source: "C:\Program Files\Wamp\bin\mysql\mysql5.0.45\*.*"; DestDir: "{app}\bin\mysql\mysql5.0.45"; Flags: ignoreversion recursesubdirs; Excludes: "my.ini,data\*,wampserver.conf,*.log,*_log,MySQLInstanceConfig.exe" +;Source: "C:\Program Files\Wamp\bin\mysql\mysql5.0.45\*.*"; DestDir: "{app}\bin\mysql\mysql5.0.45"; Flags: ignoreversion recursesubdirs; Excludes: "my.ini,data\*,wampserver.conf,*.log,*_log,MySQLInstanceConfig.exe" +Source: "C:\wamp64\bin\mariadb\mariadb10.4.10\*.*"; DestDir: "{app}\bin\mariadb\mariadb10.4.10"; Flags: ignoreversion recursesubdirs; Excludes: "my.ini,data\*,wampserver.conf,*.log,*_log,MySQLInstanceConfig.exe" + ; Mysql data files (does not overwrite if exists) -Source: "build\exe\doliwamp\mysql\*.*"; DestDir: "{app}\bin\mysql\data\mysql"; Flags: onlyifdoesntexist ignoreversion recursesubdirs; Excludes: ".gitignore,.project,CVS\*,Thumbs.db" +; We must copy them because the tool mysql_install_db.exe to generate them at first install does not return to prompt so make install hang +;Source: "build\exe\doliwamp\mysql\*.*"; DestDir: "{app}\bin\mariadb\data\mysql"; Flags: onlyifdoesntexist ignoreversion recursesubdirs; Excludes: ".gitignore,.project,CVS\*,Thumbs.db" + ; Dolibarr Source: "htdocs\*.*"; DestDir: "{app}\www\dolibarr\htdocs"; Flags: ignoreversion recursesubdirs; Excludes: ".gitignore,.project,CVS\*,Thumbs.db,custom\*,custom2\*,documents\*,includes\ckeditor\_source\*,includes\savant\*,includes\phpmailer\*,jquery\plugins\template\*,nltechno*\*,sabre\sabre\*\tests,PHPExcel\Shared\PDF\*,PHPExcel\Shared\PCLZip\*,tcpdf\fonts\dejavu-fonts-ttf-2.33\*,tcpdf\fonts\freefont-20100919\*,tcpdf\fonts\utils\*,*\conf.php,*\conf.php.mysql,*\conf.php.old,*\conf.php.postgres,*\conf.php.sav,*\install.forced.php" Source: "dev\*.*"; DestDir: "{app}\www\dolibarr\dev"; Flags: ignoreversion recursesubdirs; Excludes: ".gitignore,.project,CVS\*,Thumbs.db,dbmodel\*,fpdf\*,initdata\*,initdemo\*,iso-normes\*,licence\*,phpcheckstyle\*,phpunit\*,samples\*,test\*,uml\*,vagrant\*,xdebug\*" Source: "doc\*.*"; DestDir: "{app}\www\dolibarr\doc"; Flags: ignoreversion recursesubdirs; Excludes: ".gitignore,.project,CVS\*,Thumbs.db,wiki\*,plaquette\*,dev\*,images\dolibarr_screenshot2.png,images\dolibarr_screenshot3.png,images\dolibarr_screenshot4.png,images\dolibarr_screenshot5.png,images\dolibarr_screenshot6.png,images\dolibarr_screenshot7.png,images\dolibarr_screenshot8.png,images\dolibarr_screenshot9.png,images\dolibarr_screenshot10.png,images\dolibarr_screenshot11.png,images\dolibarr_screenshot12.png" Source: "scripts\*.*"; DestDir: "{app}\www\dolibarr\scripts"; Flags: ignoreversion recursesubdirs; Excludes: ".gitignore,.project,CVS\*,Thumbs.db,product\materiel.net.php,product\import-product.php" Source: "*.*"; DestDir: "{app}\www\dolibarr"; Flags: ignoreversion; Excludes: ".gitignore,.project,CVS\*,Thumbs.db,default.properties,install.lock" + ; Config files Source: "build\exe\doliwamp\phpmyadmin.conf.install"; DestDir: "{app}\alias"; Flags: ignoreversion; Source: "build\exe\doliwamp\dolibarr.conf.install"; DestDir: "{app}\alias"; Flags: ignoreversion; @@ -125,6 +131,7 @@ Source: "build\exe\doliwamp\config.inc.php.install"; DestDir: "{app}\apps\phpmya ;Source: "build\exe\doliwamp\httpd.conf.install"; DestDir: "{app}\bin\apache\apache2.4.9\conf"; Flags: ignoreversion; Source: "build\exe\doliwamp\httpd.conf.install"; DestDir: "{app}\bin\apache\apache2.4.41\conf"; Flags: ignoreversion; Source: "build\exe\doliwamp\my.ini.install"; DestDir: "{app}\bin\mysql\mysql5.0.45"; Flags: ignoreversion; +Source: "build\exe\doliwamp\my.ini.install"; DestDir: "{app}\bin\mariadb\mariadb10.4.10"; Flags: ignoreversion; ;Source: "build\exe\doliwamp\php.ini.install"; DestDir: "{app}\bin\php\php5.5.12"; Flags: ignoreversion; Source: "build\exe\doliwamp\php.ini.install"; DestDir: "{app}\bin\php\php7.3.12"; Flags: ignoreversion; Source: "build\exe\doliwamp\index.php.install"; DestDir: "{app}\www"; Flags: ignoreversion; @@ -132,6 +139,7 @@ Source: "build\exe\doliwamp\install.forced.php.install"; DestDir: "{app}\www\dol Source: "build\exe\doliwamp\openssl.conf"; DestDir: "{app}"; Flags: ignoreversion; Source: "build\exe\doliwamp\ca_demo_dolibarr.crt"; DestDir: "{app}"; Flags: ignoreversion; Source: "build\exe\doliwamp\ca_demo_dolibarr.key"; DestDir: "{app}"; Flags: ignoreversion; + ; Licence Source: "COPYRIGHT"; DestDir: "{app}"; Flags: ignoreversion; @@ -236,7 +244,8 @@ begin //phpVersion := '5.5.12' ; apacheVersion := '2.4.41'; phpVersion := '7.3.12' ; - mysqlVersion := '5.0.45'; + //mysqlVersion := '5.0.45'; + mysqlVersion := '10.4.10'; phpmyadminVersion := '4.1.14'; smtpServer := 'localhost'; @@ -368,18 +377,19 @@ begin winPath := ExpandConstant('{win}'); pathWithSlashes := path; StringChange (pathWithSlashes, '\','/'); - datadir := pathWithSlashes+'/bin/mysql/data'; - exedirold := pathWithSlashes+'/bin/mysql/mysql5.0.45'; - exedirnew := pathWithSlashes+'/bin/mysql/mysql5.0.45'; - + // Migration of database +// datadir := pathWithSlashes+'/bin/mariadb/marradb10.4.10/data'; +// exedirold := pathWithSlashes+'/bin/mariadb/marradb10.4.10/'; +// exedirnew := pathWithSlashes+'/bin/mariadb/marradb10.4.10/'; + // If we have a new database version, we should only copy old my.ini file into new directory // and change only all basedir= strings to use new version. Like this, data dir is still correct. // Install of service and stop/start scripts are already rebuild by installer. // FileCopy(exedirold+'/my.ini',exedirnew+'/my.ini', true); -// We should not need this, also databases may not be called dolibarr + // We should not need this, also databases may not be called dolibarr // res := RenameFile(ibdata1dirold+'/dolibarr',ibdata1dirnew+'/dolibarr'); // if res then // begin @@ -399,43 +409,23 @@ begin //---------------------------------------------- // TODO Update this list when changing PHP/Apache versions -// phpDllCopy := 'fdftk.dll'; -// filecopy (pathWithSlashes+'/bin/php/php'+phpVersion+'/'+phpDllCopy, pathWithSlashes+'/bin/apache/apache'+apacheVersion+'/bin/'+phpDllCopy, False); -// phpDllCopy := 'fribidi.dll'; -// filecopy (pathWithSlashes+'/bin/php/php'+phpVersion+'/'+phpDllCopy, pathWithSlashes+'/bin/apache/apache'+apacheVersion+'/bin/'+phpDllCopy, False); -// phpDllCopy := 'gds32.dll'; -// filecopy (pathWithSlashes+'/bin/php/php'+phpVersion+'/'+phpDllCopy, pathWithSlashes+'/bin/apache/apache'+apacheVersion+'/bin/'+phpDllCopy, False); -// phpDllCopy := 'libeay32.dll'; -// filecopy (pathWithSlashes+'/bin/php/php'+phpVersion+'/'+phpDllCopy, pathWithSlashes+'/bin/apache/apache'+apacheVersion+'/bin/'+phpDllCopy, False); -// phpDllCopy := 'libmhash.dll'; -// filecopy (pathWithSlashes+'/bin/php/php'+phpVersion+'/'+phpDllCopy, pathWithSlashes+'/bin/apache/apache'+apacheVersion+'/bin/'+phpDllCopy, False); -// phpDllCopy := 'libmysql.dll'; -// filecopy (pathWithSlashes+'/bin/php/php'+phpVersion+'/'+phpDllCopy, pathWithSlashes+'/bin/apache/apache'+apacheVersion+'/bin/'+phpDllCopy, False); -// phpDllCopy := 'libpq.dll'; -// filecopy (pathWithSlashes+'/bin/php/php'+phpVersion+'/'+phpDllCopy, pathWithSlashes+'/bin/apache/apache'+apacheVersion+'/bin/'+phpDllCopy, False); -// phpDllCopy := 'msql.dll'; -// filecopy (pathWithSlashes+'/bin/php/php'+phpVersion+'/'+phpDllCopy, pathWithSlashes+'/bin/apache/apache'+apacheVersion+'/bin/'+phpDllCopy, False); -// phpDllCopy := 'libmcrypt.dll'; -// filecopy (pathWithSlashes+'/bin/php/php'+phpVersion+'/'+phpDllCopy, pathWithSlashes+'/bin/apache/apache'+apacheVersion+'/bin/'+phpDllCopy, False); -// phpDllCopy := 'libmysqli.dll'; -// filecopy (pathWithSlashes+'/bin/php/php'+phpVersion+'/'+phpDllCopy, pathWithSlashes+'/bin/apache/apache'+apacheVersion+'/bin/'+phpDllCopy, False); -// phpDllCopy := 'ntwdblib.dll'; -// filecopy (pathWithSlashes+'/bin/php/php'+phpVersion+'/'+phpDllCopy, pathWithSlashes+'/bin/apache/apache'+apacheVersion+'/bin/'+phpDllCopy, False); - -// phpDllCopy := 'php5activescript.dll'; -// filecopy (pathWithSlashes+'/bin/php/php'+phpVersion+'/'+phpDllCopy, pathWithSlashes+'/bin/apache/apache'+apacheVersion+'/bin/'+phpDllCopy, False); -// phpDllCopy := 'php5nsapi.dll'; -// filecopy (pathWithSlashes+'/bin/php/php'+phpVersion+'/'+phpDllCopy, pathWithSlashes+'/bin/apache/apache'+apacheVersion+'/bin/'+phpDllCopy, False); + phpDllCopy := 'libssh2.dll'; + filecopy (pathWithSlashes+'/bin/php/php'+phpVersion+'/'+phpDllCopy, pathWithSlashes+'/bin/apache/apache'+apacheVersion+'/bin/'+phpDllCopy, False); + phpDllCopy := 'icuuc64.dll'; + filecopy (pathWithSlashes+'/bin/php/php'+phpVersion+'/'+phpDllCopy, pathWithSlashes+'/bin/apache/apache'+apacheVersion+'/bin/'+phpDllCopy, False); + phpDllCopy := 'icuin64.dll'; + filecopy (pathWithSlashes+'/bin/php/php'+phpVersion+'/'+phpDllCopy, pathWithSlashes+'/bin/apache/apache'+apacheVersion+'/bin/'+phpDllCopy, False); + phpDllCopy := 'icuio64.dll'; + filecopy (pathWithSlashes+'/bin/php/php'+phpVersion+'/'+phpDllCopy, pathWithSlashes+'/bin/apache/apache'+apacheVersion+'/bin/'+phpDllCopy, False); + phpDllCopy := 'icudt64.dll'; + filecopy (pathWithSlashes+'/bin/php/php'+phpVersion+'/'+phpDllCopy, pathWithSlashes+'/bin/apache/apache'+apacheVersion+'/bin/'+phpDllCopy, False); + phpDllCopy := 'libsasl.dll'; + filecopy (pathWithSlashes+'/bin/php/php'+phpVersion+'/'+phpDllCopy, pathWithSlashes+'/bin/apache/apache'+apacheVersion+'/bin/'+phpDllCopy, False); phpDllCopy := 'php7apache2_4.dll'; filecopy (pathWithSlashes+'/bin/php/php'+phpVersion+'/'+phpDllCopy, pathWithSlashes+'/bin/apache/apache'+apacheVersion+'/bin/'+phpDllCopy, False); phpDllCopy := 'php7ts.dll'; filecopy (pathWithSlashes+'/bin/php/php'+phpVersion+'/'+phpDllCopy, pathWithSlashes+'/bin/apache/apache'+apacheVersion+'/bin/'+phpDllCopy, False); -// phpDllCopy := 'ssleay32.dll'; -// filecopy (pathWithSlashes+'/bin/php/php'+phpVersion+'/'+phpDllCopy, pathWithSlashes+'/bin/apache/apache'+apacheVersion+'/bin/'+phpDllCopy, False); -// phpDllCopy := 'yaz.dll'; -// filecopy (pathWithSlashes+'/bin/php/php'+phpVersion+'/'+phpDllCopy, pathWithSlashes+'/bin/apache/apache'+apacheVersion+'/bin/'+phpDllCopy, False); - // Remove lock file lockfile := pathWithSlashes+'/dolibarr_documents/install.lock'; @@ -525,6 +515,17 @@ begin then begin + //---------------------------------------------- + // check that we don't try an upgrade (mysql upgrade no supported) + //---------------------------------------------- + + if FileExists (pathWithSlashes+'/bin/mysql/mysql5.0.45'+phpVersion+'/bin/mysqld-nt.exe') then + begin + MsgBox('An existing installation using an old version of Mysql exists. Sorry, upgrade with this installer is not possible.', mbInformation, MB_OK); + Abort(); + end; + + //---------------------------------------------- // Rename file c:/windows/php.ini (we don't want it) //---------------------------------------------- @@ -736,8 +737,8 @@ begin // Create file my.ini (if not exists) //---------------------------------------------- - destFile := pathWithSlashes+'/bin/mysql/mysql'+mysqlVersion+'/my.ini'; - srcFile := pathWithSlashes+'/bin/mysql/mysql'+mysqlVersion+'/my.ini.install'; + destFile := pathWithSlashes+'/bin/mariadb/mariadb'+mysqlVersion+'/my.ini'; + srcFile := pathWithSlashes+'/bin/mariadb/mariadb'+mysqlVersion+'/my.ini.install'; if not FileExists (destFile) then begin @@ -823,6 +824,8 @@ begin StringChangeEx (srcContents, 'WAMPROOT', pathWithSlashes, True); StringChangeEx (srcContents, 'WAMPMYSQLVERSION', mysqlVersion, True); StringChangeEx (srcContents, 'WAMPAPACHEVERSION', apacheVersion, True); + StringChangeEx (srcContents, 'WAMPMYSQLPORT', myport, True); + StringChangeEx (srcContents, 'WAMPMYSQLNEWPASSWORD', mypass, True); SaveStringToFile(destFile,srcContents, False); end; @@ -965,9 +968,11 @@ begin - // Uninstall and Install services + // Uninstall services batFile := path+'\uninstall_services.bat'; Exec(batFile, '',path+'\', SW_HIDE, ewWaitUntilTerminated, myResult); + + // Install services batFile := path+'\install_services.bat'; Exec(batFile, '',path+'\', SW_HIDE, ewWaitUntilTerminated, myResult); @@ -1066,7 +1071,7 @@ Filename: "{app}\rundoliwamp.bat"; Description: {cm:LaunchNow}; Flags: shellexec [UninstallDelete] Type: files; Name: "{app}\*.*" -Type: files; Name: "{app}\bin\mysql\mysql5.0.45\*.*" +Type: files; Name: "{app}\bin\mariadb\mariadb10.4.10\*.*" Type: filesandordirs; Name: "{app}\alias" Type: filesandordirs; Name: "{app}\apps" Type: filesandordirs; Name: "{app}\bin\apache" diff --git a/build/exe/doliwamp/httpd.conf.install b/build/exe/doliwamp/httpd.conf.install index 40cc9a2f5c6..6a65e0833f9 100644 --- a/build/exe/doliwamp/httpd.conf.install +++ b/build/exe/doliwamp/httpd.conf.install @@ -1,55 +1,74 @@ # # This is the main Apache HTTP server configuration file. It contains the # configuration directives that give the server its instructions. -# See for detailed information. -# In particular, see -# +# See for detailed information. +# In particular, see +# # for a discussion of each configuration directive. # # Do NOT simply read the instructions in here without understanding # what they do. They're here only as hints or reminders. If you are unsure -# consult the online docs. You have been warned. +# consult the online docs. You have been warned. # # Configuration and logfile names: If the filenames you specify for many # of the server's control files begin with "/" (or "drive:/" for Win32), the # server will use that explicit path. If the filenames do *not* begin -# with "/", the value of ServerRoot is prepended -- so "logs/foo.log" -# with ServerRoot set to "C:/Program Files/Apache Software Foundation/Apache2.2" will be interpreted by the -# server as "C:/Program Files/Apache Software Foundation/Apache2.2/logs/foo.log". +# with "/", the value of ServerRoot is prepended -- so "logs/access_log" +# with ServerRoot set to "/usr/local/apache2" will be interpreted by the +# server as "/usr/local/apache2/logs/access_log", whereas "/logs/access_log" +# will be interpreted as '/logs/access_log'. # # NOTE: Where filenames are specified, you must use forward slashes # instead of backslashes (e.g., "c:/apache" instead of "c:\apache"). -# If a drive letter is omitted, the drive on which Apache.exe is located +# If a drive letter is omitted, the drive on which httpd.exe is located # will be used by default. It is recommended that you always supply -# an explicit drive letter in absolute paths, however, to avoid -# confusion. -# - -# ThreadsPerChild: constant number of worker threads in the server process -# MaxRequestsPerChild: maximum number of requests a server process serves -ThreadsPerChild 250 -MaxRequestsPerChild 0 +# an explicit drive letter in absolute paths to avoid confusion. +ServerSignature On +ServerTokens Full # # ServerRoot: The top of the directory tree under which the server's # configuration, error, and log files are kept. # # Do not add a slash at the end of the directory path. If you point -# ServerRoot at a non-local disk, be sure to point the LockFile directive -# at a local disk. If you wish to share the same ServerRoot for multiple -# httpd daemons, you will need to change at least LockFile and PidFile. +# ServerRoot at a non-local disk, be sure to specify a local disk on the +# Mutex directive, if file-based mutexes are used. If you wish to share the +# same ServerRoot for multiple httpd daemons, you will need to change at +# least PidFile. # +# Apache variable names used by Apache conf files: +# The names and contents of variables: +# APACHE24, VERSION_APACHE, INSTALL_DIR, APACHE_DIR, SRVROOT +# should never be changed. +Define APACHE24 Apache2.4 +Define VERSION_APACHE WAMPAPACHEVERSION +Define INSTALL_DIR WAMPROOT +Define APACHE_DIR ${INSTALL_DIR}/bin/apache/apache${VERSION_APACHE} +Define SRVROOT ${INSTALL_DIR}/bin/apache/apache${VERSION_APACHE} + ServerRoot "WAMPROOT/bin/apache/apacheWAMPAPACHEVERSION" +# +# Mutex: Allows you to set the mutex mechanism and mutex file directory +# for individual mutexes, or change the global defaults +# +# Uncomment and change the directory if mutexes are file-based and the default +# mutex file directory is not on a local disk or is not appropriate for some +# other reason. +# +# Mutex default:logs + # # Listen: Allows you to bind Apache to specific IP addresses and/or # ports, instead of the default. See also the # directive. # -# Change this to Listen on specific IP addresses as shown below to -# prevent Apache from glomming onto all bound IP addresses (0.0.0.0) +# Change this to Listen on specific IP addresses as shown below to +# prevent Apache from glomming onto all bound IP addresses. # #Listen 12.34.56.78:80 +#Listen 0.0.0.0:80 +#Listen [::0]:80 Listen WAMPAPACHEPORT # @@ -64,40 +83,72 @@ Listen WAMPAPACHEPORT # Example: # LoadModule foo_module modules/mod_foo.so # +LoadModule access_compat_module modules/mod_access_compat.so LoadModule actions_module modules/mod_actions.so LoadModule alias_module modules/mod_alias.so LoadModule allowmethods_module modules/mod_allowmethods.so LoadModule asis_module modules/mod_asis.so LoadModule auth_basic_module modules/mod_auth_basic.so -#LoadModule auth_digest_module modules/mod_auth_digest.so +LoadModule auth_digest_module modules/mod_auth_digest.so +#LoadModule auth_form_module modules/mod_auth_form.so #LoadModule authn_anon_module modules/mod_authn_anon.so +LoadModule authn_core_module modules/mod_authn_core.so +#LoadModule authn_dbd_module modules/mod_authn_dbd.so #LoadModule authn_dbm_module modules/mod_authn_dbm.so LoadModule authn_file_module modules/mod_authn_file.so +#LoadModule authn_socache_module modules/mod_authn_socache.so +#LoadModule authnz_fcgi_module modules/mod_authnz_fcgi.so +#LoadModule authnz_ldap_module modules/mod_authnz_ldap.so LoadModule authz_core_module modules/mod_authz_core.so +#LoadModule authz_dbd_module modules/mod_authz_dbd.so #LoadModule authz_dbm_module modules/mod_authz_dbm.so -#LoadModule authz_default_module modules/mod_authz_default.so LoadModule authz_groupfile_module modules/mod_authz_groupfile.so LoadModule authz_host_module modules/mod_authz_host.so +#LoadModule authz_owner_module modules/mod_authz_owner.so LoadModule authz_user_module modules/mod_authz_user.so LoadModule autoindex_module modules/mod_autoindex.so -LoadModule buffer_module modules/mod_buffer.so +#LoadModule brotli_module modules/mod_brotli.so +#LoadModule buffer_module modules/mod_buffer.so LoadModule cache_module modules/mod_cache.so LoadModule cache_disk_module modules/mod_cache_disk.so +#LoadModule cache_socache_module modules/mod_cache_socache.so #LoadModule cern_meta_module modules/mod_cern_meta.so LoadModule cgi_module modules/mod_cgi.so +#LoadModule charset_lite_module modules/mod_charset_lite.so +#LoadModule data_module modules/mod_data.so #LoadModule dav_module modules/mod_dav.so #LoadModule dav_fs_module modules/mod_dav_fs.so +#LoadModule dav_lock_module modules/mod_dav_lock.so +#LoadModule dbd_module modules/mod_dbd.so #LoadModule deflate_module modules/mod_deflate.so LoadModule dir_module modules/mod_dir.so +#LoadModule dumpio_module modules/mod_dumpio.so LoadModule env_module modules/mod_env.so -LoadModule expires_module modules/mod_expires.so -#LoadModule file_cache_module modules/mod_file_cache.so +#LoadModule expires_module modules/mod_expires.so +#LoadModule ext_filter_module modules/mod_ext_filter.so +LoadModule file_cache_module modules/mod_file_cache.so +#LoadModule filter_module modules/mod_filter.so +#LoadModule http2_module modules/mod_http2.so #LoadModule headers_module modules/mod_headers.so -LoadModule imagemap_module modules/mod_imagemap.so +#LoadModule heartbeat_module modules/mod_heartbeat.so +#LoadModule heartmonitor_module modules/mod_heartmonitor.so +#LoadModule ident_module modules/mod_ident.so +#LoadModule imagemap_module modules/mod_imagemap.so LoadModule include_module modules/mod_include.so #LoadModule info_module modules/mod_info.so LoadModule isapi_module modules/mod_isapi.so +#LoadModule lbmethod_bybusyness_module modules/mod_lbmethod_bybusyness.so +#LoadModule lbmethod_byrequests_module modules/mod_lbmethod_byrequests.so +#LoadModule lbmethod_bytraffic_module modules/mod_lbmethod_bytraffic.so +#LoadModule lbmethod_heartbeat_module modules/mod_lbmethod_heartbeat.so +#LoadModule ldap_module modules/mod_ldap.so +#LoadModule logio_module modules/mod_logio.so LoadModule log_config_module modules/mod_log_config.so +#LoadModule log_debug_module modules/mod_log_debug.so +#LoadModule log_forensic_module modules/mod_log_forensic.so +#LoadModule lua_module modules/mod_lua.so +#LoadModule macro_module modules/mod_macro.so +#LoadModule md_module modules/mod_md.so LoadModule mime_module modules/mod_mime.so #LoadModule mime_magic_module modules/mod_mime_magic.so LoadModule negotiation_module modules/mod_negotiation.so @@ -105,33 +156,63 @@ LoadModule negotiation_module modules/mod_negotiation.so #LoadModule proxy_ajp_module modules/mod_proxy_ajp.so #LoadModule proxy_balancer_module modules/mod_proxy_balancer.so #LoadModule proxy_connect_module modules/mod_proxy_connect.so -#LoadModule proxy_http_module modules/mod_proxy_http.so +#LoadModule proxy_express_module modules/mod_proxy_express.so +#LoadModule proxy_fcgi_module modules/mod_proxy_fcgi.so #LoadModule proxy_ftp_module modules/mod_proxy_ftp.so +#LoadModule proxy_hcheck_module modules/mod_proxy_hcheck.so +#LoadModule proxy_html_module modules/mod_proxy_html.so +#LoadModule proxy_http_module modules/mod_proxy_http.so +#LoadModule proxy_http2_module modules/mod_proxy_http2.so +#LoadModule proxy_scgi_module modules/mod_proxy_scgi.so +#LoadModule proxy_uwsgi_module modules/mod_proxy_uwsgi.so +#LoadModule proxy_wstunnel_module modules/mod_proxy_wstunnel.so +#LoadModule ratelimit_module modules/mod_ratelimit.so +#LoadModule reflector_module modules/mod_reflector.so +#LoadModule remoteip_module modules/mod_remoteip.so +#LoadModule request_module modules/mod_request.so +#LoadModule reqtimeout_module modules/mod_reqtimeout.so LoadModule rewrite_module modules/mod_rewrite.so +#LoadModule sed_module modules/mod_sed.so +#LoadModule session_module modules/mod_session.so +#LoadModule session_cookie_module modules/mod_session_cookie.so +#LoadModule session_crypto_module modules/mod_session_crypto.so +#LoadModule session_dbd_module modules/mod_session_dbd.so LoadModule setenvif_module modules/mod_setenvif.so +#LoadModule slotmem_plain_module modules/mod_slotmem_plain.so +#LoadModule slotmem_shm_module modules/mod_slotmem_shm.so +#LoadModule socache_dbm_module modules/mod_socache_dbm.so +#LoadModule socache_memcache_module modules/mod_socache_memcache.so +#LoadModule socache_redis_module modules/mod_socache_redis.so +#LoadModule socache_shmcb_module modules/mod_socache_shmcb.so #LoadModule speling_module modules/mod_speling.so #LoadModule ssl_module modules/mod_ssl.so -LoadModule status_module modules/mod_status.so +#LoadModule status_module modules/mod_status.so +#LoadModule substitute_module modules/mod_substitute.so #LoadModule unique_id_module modules/mod_unique_id.so LoadModule userdir_module modules/mod_userdir.so #LoadModule usertrack_module modules/mod_usertrack.so +#LoadModule version_module modules/mod_version.so LoadModule vhost_alias_module modules/mod_vhost_alias.so -LoadModule php5_module "WAMPROOT/bin/php/phpWAMPPHPVERSION/php5apache2_4.dll" +#LoadModule watchdog_module modules/mod_watchdog.so +#LoadModule xml2enc_module modules/mod_xml2enc.so +PHPIniDir "${APACHE_DIR}/bin" +#LoadModule WAMPAPACHELOADMODULE "${INSTALL_DIR}/bin/php/phpWAMPPHPVERSIONWEB/WAMPPHPAPACHEDLL" +LoadModule php7_module "WAMPROOT/bin/php/phpWAMPPHPVERSION/php7apache2_4.dll" + + # -# ExtendedStatus controls whether Apache will generate "full" status -# information (ExtendedStatus On) or just basic information (ExtendedStatus -# Off) when the "server-status" handler is called. The default is Off. +# If you wish httpd to run as a different user or group, you must run +# httpd as root initially and it will switch. # -ExtendedStatus On - - -SetHandler server-status -Require local -#Require ip 1.2.3.4 -#Require host 1.2.3.4 - +# User/Group: The name (or #number) of the user/group to run httpd as. +# It is usually good practice to create a dedicated user and group for +# running httpd, as with most system services. +# +User daemon +Group daemon + # 'Main' server configuration # @@ -162,59 +243,12 @@ ServerAdmin doliwamp@localhost ServerName localhost # -# ServerTokens -# This directive configures what you return as the Server HTTP response -# Header. The default is 'Full' which sends information about the OS-Type -# and compiled in modules. -# Set to one of: Full | OS | Minor | Minimal | Major | Prod -# where Full conveys the most information, and Prod the least. -# -#ServerTokens Prod - -# -# DocumentRoot: The directory out of which you will serve your -# documents. By default, all requests are taken from this directory, but -# symbolic links and aliases may be used to point to other locations. -# -DocumentRoot "WAMPROOT/www/" - - -# -# Timeout: The number of seconds before receives and sends time out. -# -Timeout 300 - -# -# KeepAlive: Whether or not to allow persistent connections (more than -# one request per connection). Set to "Off" to deactivate. -# -KeepAlive On - -# -# MaxKeepAliveRequests: The maximum number of requests to allow -# during a persistent connection. Set to 0 to allow an unlimited amount. -# We recommend you leave this number high, for maximum performance. -# -MaxKeepAliveRequests 500 - -# -# KeepAliveTimeout: Number of seconds to wait for the next request from the -# same client on the same connection. -# -KeepAliveTimeout 30 - - -# -# Each directory to which Apache has access can be configured with respect -# to which services and features are allowed and/or disabled in that -# directory (and its subdirectories). -# -# First, we configure the "default" to be a very restrictive set of -# features. +# Deny access to the entirety of your server's filesystem. You must +# explicitly permit access to web content directories in other +# blocks below. # - Options FollowSymLinks - AllowOverride None + AllowOverride none Require all denied @@ -224,12 +258,15 @@ KeepAliveTimeout 30 # you might expect, make sure that you have specifically enabled it # below. # +HostnameLookups Off # -# This should be changed to whatever you set DocumentRoot to. +# DocumentRoot: The directory out of which you will serve your +# documents. By default, all requests are taken from this directory, but +# symbolic links and aliases may be used to point to other locations. # - - +DocumentRoot "${INSTALL_DIR}/www" + # # Possible values for the Options directive are "None", "All", # or any combination of: @@ -239,30 +276,23 @@ KeepAliveTimeout 30 # doesn't give it to you. # # The Options directive is both complicated and important. Please see - # http://httpd.apache.org/docs/2.2/mod/core.html#options + # http://httpd.apache.org/docs/2.4/mod/core.html#options # for more information. # - Options Indexes FollowSymLinks + Options +Indexes +FollowSymLinks +Multiviews # # AllowOverride controls what directives may be placed in .htaccess files. # It can be "All", "None", or any combination of the keywords: - # Options FileInfo AuthConfig Limit + # AllowOverride FileInfo AuthConfig Limit # AllowOverride all # # Controls who can get stuff from this server. # -# onlineoffline tag - don't remove - - Require all granted - - - Require ip 127.0.0.1 - Require host localhost - - +# Don't modify this line - Instead modify Require of VirtualHost in httpd-vhost.conf + Require local # @@ -274,12 +304,12 @@ KeepAliveTimeout 30 # -# The following lines prevent .htaccess and .htpasswd files from being -# viewed by Web clients. +# The following lines prevent .htaccess and .htpasswd files from being +# viewed by Web clients. # - + Require all denied - + # # ErrorLog: The location of the error log file. @@ -288,7 +318,8 @@ KeepAliveTimeout 30 # logged here. If you *do* define an error logfile for a # container, that host's errors will be logged there and not here. # -ErrorLog "WAMPROOT/logs/apache_error.log" + +ErrorLog "${INSTALL_DIR}/logs/apache_error.log" # # LogLevel: Control the number of messages logged to the error_log. @@ -317,22 +348,22 @@ LogLevel warn # define per- access logfiles, transactions will be # logged therein and *not* in this file. # - CustomLog "WAMPROOT/logs/access.log" common + CustomLog "${INSTALL_DIR}/logs/access.log" common # # If you prefer a logfile with access, agent, and referer information # (Combined Logfile Format) you can use the following directive. # - #CustomLog logs/access.log combined + #CustomLog "logs/access.log" combined # - # Redirect: Allows you to tell clients about documents that used to - # exist in your server's namespace, but do not anymore. The client + # Redirect: Allows you to tell clients about documents that used to + # exist in your server's namespace, but do not anymore. The client # will make a new request for the document at its new location. # Example: - # Redirect permanent /foo http://localhost/bar + # Redirect permanent /foo http://www.example.com/bar # # Alias: Maps web paths into filesystem paths and is used to @@ -346,75 +377,43 @@ LogLevel warn # the filesystem path. # - # ScriptAlias: This controls which directories contain server scripts. + # ScriptAlias: This controls which directories contain server scripts. # ScriptAliases are essentially the same as Aliases, except that # documents in the target directory are treated as applications and # run by the server when requested rather than as documents sent to the # client. The same rules about trailing "/" apply to ScriptAlias # directives as to Alias. # - ScriptAlias /cgi-bin/ "cgi-bin/" + ScriptAlias /cgi-bin/ "${SRVROOT}/cgi-bin/" + + # + # ScriptSock: On threaded servers, designate the path to the UNIX + # socket used to communicate with the CGI daemon of mod_cgid. + # + #Scriptsock cgisock + + # -# "C:/Program Files/Apache Software Foundation/Apache2.2/cgi-bin" should be changed to whatever your ScriptAliased +# "${SRVROOT}/cgi-bin" should be changed to whatever your ScriptAliased # CGI directory exists, if you have that configured. # - + AllowOverride None Options None Require all granted -# -# Apache parses all CGI scripts for the shebang line by default. -# This comment line, the first line of the script, consists of the symbols -# pound (#) and exclamation (!) followed by the path of the program that -# can execute this specific script. For a perl script, with perl.exe in -# the C:\Program Files\Perl directory, the shebang line should be: - - #!c:/program files/perl/perl - -# Note you _must_not_ indent the actual shebang line, and it must be the -# first line of the file. Of course, CGI processing must be enabled by -# the appropriate ScriptAlias or Options ExecCGI directives for the files -# or directory in question. -# -# However, Apache on Windows allows either the Unix behavior above, or can -# use the Registry to match files by extention. The command to execute -# a file of this type is retrieved from the registry by the same method as -# the Windows Explorer would use to handle double-clicking on a file. -# These script actions can be configured from the Windows Explorer View menu, -# 'Folder Options', and reviewing the 'File Types' tab. Clicking the Edit -# button allows you to modify the Actions, of which Apache 1.3 attempts to -# perform the 'Open' Action, and failing that it will try the shebang line. -# This behavior is subject to change in Apache release 2.0. -# -# Each mechanism has it's own specific security weaknesses, from the means -# to run a program you didn't intend the website owner to invoke, and the -# best method is a matter of great debate. -# -# To enable the this Windows specific behavior (and therefore -disable- the -# equivilant Unix behavior), uncomment the following directive: -# -#ScriptInterpreterSource registry -# -# The directive above can be placed in individual blocks or the -# .htaccess file, with either the 'registry' (Windows behavior) or 'script' -# (Unix behavior) option, and will override this server default option. -# - -# -# DefaultType: the default MIME type the server will use for a document -# if it cannot otherwise determine one, such as from filename extensions. -# If your server contains mostly text or HTML documents, "text/plain" is -# a good value. If most of your content is binary, such as applications -# or images, you may want to use "application/octet-stream" instead to -# keep browsers from trying to display binary files as though they are -# text. -# -#DefaultType text/plain + + # + # Avoid passing HTTP_PROXY environment to CGI's on this or any proxied + # backend servers which have lingering "httpoxy" defects. + # 'Proxy' request header is undefined by the IETF, not listed by IANA + # + RequestHeader unset Proxy early + # @@ -432,8 +431,8 @@ LogLevel warn # AddEncoding allows you to have certain browsers uncompress # information on the fly. Note: Not all browsers support this. # - #AddEncoding x-compress .Z - #AddEncoding x-gzip .gz .tgz + AddEncoding x-compress .Z + AddEncoding x-gzip .gz .tgz # # If the AddEncoding directives above are commented-out, then you # probably should define those extensions to indicate media types: @@ -481,25 +480,40 @@ LogLevel warn #ErrorDocument 500 "The server made a boo boo." #ErrorDocument 404 /missing.html #ErrorDocument 404 "/cgi-bin/missing_handler.pl" -#ErrorDocument 402 http://localhost/subscription_info.html +#ErrorDocument 402 http://www.example.com/subscription_info.html # # -# EnableMMAP and EnableSendfile: On systems that support it, -# memory-mapping or the sendfile syscall is used to deliver +# MaxRanges: Maximum number of Ranges in a request before +# returning the entire resource, or one of the special +# values 'default', 'none' or 'unlimited'. +# Default setting is to accept 200 Ranges. +#MaxRanges unlimited + +# +# EnableMMAP and EnableSendfile: On systems that support it, +# memory-mapping or the sendfile syscall may be used to deliver # files. This usually improves server performance, but must -# be turned off when serving from networked-mounted +# be turned off when serving from networked-mounted # filesystems or if support for these functions is otherwise # broken on your system. +# Defaults: EnableMMAP On, EnableSendfile Off # -#EnableMMAP off -#EnableSendfile off +EnableMMAP off +EnableSendfile off + +# AcceptFilter: On Windows, none uses accept() rather than AcceptEx() and +# will not recycle sockets between connections. This is useful for network +# adapters with broken driver support, as well as some virtual network +# providers such as vpn drivers, or spam, virus or spyware filters. +AcceptFilter http none +AcceptFilter https none # Supplemental configuration # -# The configuration files in the conf/extra/ directory can be -# included to add extra features or to modify the default configuration of -# the server, or you may simply copy their contents here and change as +# The configuration files in the conf/extra/ directory can be +# included to add extra features or to modify the default configuration of +# the server, or you may simply copy their contents here and change as # necessary. # Server-pool management (MPM specific) @@ -532,17 +546,19 @@ Include conf/extra/httpd-autoindex.conf # Various default settings #Include conf/extra/httpd-default.conf - +# Configure mod_proxy_html to understand HTML4/XHTML1 + +Include conf/extra/proxy-html.conf + # Secure (SSL/TLS) connections +#Include conf/extra/httpd-ssl.conf # # Note: The following must must be present to support # starting without SSL on platforms with no /dev/random equivalent # but a statically compiled-in mod_ssl. # - - SSLRandomSeed startup builtin SSLRandomSeed connect builtin @@ -733,44 +749,8 @@ SSLCertificateKeyFile "WAMPROOT/myserver.key" # nokeepalive ssl-unclean-shutdown \ # downgrade-1.0 force-response-1.0 - + - - -# OPTIMIZE: To use gzip compression (for already compressed files). -# Note that constant MAIN_OPTIMIZE_SPEED must have a value with bit 0 set. -#AddType text/javascript .jgz -#AddEncoding gzip .jgz - -# OPTIMIZE: To use gzip compression (on the fly). -# Note that you must also enable the module mod_deflate. -# You can also set this with constant MAIN_OPTIMIZE_SPEED and bit 2 set. -#TODO - -# OPTIMIZE: To use cache on static pages (A259200 = 1 month, A7200 = 2 hours, A691600 = 8 days = recommanded for static resources). -# Note that you must also enable the module mod_expires. -#ExpiresActive On -#ExpiresByType image/x-icon A2592000 -#ExpiresByType image/gif A2592000 -#ExpiresByType image/png A2592000 -#ExpiresByType image/jpeg A2592000 -#ExpiresByType text/css A2592000 -#ExpiresByType text/javascript A2592000 -#ExpiresByType application/x-javascript A2592000 -#ExpiresByType application/javascript A2592000 - - -# To protect Dolibarr with HTTP Auth -# -# Options +Indexes -# AuthUserFile /var/www/.htpasswd -# AuthName "Zone authent basic Dolibarr" -# AuthType Basic -# require user test -# - - -# Declare alias for Dolibarr, PHPMyAdmin and other software -Include "WAMPROOT/alias/*.conf" +Include "${INSTALL_DIR}/alias/*.conf" \ No newline at end of file diff --git a/build/exe/doliwamp/install_services.bat.install b/build/exe/doliwamp/install_services.bat.install index 5ad43827f86..421d664d3de 100644 --- a/build/exe/doliwamp/install_services.bat.install +++ b/build/exe/doliwamp/install_services.bat.install @@ -11,14 +11,18 @@ REM NET STOP doliwampmysqld cd "WAMPROOT" REM Apache x.x -.\bin\apache\apacheWAMPAPACHEVERSION\bin\httpd.exe -k install -n doliwampapache +.\bin\apache\apacheWAMPAPACHEVERSION\bin\httpd.exe -k install -n doliwampapache >> doliwamp.log 2>>&1 REM reg add HKLM\SYSTEM\CurrentControlSet\Services\doliwampapache /V Start /t REG_DWORD /d 3 /f REM Mysql 5.0- -REM .\bin\mysql\mysqlWAMPMYSQLVERSION\bin\mysqld-nt.exe --install-manual doliwampmysqld -.\bin\mysql\mysqlWAMPMYSQLVERSION\bin\mysqld-nt.exe --install doliwampmysqld +REM .\bin\mysql\mysqlWAMPMYSQLVERSION\bin\mysqld.exe --install-manual doliwampmysqld +REM .\bin\mysql\mysqlWAMPMYSQLVERSION\bin\mysqld.exe --install doliwampmysqld REM Mysql 5.1+ REM .\bin\mysql\mysqlWAMPMYSQLVERSION\bin\mysqld.exe --install doliwampmysqld +REM Mariadb +REM The mysql_install_db allows to not provide files into mysql dir but does not return to prompt so install hangs +.\bin\mariadb\mariadbWAMPMYSQLVERSION\bin\mysql_install_db.exe --datadir=WAMPROOT/bin/mariadb/data --port=WAMPMYSQLPORT --password=WAMPMYSQLNEWPASSWORD >> doliwamp.log 2>>&1 +.\bin\mariadb\mariadbWAMPMYSQLVERSION\bin\mysqld.exe --install doliwampmysqld >> doliwamp.log 2>>&1 echo ---- End script >> doliwamp.log 2>>&1 diff --git a/build/exe/doliwamp/my.ini.install b/build/exe/doliwamp/my.ini.install index e1a9495e20b..4d2037d8e97 100644 --- a/build/exe/doliwamp/my.ini.install +++ b/build/exe/doliwamp/my.ini.install @@ -69,13 +69,13 @@ port=WAMPMYSQLPORT #Path to installation directory. All paths are usually resolved relative to this. -basedir=WAMPROOT/bin/mysql/mysqlWAMPMYSQLVERSION +basedir=WAMPROOT/bin/mariadb/mariadbWAMPMYSQLVERSION #log file log-error=WAMPROOT/logs/mysql.log #Path to the database root -datadir=WAMPROOT/bin/mysql/data +datadir=WAMPROOT/bin/mariadb/data # The default storage engine that will be used when create new tables when default-storage-engine=INNODB @@ -196,13 +196,13 @@ port=WAMPMYSQLPORT #Path to installation directory. All paths are usually resolved relative to this. -basedir=WAMPROOT/bin/mysql/mysqlWAMPMYSQLVERSION +basedir=WAMPROOT/bin/mariadb/mariadbWAMPMYSQLVERSION #log file log-error=WAMPROOT/logs/mysql.log #Path to the database root -datadir=WAMPROOT/bin/mysql/data +datadir=WAMPROOT/bin/mariadb/data # The default storage engine that will be used when create new tables when default-storage-engine=INNODB diff --git a/build/exe/doliwamp/mysql/columns_priv.MYD b/build/exe/doliwamp/mysql/columns_priv.MYD deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/build/exe/doliwamp/mysql/columns_priv.MYI b/build/exe/doliwamp/mysql/columns_priv.MYI deleted file mode 100644 index f1a20aacb4b..00000000000 Binary files a/build/exe/doliwamp/mysql/columns_priv.MYI and /dev/null differ diff --git a/build/exe/doliwamp/mysql/columns_priv.frm b/build/exe/doliwamp/mysql/columns_priv.frm deleted file mode 100644 index 6b12fc174c2..00000000000 Binary files a/build/exe/doliwamp/mysql/columns_priv.frm and /dev/null differ diff --git a/build/exe/doliwamp/mysql/db.MYD b/build/exe/doliwamp/mysql/db.MYD deleted file mode 100644 index 8d671b07393..00000000000 Binary files a/build/exe/doliwamp/mysql/db.MYD and /dev/null differ diff --git a/build/exe/doliwamp/mysql/db.MYI b/build/exe/doliwamp/mysql/db.MYI deleted file mode 100644 index d4a1de9c34d..00000000000 Binary files a/build/exe/doliwamp/mysql/db.MYI and /dev/null differ diff --git a/build/exe/doliwamp/mysql/db.frm b/build/exe/doliwamp/mysql/db.frm deleted file mode 100644 index a8cab8f1fcd..00000000000 Binary files a/build/exe/doliwamp/mysql/db.frm and /dev/null differ diff --git a/build/exe/doliwamp/mysql/func.MYD b/build/exe/doliwamp/mysql/func.MYD deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/build/exe/doliwamp/mysql/func.MYI b/build/exe/doliwamp/mysql/func.MYI deleted file mode 100644 index cbfe35c310e..00000000000 Binary files a/build/exe/doliwamp/mysql/func.MYI and /dev/null differ diff --git a/build/exe/doliwamp/mysql/func.frm b/build/exe/doliwamp/mysql/func.frm deleted file mode 100644 index d572065cbd8..00000000000 Binary files a/build/exe/doliwamp/mysql/func.frm and /dev/null differ diff --git a/build/exe/doliwamp/mysql/help_category.MYD b/build/exe/doliwamp/mysql/help_category.MYD deleted file mode 100644 index d3ffdd47d9a..00000000000 Binary files a/build/exe/doliwamp/mysql/help_category.MYD and /dev/null differ diff --git a/build/exe/doliwamp/mysql/help_category.MYI b/build/exe/doliwamp/mysql/help_category.MYI deleted file mode 100644 index 1827cfaa604..00000000000 Binary files a/build/exe/doliwamp/mysql/help_category.MYI and /dev/null differ diff --git a/build/exe/doliwamp/mysql/help_category.frm b/build/exe/doliwamp/mysql/help_category.frm deleted file mode 100644 index f97bae288e6..00000000000 Binary files a/build/exe/doliwamp/mysql/help_category.frm and /dev/null differ diff --git a/build/exe/doliwamp/mysql/help_keyword.MYD b/build/exe/doliwamp/mysql/help_keyword.MYD deleted file mode 100644 index ec02aeb4876..00000000000 Binary files a/build/exe/doliwamp/mysql/help_keyword.MYD and /dev/null differ diff --git a/build/exe/doliwamp/mysql/help_keyword.MYI b/build/exe/doliwamp/mysql/help_keyword.MYI deleted file mode 100644 index 8c5a7a6359b..00000000000 Binary files a/build/exe/doliwamp/mysql/help_keyword.MYI and /dev/null differ diff --git a/build/exe/doliwamp/mysql/help_keyword.frm b/build/exe/doliwamp/mysql/help_keyword.frm deleted file mode 100644 index 2fb3b009667..00000000000 Binary files a/build/exe/doliwamp/mysql/help_keyword.frm and /dev/null differ diff --git a/build/exe/doliwamp/mysql/help_relation.MYD b/build/exe/doliwamp/mysql/help_relation.MYD deleted file mode 100644 index 493c37c9c19..00000000000 Binary files a/build/exe/doliwamp/mysql/help_relation.MYD and /dev/null differ diff --git a/build/exe/doliwamp/mysql/help_relation.MYI b/build/exe/doliwamp/mysql/help_relation.MYI deleted file mode 100644 index ecb69cc0360..00000000000 Binary files a/build/exe/doliwamp/mysql/help_relation.MYI and /dev/null differ diff --git a/build/exe/doliwamp/mysql/help_relation.frm b/build/exe/doliwamp/mysql/help_relation.frm deleted file mode 100644 index 8ddfdddc71e..00000000000 Binary files a/build/exe/doliwamp/mysql/help_relation.frm and /dev/null differ diff --git a/build/exe/doliwamp/mysql/help_topic.MYD b/build/exe/doliwamp/mysql/help_topic.MYD deleted file mode 100644 index 3b660b25496..00000000000 Binary files a/build/exe/doliwamp/mysql/help_topic.MYD and /dev/null differ diff --git a/build/exe/doliwamp/mysql/help_topic.MYI b/build/exe/doliwamp/mysql/help_topic.MYI deleted file mode 100644 index 7a727366752..00000000000 Binary files a/build/exe/doliwamp/mysql/help_topic.MYI and /dev/null differ diff --git a/build/exe/doliwamp/mysql/help_topic.frm b/build/exe/doliwamp/mysql/help_topic.frm deleted file mode 100644 index a09a2c3b590..00000000000 Binary files a/build/exe/doliwamp/mysql/help_topic.frm and /dev/null differ diff --git a/build/exe/doliwamp/mysql/host.MYD b/build/exe/doliwamp/mysql/host.MYD deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/build/exe/doliwamp/mysql/host.MYI b/build/exe/doliwamp/mysql/host.MYI deleted file mode 100644 index f0cbeb6258c..00000000000 Binary files a/build/exe/doliwamp/mysql/host.MYI and /dev/null differ diff --git a/build/exe/doliwamp/mysql/host.frm b/build/exe/doliwamp/mysql/host.frm deleted file mode 100644 index dbafa8d2b90..00000000000 Binary files a/build/exe/doliwamp/mysql/host.frm and /dev/null differ diff --git a/build/exe/doliwamp/mysql/proc.MYD b/build/exe/doliwamp/mysql/proc.MYD deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/build/exe/doliwamp/mysql/proc.MYI b/build/exe/doliwamp/mysql/proc.MYI deleted file mode 100644 index a843a2efda1..00000000000 Binary files a/build/exe/doliwamp/mysql/proc.MYI and /dev/null differ diff --git a/build/exe/doliwamp/mysql/proc.frm b/build/exe/doliwamp/mysql/proc.frm deleted file mode 100644 index 32b9b0e2eda..00000000000 Binary files a/build/exe/doliwamp/mysql/proc.frm and /dev/null differ diff --git a/build/exe/doliwamp/mysql/procs_priv.MYD b/build/exe/doliwamp/mysql/procs_priv.MYD deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/build/exe/doliwamp/mysql/procs_priv.MYI b/build/exe/doliwamp/mysql/procs_priv.MYI deleted file mode 100644 index a7f955241e1..00000000000 Binary files a/build/exe/doliwamp/mysql/procs_priv.MYI and /dev/null differ diff --git a/build/exe/doliwamp/mysql/procs_priv.frm b/build/exe/doliwamp/mysql/procs_priv.frm deleted file mode 100644 index b2cd3f50ef2..00000000000 Binary files a/build/exe/doliwamp/mysql/procs_priv.frm and /dev/null differ diff --git a/build/exe/doliwamp/mysql/tables_priv.MYD b/build/exe/doliwamp/mysql/tables_priv.MYD deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/build/exe/doliwamp/mysql/tables_priv.MYI b/build/exe/doliwamp/mysql/tables_priv.MYI deleted file mode 100644 index 6a2409ff79a..00000000000 Binary files a/build/exe/doliwamp/mysql/tables_priv.MYI and /dev/null differ diff --git a/build/exe/doliwamp/mysql/tables_priv.frm b/build/exe/doliwamp/mysql/tables_priv.frm deleted file mode 100644 index 4afbd02da2d..00000000000 Binary files a/build/exe/doliwamp/mysql/tables_priv.frm and /dev/null differ diff --git a/build/exe/doliwamp/mysql/time_zone.MYD b/build/exe/doliwamp/mysql/time_zone.MYD deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/build/exe/doliwamp/mysql/time_zone.MYI b/build/exe/doliwamp/mysql/time_zone.MYI deleted file mode 100644 index 68053049224..00000000000 Binary files a/build/exe/doliwamp/mysql/time_zone.MYI and /dev/null differ diff --git a/build/exe/doliwamp/mysql/time_zone.frm b/build/exe/doliwamp/mysql/time_zone.frm deleted file mode 100644 index 8391df0107e..00000000000 Binary files a/build/exe/doliwamp/mysql/time_zone.frm and /dev/null differ diff --git a/build/exe/doliwamp/mysql/time_zone_leap_second.MYD b/build/exe/doliwamp/mysql/time_zone_leap_second.MYD deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/build/exe/doliwamp/mysql/time_zone_leap_second.MYI b/build/exe/doliwamp/mysql/time_zone_leap_second.MYI deleted file mode 100644 index e41863b0448..00000000000 Binary files a/build/exe/doliwamp/mysql/time_zone_leap_second.MYI and /dev/null differ diff --git a/build/exe/doliwamp/mysql/time_zone_leap_second.frm b/build/exe/doliwamp/mysql/time_zone_leap_second.frm deleted file mode 100644 index 90bb6cda6df..00000000000 Binary files a/build/exe/doliwamp/mysql/time_zone_leap_second.frm and /dev/null differ diff --git a/build/exe/doliwamp/mysql/time_zone_name.MYD b/build/exe/doliwamp/mysql/time_zone_name.MYD deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/build/exe/doliwamp/mysql/time_zone_name.MYI b/build/exe/doliwamp/mysql/time_zone_name.MYI deleted file mode 100644 index e13615ccdef..00000000000 Binary files a/build/exe/doliwamp/mysql/time_zone_name.MYI and /dev/null differ diff --git a/build/exe/doliwamp/mysql/time_zone_name.frm b/build/exe/doliwamp/mysql/time_zone_name.frm deleted file mode 100644 index a1515da6890..00000000000 Binary files a/build/exe/doliwamp/mysql/time_zone_name.frm and /dev/null differ diff --git a/build/exe/doliwamp/mysql/time_zone_transition.MYD b/build/exe/doliwamp/mysql/time_zone_transition.MYD deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/build/exe/doliwamp/mysql/time_zone_transition.MYI b/build/exe/doliwamp/mysql/time_zone_transition.MYI deleted file mode 100644 index f28e4cec8d2..00000000000 Binary files a/build/exe/doliwamp/mysql/time_zone_transition.MYI and /dev/null differ diff --git a/build/exe/doliwamp/mysql/time_zone_transition.frm b/build/exe/doliwamp/mysql/time_zone_transition.frm deleted file mode 100644 index 52e2d1da633..00000000000 Binary files a/build/exe/doliwamp/mysql/time_zone_transition.frm and /dev/null differ diff --git a/build/exe/doliwamp/mysql/time_zone_transition_type.MYD b/build/exe/doliwamp/mysql/time_zone_transition_type.MYD deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/build/exe/doliwamp/mysql/time_zone_transition_type.MYI b/build/exe/doliwamp/mysql/time_zone_transition_type.MYI deleted file mode 100644 index 2f7e0c7127d..00000000000 Binary files a/build/exe/doliwamp/mysql/time_zone_transition_type.MYI and /dev/null differ diff --git a/build/exe/doliwamp/mysql/time_zone_transition_type.frm b/build/exe/doliwamp/mysql/time_zone_transition_type.frm deleted file mode 100644 index cee25730d40..00000000000 Binary files a/build/exe/doliwamp/mysql/time_zone_transition_type.frm and /dev/null differ diff --git a/build/exe/doliwamp/mysql/user.MYD b/build/exe/doliwamp/mysql/user.MYD deleted file mode 100644 index 80ef951da55..00000000000 Binary files a/build/exe/doliwamp/mysql/user.MYD and /dev/null differ diff --git a/build/exe/doliwamp/mysql/user.MYI b/build/exe/doliwamp/mysql/user.MYI deleted file mode 100644 index 63b81f1efbf..00000000000 Binary files a/build/exe/doliwamp/mysql/user.MYI and /dev/null differ diff --git a/build/exe/doliwamp/mysql/user.frm b/build/exe/doliwamp/mysql/user.frm deleted file mode 100644 index ef5c451c7f3..00000000000 Binary files a/build/exe/doliwamp/mysql/user.frm and /dev/null differ diff --git a/build/exe/doliwamp/mysqlinitpassword.bat.install b/build/exe/doliwamp/mysqlinitpassword.bat.install index d90cee71b33..4b9e9ac4173 100644 --- a/build/exe/doliwamp/mysqlinitpassword.bat.install +++ b/build/exe/doliwamp/mysqlinitpassword.bat.install @@ -17,7 +17,7 @@ ping 1.1.1.1 -n 1 -w 5000 > nul echo ---- Execute mysqlinitpassword.bat to init mysql password >> doliwamp.log 2>>&1 echo For a first installation, if an error is shown here, rerun the script manually. >> doliwamp.log 2>>&1 echo For an update, you will get an "Access denied" error, ignore this error. >> doliwamp.log 2>>&1 -.\bin\mysql\mysqlWAMPMYSQLVERSION\bin\mysqladmin -v -w6 -P WAMPMYSQLPORT -u root password WAMPMYSQLNEWPASSWORD >> doliwamp.log 2>>&1 +.\bin\mariadb\mariadbWAMPMYSQLVERSION\bin\mysqladmin -v -w6 -P WAMPMYSQLPORT -u root password WAMPMYSQLNEWPASSWORD >> doliwamp.log 2>>&1 echo ---- End script >> doliwamp.log 2>>&1 diff --git a/build/exe/doliwamp/mysqltestinstall.bat.install b/build/exe/doliwamp/mysqltestinstall.bat.install index 56baaeacb4d..b718cf94ac8 100644 --- a/build/exe/doliwamp/mysqltestinstall.bat.install +++ b/build/exe/doliwamp/mysqltestinstall.bat.install @@ -6,7 +6,7 @@ REM To change password, run following SQL command: REM GRANT ALL ON *.* TO login@localhost IDENTIFIED BY "newpassword" echo ----------------------------------------------------------- -echo This programm wil test a login on Mysql installed +echo This programm will test a login on Mysql installed echo by DoliWamp. echo Version: WAMPMYSQLVERSION echo Port: WAMPMYSQLPORT @@ -19,6 +19,6 @@ SET SAVES= SET /P SAVES=Enter password to test: echo Try to connect to mysql with this password -.\bin\mysql\mysqlWAMPMYSQLVERSION\bin\mysql -P WAMPMYSQLPORT -u root -p%SAVES% +.\bin\mariadb\mariadbWAMPMYSQLVERSION\bin\mysql -P WAMPMYSQLPORT -u root -p%SAVES% pause diff --git a/build/exe/doliwamp/php.ini.install b/build/exe/doliwamp/php.ini.install index af8ef607112..a2576c7652d 100644 --- a/build/exe/doliwamp/php.ini.install +++ b/build/exe/doliwamp/php.ini.install @@ -644,53 +644,36 @@ default_socket_timeout = 60 ; If an extension does not load, run "deplister.exe php_xxx.dll" to get list of dependency dll missing. -extension=php_bz2.dll -extension=php_curl.dll -;extension=php_dba.dll -;extension=php_dbase.dll -;extension=php_exif.dll -;extension=php_fdf.dll -extension=php_gd2.dll -;extension=php_gettext.dll -;extension=php_gmp.dll -;extension=php_ifx.dll -;extension=php_imap.dll -;extension=php_interbase.dll -extension=php_intl.dll -extension=php_ldap.dll -extension=php_mbstring.dll -;extension=php_mcrypt.dll -;extension=php_mhash.dll -;extension=php_mime_magic.dll -;extension=php_ming.dll -;extension=php_msql.dll -;extension=php_mssql.dll -extension=php_mysql.dll -extension=php_mysqli.dll -;extension=php_oci8.dll -extension=php_openssl.dll -;extension=php_pdo.dll ; for php 5.2.11 -;extension=php_pdo_firebird.dll -;extension=php_pdo_mssql.dll -extension=php_pdo_mysql.dll -;extension=php_pdo_oci.dll -;extension=php_pdo_oci8.dll -;extension=php_pdo_odbc.dll -;extension=php_pdo_pgsql.dll -extension=php_pdo_sqlite.dll -;extension=php_pgsql.dll -;extension=php_pspell.dll -;extension=php_shmop.dll -;extension=php_snmp.dll -extension=php_soap.dll -extension=php_sockets.dll -;extension=php_sqlite.dll -;extension=php_sybase_ct.dll -;extension=php_tidy.dll -;extension=php_xmlrpc.dll -;extension=php_xsl.dll -;extension=php_zip.dll -;extension=php_xdebug-2.0.5-5.2.dll +extension=bz2 +extension=curl +;extension=dba +;extension=com_dotnet +;extension=enchant +;extension=fileinfo +;extension=ftp +extension=gd2 +;extension=gettext +;extension=gmp +extension=intl +extension=imap +;extension=interbase +extension=ldap +extension=mbstring +extension=exif ; Must be after mbstring as it depends on it +extension=mysqli +;extension=odbc +extension=openssl +;extension=pdo_firebird +extension=pdo_mysql +;extension=pdo_oci +;extension=pdo_odbc +;extension=pdo_pgsql +;extension=pdo_sqlite +;extension=pgsql +;extension=phpdbg_webhelper +;extension=shmop +extension=soap +extension=sockets ;;;;;;;;;;;;;;;;;;; diff --git a/build/exe/doliwamp/startdoliwamp_manual_donotuse.bat.install b/build/exe/doliwamp/startdoliwamp_manual_donotuse.bat.install index c8e33e4620b..675cfd4750e 100644 --- a/build/exe/doliwamp/startdoliwamp_manual_donotuse.bat.install +++ b/build/exe/doliwamp/startdoliwamp_manual_donotuse.bat.install @@ -12,7 +12,8 @@ start WAMPROOT\bin\apache\apacheWAMPAPACHEVERSION\bin\httpd.exe -f conf\httpd.co echo echo Running Mysql as user process (this process does not return so we use "start") -start WAMPROOT\bin\mysql\mysqlWAMPMYSQLVERSION\bin\mysqld-nt.exe --defaults-file=WAMPROOT\bin\mysql\mysqlWAMPMYSQLVERSION\my.ini --console +REM start WAMPROOT\bin\mysql\mysqlWAMPMYSQLVERSION\bin\mysqld-nt.exe --defaults-file=WAMPROOT\bin\mysql\mysqlWAMPMYSQLVERSION\my.ini --console REM start WAMPROOT\bin\mysql\mysqlWAMPMYSQLVERSION\bin\mysqld.exe --defaults-file=WAMPROOT\bin\mysql\mysqlWAMPMYSQLVERSION\my.ini --console +start WAMPROOT\bin\mariadb\mariadbWAMPMYSQLVERSION\bin\mysqld.exe --defaults-file=WAMPROOT\bin\mariadb\mariadbWAMPMYSQLVERSION\my.ini --console pause \ No newline at end of file diff --git a/build/exe/doliwamp/uninstall_services.bat.install b/build/exe/doliwamp/uninstall_services.bat.install index 0f12a29b6e2..a7329ab1b8f 100644 --- a/build/exe/doliwamp/uninstall_services.bat.install +++ b/build/exe/doliwamp/uninstall_services.bat.install @@ -11,9 +11,11 @@ NET STOP doliwampapache NET STOP doliwampmysqld REM Mysql 5.0- -.\bin\mysql\mysqlWAMPMYSQLVERSION\bin\mysqld-nt.exe --remove doliwampmysqld +REM .\bin\mysql\mysqlWAMPMYSQLVERSION\bin\mysqld-nt.exe --remove doliwampmysqld REM Mysql 5.1+ REM .\bin\mysql\mysqlWAMPMYSQLVERSION\bin\mysqld.exe --remove doliwampmysqld +REM Maraiadb +.\bin\mariadb\mariadbWAMPMYSQLVERSION\bin\mysqld.exe --remove doliwampmysqld REM wampmanager.exe -quit -id={doliwampserver} echo ---- End script >> doliwamp.log 2>>&1 diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl index c6b8cd330c8..c06dc51aec1 100755 --- a/build/makepack-dolibarr.pl +++ b/build/makepack-dolibarr.pl @@ -1067,7 +1067,7 @@ if ($nboftargetok) { print "Remove target $NEWDESTI/$FILENAMEEXEDOLIWAMP.exe...\n"; unlink "$NEWDESTI/$FILENAMEEXEDOLIWAMP.exe"; - print "Check that in your Wine setup, you create a Z: drive that point to your / directory.\n"; + print "Check that in your Wine setup, you have created a Z: drive that point to your / directory.\n"; $SOURCEBACK=$SOURCE; $SOURCEBACK =~ s/\//\\/g;