From d87dd7d33f0372efdb2c81938d6054d76c3ff6a0 Mon Sep 17 00:00:00 2001 From: Laurent Giovannoni <laurent.giovannoni@maarch.org> Date: Tue, 27 Oct 2015 10:43:03 +0000 Subject: [PATCH] FEAT #0 default config --- .../trunk/batch/config/config.xml.default | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/notifications/trunk/batch/config/config.xml.default b/notifications/trunk/batch/config/config.xml.default index 01d33038835..917316950b6 100755 --- a/notifications/trunk/batch/config/config.xml.default +++ b/notifications/trunk/batch/config/config.xml.default @@ -1,15 +1,13 @@ <?xml version="1.0" encoding="utf-8"?> <ROOT> - <!-- le nom du fichier doit etre config.xml ou config_{custom_id}.xml --> - <CONFIG> <Lang>fr</Lang> <!-- fr, en--> - <MaarchDirectory>C:\xampp\htdocs\maarch_entreprise\</MaarchDirectory> + <MaarchDirectory>/var/www/html/maarch/</MaarchDirectory> <customID></customID> - <MaarchUrl>http://localhost/maarch_entreprise/</MaarchUrl> + <MaarchUrl>http://localhost/maarch/</MaarchUrl> <MaarchApps>maarch_entreprise</MaarchApps> - <TmpDirectory>C:\xampp\htdocs\maarch_entreprise\modules\notifications\batch\tmp\</TmpDirectory> + <TmpDirectory>/var/www/html/maarch/modules/notifications/batch/tmp/</TmpDirectory> <debugmode> <dontflag_mail>true</dontflag_mail> <verbose_mode>false</verbose_mode> @@ -30,12 +28,12 @@ <databaseserver>127.0.0.1</databaseserver> <databaseserverport>5432</databaseserverport> <databasetype>POSTGRESQL</databasetype> - <databasename>maarch_entreprise</databasename> + <databasename>maarch</databasename> <databaseuser>postgres</databaseuser> <databasepassword>maarch</databasepassword> </CONFIG_BASE> <MAILER> - <path_to_mailer>\apps\maarch_entreprise\tools\mails\htmlMimeMail.php</path_to_mailer> + <path_to_mailer>/apps/maarch_entreprise/tools/mails/htmlMimeMail.php</path_to_mailer> <path_to_phpmailer>PHPMailer_v5.1</path_to_phpmailer> <type>smtp</type><!-- mail (default), smtp, sendmail, qmail --> <smtp_host>smtp.yourdomain.com</smtp_host><!-- smtp1.example.com:25;smtp2.example.com --> @@ -50,9 +48,9 @@ <mailfrom>notifications@maarch.fr</mailfrom> </MAILER> <LOG4PHP> - <enabled>false</enabled> + <enabled>true</enabled> <Log4PhpLogger>loggerTechnique</Log4PhpLogger> - <Log4PhpBusinessCode>MaarchEntrepriseDemo</Log4PhpBusinessCode> - <Log4PhpConfigPath>/var/www/maarch_entreprise/apps/maarch_entreprise/xml/log4php.xml</Log4PhpConfigPath> + <Log4PhpBusinessCode>notifications</Log4PhpBusinessCode> + <Log4PhpConfigPath>/var/www/html/maarch/apps/maarch_entreprise/xml/log4php.xml</Log4PhpConfigPath> </LOG4PHP> </ROOT> -- GitLab