From 320026ebf617d606fb821ff86cf01864343cd27e Mon Sep 17 00:00:00 2001
From: Alex ORLUC <alex.orluc@maarch.org>
Date: Fri, 26 May 2017 18:05:32 +0200
Subject: [PATCH] 5595 update xml default path
---
apps/maarch_entreprise/xml/config.xml.default | 4 +--
.../xml/control_params.xml.default | 2 +-
.../maarch_entreprise/xml/log4php.default.xml | 33 -------------------
core/class/class_history.php | 2 +-
core/services/LogsAbstract.php | 2 +-
install/class/Class_Install.php | 2 +-
modules/avis/xml/config.xml.default | 6 ++--
modules/full_text/scripts/launch_fulltext.sh | 6 ++--
.../scripts/launch_fulltext_attachments.sh | 6 ++--
.../scripts/launch_fulltext_business.bat | 2 --
.../scripts/launch_fulltext_cold.bat | 2 --
.../scripts/launch_fulltext_letterbox.bat | 4 ---
.../launch_fulltext_version_attachments.sh | 6 ++--
.../xml/config_batch_attachments.xml.default | 10 +++---
.../xml/config_batch_letterbox.xml.default | 10 +++---
...nfig_batch_version_attachments.xml.default | 10 +++---
.../batch/scripts/01-OAIS_CACHED.sh.default | 4 +--
.../batch/scripts/02-OAIS.sh.default | 4 +--
.../parallel/01-OAIS_CACHED_0.sh.default | 4 +--
.../parallel/01-OAIS_CACHED_1.sh.default | 4 +--
.../parallel/01-OAIS_CACHED_2.sh.default | 4 +--
.../parallel/01-OAIS_CACHED_3.sh.default | 4 +--
.../parallel/01-OAIS_CACHED_4.sh.default | 4 +--
.../batch/scripts/parallel/param_cron.txt | 14 ++++----
.../life_cycle/batch/scripts/param_cron.txt | 6 ++--
.../batch/scripts/purge_logs_tmp.sh.default | 2 +-
.../batch/scripts/stat_batch.bat.default | 5 ---
.../batch/scripts/stat_batch.sh.default | 4 +--
.../batch/config/config.xml.default | 10 +++---
.../batch/scripts/nct-ncc-and-anc.bat | 6 ----
.../batch/scripts/nct-ncc-and-anc.sh | 14 ++++----
.../notifications/batch/scripts/ret1-ret2.bat | 4 ---
.../notifications/batch/scripts/ret1-ret2.sh | 12 +++----
.../notifications/batch/scripts/sendmail.bat | 3 --
.../notifications/batch/scripts/sendmail.sh | 6 ++--
.../batch/scripts/stack_letterbox_alerts.bat | 2 --
.../sendmail/batch/config/config.xml.default | 10 +++---
modules/sendmail/batch/scripts/sendmail.bat | 1 -
modules/sendmail/batch/scripts/sendmail.sh | 6 ++--
.../xml/config_batch_attachments.xml.default | 6 ++--
.../xml/config_batch_letterbox.xml.default | 6 ++--
modules/visa/xml/config.xml | 2 +-
42 files changed, 96 insertions(+), 158 deletions(-)
delete mode 100755 apps/maarch_entreprise/xml/log4php.default.xml
delete mode 100644 modules/full_text/scripts/launch_fulltext_business.bat
delete mode 100644 modules/full_text/scripts/launch_fulltext_cold.bat
delete mode 100644 modules/full_text/scripts/launch_fulltext_letterbox.bat
delete mode 100644 modules/life_cycle/batch/scripts/stat_batch.bat.default
delete mode 100644 modules/notifications/batch/scripts/nct-ncc-and-anc.bat
delete mode 100644 modules/notifications/batch/scripts/ret1-ret2.bat
delete mode 100644 modules/notifications/batch/scripts/sendmail.bat
delete mode 100644 modules/notifications/batch/scripts/stack_letterbox_alerts.bat
delete mode 100644 modules/sendmail/batch/scripts/sendmail.bat
diff --git a/apps/maarch_entreprise/xml/config.xml.default b/apps/maarch_entreprise/xml/config.xml.default
index 82f117a2297..b46a29bbb71 100644
--- a/apps/maarch_entreprise/xml/config.xml.default
+++ b/apps/maarch_entreprise/xml/config.xml.default
@@ -4,8 +4,8 @@
<databaseserver>127.0.0.1</databaseserver>
<databaseserverport>5432</databaseserverport>
<databasetype>POSTGRESQL</databasetype>
- <databasename>maarch_entreprise</databasename>
- <databaseuser>postgres</databaseuser>
+ <databasename>maarchcourrier</databasename>
+ <databaseuser>maarch</databaseuser>
<databasepassword>maarch</databasepassword>
<databasesearchlimit>500</databasesearchlimit>
<nblinetoshow>10</nblinetoshow>
diff --git a/apps/maarch_entreprise/xml/control_params.xml.default b/apps/maarch_entreprise/xml/control_params.xml.default
index c07aca0fa6a..5a22d56cc21 100755
--- a/apps/maarch_entreprise/xml/control_params.xml.default
+++ b/apps/maarch_entreprise/xml/control_params.xml.default
@@ -3,7 +3,7 @@
<MaarchCapture>
<testIt>false</testIt>
<specific>
- <pathToMaarchCapture>/produit/maarch/maarch_scripts/maarch_capture/</pathToMaarchCapture>
+ <pathToMaarchCapture>/opt/maarch/maarch_capture/</pathToMaarchCapture>
</specific>
</MaarchCapture>
<notifications_sendmail>
diff --git a/apps/maarch_entreprise/xml/log4php.default.xml b/apps/maarch_entreprise/xml/log4php.default.xml
deleted file mode 100755
index 772a18d34eb..00000000000
--- a/apps/maarch_entreprise/xml/log4php.default.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<log4php:configuration xmlns:log4php="http://logging.apache.org/log4php/"
- threshold="all" debug="false">
- <appender name="appenderFonctionnel" class="LoggerAppenderRollingFile">
- <layout class="LoggerLayoutTTCC" />
- <param name="file" value="./fonctionnel.log" />
- <param name="maxFileSize" value="10MB" />
- <param name="maxBackupIndex" value="10" />
- <layout class="LoggerLayoutPattern">
- <param name="ConversionPattern" value="[%d{d/m/Y H:i:s}] %-5p [%t] %m%n" />
- </layout>
- </appender>
- <appender name="appenderTechnique" class="LoggerAppenderRollingFile">
- <layout class="LoggerLayoutTTCC" />
- <param name="file" value="./technique.log" />
- <param name="maxFileSize" value="10MB" />
- <param name="maxBackupIndex" value="10" />
- <layout class="LoggerLayoutPattern">
- <param name="ConversionPattern" value="[%d{d/m/Y H:i:s}] %-5p [%t] %m%n" />
- </layout>
- </appender>
- <root>
- <level value="ERROR" />
- <appender_ref ref="fonctionnel,technique" />
- </root>
- <logger name="loggerFonctionnel" additivity="true">
- <level value="ERROR" />
- <appender_ref ref="appenderFonctionnel" />
- </logger>
- <logger name="loggerTechnique" additivity="true">
- <level value="ERROR" />
- <appender_ref ref="appenderTechnique" />
- </logger>
-</log4php:configuration>
diff --git a/core/class/class_history.php b/core/class/class_history.php
index 6c3cc6ec28b..95d7b88a86b 100644
--- a/core/class/class_history.php
+++ b/core/class/class_history.php
@@ -439,7 +439,7 @@ class history
$configFileLog4PHP = "apps"
. DIRECTORY_SEPARATOR . $_SESSION['config']['app_id']
. DIRECTORY_SEPARATOR . "xml"
- . DIRECTORY_SEPARATOR . "log4php.default.xml";
+ . DIRECTORY_SEPARATOR . "log4php.xml.default";
}
Logger::configure(
diff --git a/core/services/LogsAbstract.php b/core/services/LogsAbstract.php
index 1468c7de5e0..36298874b39 100644
--- a/core/services/LogsAbstract.php
+++ b/core/services/LogsAbstract.php
@@ -163,7 +163,7 @@ class Core_LogsAbstract_Service extends Core_Abstract_Service {
return 'apps'
. DIRECTORY_SEPARATOR . $_SESSION['config']['app_id']
. DIRECTORY_SEPARATOR . 'xml'
- . DIRECTORY_SEPARATOR . 'log4php.default.xml';
+ . DIRECTORY_SEPARATOR . 'log4php.xml.default';
}
protected static function format_message(array &$aArgs) {
diff --git a/install/class/Class_Install.php b/install/class/Class_Install.php
index a5ee3268779..7db2891fd84 100755
--- a/install/class/Class_Install.php
+++ b/install/class/Class_Install.php
@@ -1167,7 +1167,7 @@ class Install extends functions
}
private function setLog4php(){
- $xmlconfig = simplexml_load_file('apps/maarch_entreprise/xml/log4php.default.xml');
+ $xmlconfig = simplexml_load_file('apps/maarch_entreprise/xml/log4php.xml.default');
$LOG4PHP = $xmlconfig->log4php;
$appender = $xmlconfig->appender;
$param = $appender->param;
diff --git a/modules/avis/xml/config.xml.default b/modules/avis/xml/config.xml.default
index c51c63be4de..5043186f0bc 100755
--- a/modules/avis/xml/config.xml.default
+++ b/modules/avis/xml/config.xml.default
@@ -1,15 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<CONFIG>
- <name>visa</name>
- <comment>_VISA_WORKFLOW_COMMENT</comment>
+ <name>avis</name>
+ <comment>_AVIS_WORKFLOW_COMMENT</comment>
<loaded>true</loaded>
<routing_template>modules/visa/Bordereau_visa_modele.pdf</routing_template>
<exeSign>C:\Program Files (x86)\Maarch\DIS\DISPDFSigner.exe</exeSign>
<showAppletSign>false</showAppletSign>
<reason>Signé et approuvé par </reason>
- <location>Miviludes, Services du Premier Ministre</location>
+ <location>Maarch-les-Bains, Ville de Maarch</location>
<licence_number>40dd49384bf59e98d10d</licence_number>
diff --git a/modules/full_text/scripts/launch_fulltext.sh b/modules/full_text/scripts/launch_fulltext.sh
index fe620d3e39c..e827d1deb3c 100644
--- a/modules/full_text/scripts/launch_fulltext.sh
+++ b/modules/full_text/scripts/launch_fulltext.sh
@@ -1,4 +1,4 @@
#!/bin/bash
-file='/var/www/html/maarch/modules/full_text/lucene_full_text_engine.php'
-cd /var/www/html/maarch/modules/full_text/
-php $file /var/www/html/maarch/modules/full_text/xml/config_batch_letterbox.xml
+file='/var/www/MaarchCourrier/modules/full_text/lucene_full_text_engine.php'
+cd /var/www/MaarchCourrier/modules/full_text/
+php $file /var/www/MaarchCourrier/modules/full_text/xml/config_batch_letterbox.xml
diff --git a/modules/full_text/scripts/launch_fulltext_attachments.sh b/modules/full_text/scripts/launch_fulltext_attachments.sh
index fff78f31552..c7b55e176cd 100644
--- a/modules/full_text/scripts/launch_fulltext_attachments.sh
+++ b/modules/full_text/scripts/launch_fulltext_attachments.sh
@@ -1,4 +1,4 @@
#!/bin/bash
-file='/var/www/html/maarch/modules/full_text/lucene_full_text_engine.php'
-cd /var/www/html/maarch/modules/full_text/
-php $file /var/www/html/maarch/modules/full_text/xml/config_batch_attachments.xml
\ No newline at end of file
+file='/var/www/MaarchCourrier/modules/full_text/lucene_full_text_engine.php'
+cd /var/www/MaarchCourrier/modules/full_text/
+php $file /var/www/MaarchCourrier/modules/full_text/xml/config_batch_attachments.xml
\ No newline at end of file
diff --git a/modules/full_text/scripts/launch_fulltext_business.bat b/modules/full_text/scripts/launch_fulltext_business.bat
deleted file mode 100644
index fb71e28728c..00000000000
--- a/modules/full_text/scripts/launch_fulltext_business.bat
+++ /dev/null
@@ -1,2 +0,0 @@
-"C:\xampp\php\php.exe" C:\xampp\htdocs\maarch_entreprise\modules\full_text\lucene_full_text_engine.php C:\xampp\htdocs\maarch_entreprise\modules\full_text\xml\config_batch_business.xml
-c:
diff --git a/modules/full_text/scripts/launch_fulltext_cold.bat b/modules/full_text/scripts/launch_fulltext_cold.bat
deleted file mode 100644
index 4c0a3dd0238..00000000000
--- a/modules/full_text/scripts/launch_fulltext_cold.bat
+++ /dev/null
@@ -1,2 +0,0 @@
-"C:\xampp\php\php.exe" C:\xampp\htdocs\maarch_entreprise\modules\full_text\lucene_full_text_engine.php C:\xampp\htdocs\maarch_entreprise\modules\full_text\xml\config_batch_cold.xml
-c:
diff --git a/modules/full_text/scripts/launch_fulltext_letterbox.bat b/modules/full_text/scripts/launch_fulltext_letterbox.bat
deleted file mode 100644
index c0b62c3f18d..00000000000
--- a/modules/full_text/scripts/launch_fulltext_letterbox.bat
+++ /dev/null
@@ -1,4 +0,0 @@
-cd C:\xampp\htdocs\maarch_entreprise\modules\full_text\
-"C:\xampp\php\php.exe" C:\xampp\htdocs\maarch_entreprise\modules\full_text\lucene_full_text_engine.php C:\xampp\htdocs\maarch_entreprise\modules\full_text\xml\config_batch_letterbox.xml
-c:
-pause
\ No newline at end of file
diff --git a/modules/full_text/scripts/launch_fulltext_version_attachments.sh b/modules/full_text/scripts/launch_fulltext_version_attachments.sh
index 1c19656b319..ef96cfd7b78 100644
--- a/modules/full_text/scripts/launch_fulltext_version_attachments.sh
+++ b/modules/full_text/scripts/launch_fulltext_version_attachments.sh
@@ -1,4 +1,4 @@
#!/bin/bash
-file='/var/www/html/maarch/modules/full_text/lucene_full_text_engine.php'
-cd /var/www/html/maarch/modules/full_text/
-php $file /var/www/html/maarch/modules/full_text/xml/config_batch_version_attachments.xml
\ No newline at end of file
+file='/var/www/MaarchCourrier/modules/full_text/lucene_full_text_engine.php'
+cd /var/www/MaarchCourrier/modules/full_text/
+php $file /var/www/MaarchCourrier/modules/full_text/xml/config_batch_version_attachments.xml
\ No newline at end of file
diff --git a/modules/full_text/xml/config_batch_attachments.xml.default b/modules/full_text/xml/config_batch_attachments.xml.default
index b7d133c6807..44c36089425 100644
--- a/modules/full_text/xml/config_batch_attachments.xml.default
+++ b/modules/full_text/xml/config_batch_attachments.xml.default
@@ -2,18 +2,18 @@
<ROOT>
<CONFIG>
<CONFIG_NAME>attachments</CONFIG_NAME> <!-- usefull for multi customs -->
- <MAARCH_DIRECTORY>/var/www/html/maarch/</MAARCH_DIRECTORY> <!-- Path to full text module -->
- <INDEX_FILE_DIRECTORY>/opt/maarch/docservers/indexes/attachments_coll/</INDEX_FILE_DIRECTORY> <!-- Path to the indexes dir of the collection -->
+ <MAARCH_DIRECTORY>/var/www/MaarchCourrier/</MAARCH_DIRECTORY> <!-- Path to full text module -->
+ <INDEX_FILE_DIRECTORY>/home/maarch/docservers/maarchcourrier/indexes/attachments_coll/</INDEX_FILE_DIRECTORY> <!-- Path to the indexes dir of the collection -->
<TABLE_NAME>res_attachments</TABLE_NAME>
<FULLTEXT_COLUMN_NAME>fulltext_result</FULLTEXT_COLUMN_NAME> <!-- Null or 0 = to do, 1 = OK, else KO -->
- <MAARCH_TOOLS_PATH>/var/www/html/maarch/apps/maarch_entreprise/tools/</MAARCH_TOOLS_PATH>
+ <MAARCH_TOOLS_PATH>/var/www/MaarchCourrier/apps/maarch_entreprise/tools/</MAARCH_TOOLS_PATH>
<MAX_BATCH_SIZE>500</MAX_BATCH_SIZE>
</CONFIG>
<CONFIG_BASE>
<databaseserver>127.0.0.1</databaseserver>
<databaseserverport>5432</databaseserverport>
<databasetype>POSTGRESQL</databasetype>
- <databasename>maarch</databasename>
+ <databasename>maarchcourrier</databasename>
<databaseuser>maarch</databaseuser>
<databasepassword>maarch</databasepassword>
</CONFIG_BASE>
@@ -21,6 +21,6 @@
<enabled>true</enabled>
<Log4PhpLogger>loggerTechnique</Log4PhpLogger>
<Log4PhpBusinessCode>full_text</Log4PhpBusinessCode>
- <Log4PhpConfigPath>/var/www/html/maarch/apps/maarch_entreprise/xml/log4php.xml</Log4PhpConfigPath>
+ <Log4PhpConfigPath>/var/www/MaarchCourrier/apps/maarch_entreprise/xml/log4php.xml</Log4PhpConfigPath>
</LOG4PHP>
</ROOT>
diff --git a/modules/full_text/xml/config_batch_letterbox.xml.default b/modules/full_text/xml/config_batch_letterbox.xml.default
index d69668e30b9..ae70cae9b62 100644
--- a/modules/full_text/xml/config_batch_letterbox.xml.default
+++ b/modules/full_text/xml/config_batch_letterbox.xml.default
@@ -2,18 +2,18 @@
<ROOT>
<CONFIG>
<CONFIG_NAME>letterbox</CONFIG_NAME> <!-- usefull for multi customs -->
- <MAARCH_DIRECTORY>/var/www/html/maarch/</MAARCH_DIRECTORY> <!-- Path to full text module -->
- <INDEX_FILE_DIRECTORY>/opt/maarch/docservers/indexes/letterbox_coll/</INDEX_FILE_DIRECTORY> <!-- Path to the indexes dir of the collection -->
+ <MAARCH_DIRECTORY>/var/www/MaarchCourrier/</MAARCH_DIRECTORY> <!-- Path to full text module -->
+ <INDEX_FILE_DIRECTORY>/home/maarch/docservers/maarchcourrier/indexes/letterbox_coll/</INDEX_FILE_DIRECTORY> <!-- Path to the indexes dir of the collection -->
<TABLE_NAME>res_letterbox</TABLE_NAME>
<FULLTEXT_COLUMN_NAME>fulltext_result</FULLTEXT_COLUMN_NAME> <!-- Null or 0 = to do, 1 = OK, else KO -->
- <MAARCH_TOOLS_PATH>/var/www/html/maarch/apps/maarch_entreprise/tools/</MAARCH_TOOLS_PATH>
+ <MAARCH_TOOLS_PATH>/var/www/MaarchCourrier/apps/maarch_entreprise/tools/</MAARCH_TOOLS_PATH>
<MAX_BATCH_SIZE>500</MAX_BATCH_SIZE>
</CONFIG>
<CONFIG_BASE>
<databaseserver>127.0.0.1</databaseserver>
<databaseserverport>5432</databaseserverport>
<databasetype>POSTGRESQL</databasetype>
- <databasename>maarch</databasename>
+ <databasename>maarchcourrier</databasename>
<databaseuser>maarch</databaseuser>
<databasepassword>maarch</databasepassword>
</CONFIG_BASE>
@@ -21,6 +21,6 @@
<enabled>true</enabled>
<Log4PhpLogger>loggerTechnique</Log4PhpLogger>
<Log4PhpBusinessCode>full_text</Log4PhpBusinessCode>
- <Log4PhpConfigPath>/var/www/html/maarch/apps/maarch_entreprise/xml/log4php.xml</Log4PhpConfigPath>
+ <Log4PhpConfigPath>/var/www/MaarchCourrier/apps/maarch_entreprise/xml/log4php.xml</Log4PhpConfigPath>
</LOG4PHP>
</ROOT>
diff --git a/modules/full_text/xml/config_batch_version_attachments.xml.default b/modules/full_text/xml/config_batch_version_attachments.xml.default
index f8dce5e4ec1..0894d0e6f46 100644
--- a/modules/full_text/xml/config_batch_version_attachments.xml.default
+++ b/modules/full_text/xml/config_batch_version_attachments.xml.default
@@ -2,18 +2,18 @@
<ROOT>
<CONFIG>
<CONFIG_NAME>version_attachments</CONFIG_NAME> <!-- usefull for multi customs -->
- <MAARCH_DIRECTORY>/var/www/html/maarch/</MAARCH_DIRECTORY> <!-- Path to full text module -->
- <INDEX_FILE_DIRECTORY>/opt/maarch/docservers/indexes/version_attachments_coll/</INDEX_FILE_DIRECTORY> <!-- Path to the indexes dir of the collection -->
+ <MAARCH_DIRECTORY>/var/www/MaarchCourrier/</MAARCH_DIRECTORY> <!-- Path to full text module -->
+ <INDEX_FILE_DIRECTORY>/home/maarch/docservers/maarchcourrier/indexes/version_attachments_coll/</INDEX_FILE_DIRECTORY> <!-- Path to the indexes dir of the collection -->
<TABLE_NAME>res_version_attachments</TABLE_NAME>
<FULLTEXT_COLUMN_NAME>fulltext_result</FULLTEXT_COLUMN_NAME> <!-- Null or 0 = to do, 1 = OK, else KO -->
- <MAARCH_TOOLS_PATH>/var/www/html/maarch/apps/maarch_entreprise/tools/</MAARCH_TOOLS_PATH>
+ <MAARCH_TOOLS_PATH>/var/www/MaarchCourrier/apps/maarch_entreprise/tools/</MAARCH_TOOLS_PATH>
<MAX_BATCH_SIZE>500</MAX_BATCH_SIZE>
</CONFIG>
<CONFIG_BASE>
<databaseserver>127.0.0.1</databaseserver>
<databaseserverport>5432</databaseserverport>
<databasetype>POSTGRESQL</databasetype>
- <databasename>maarch</databasename>
+ <databasename>maarchcourrier</databasename>
<databaseuser>maarch</databaseuser>
<databasepassword>maarch</databasepassword>
</CONFIG_BASE>
@@ -21,6 +21,6 @@
<enabled>true</enabled>
<Log4PhpLogger>loggerTechnique</Log4PhpLogger>
<Log4PhpBusinessCode>full_text</Log4PhpBusinessCode>
- <Log4PhpConfigPath>/var/www/html/maarch/apps/maarch_entreprise/xml/log4php.xml</Log4PhpConfigPath>
+ <Log4PhpConfigPath>/var/www/MaarchCourrier/apps/maarch_entreprise/xml/log4php.xml</Log4PhpConfigPath>
</LOG4PHP>
</ROOT>
diff --git a/modules/life_cycle/batch/scripts/01-OAIS_CACHED.sh.default b/modules/life_cycle/batch/scripts/01-OAIS_CACHED.sh.default
index 125de82fb77..d705eb8cc09 100644
--- a/modules/life_cycle/batch/scripts/01-OAIS_CACHED.sh.default
+++ b/modules/life_cycle/batch/scripts/01-OAIS_CACHED.sh.default
@@ -1,8 +1,8 @@
#!/bin/bash
-Mypath='/var/www/maarch/modules/life_cycle/batch'
+Mypath='/var/www/MaarchCourrier/modules/life_cycle/batch'
cd $Mypath
-Custompath='/var/www/maarch/modules/life_cycle/batch/config'
+Custompath='/var/www/MaarchCourrier/modules/life_cycle/batch/config'
for (( i=0; i < 3; i++ ));
do php $Mypath/fill_stack.php -c $Custompath/config.xml -coll res_coll -p FNTC -cy OAIS_CACHED
diff --git a/modules/life_cycle/batch/scripts/02-OAIS.sh.default b/modules/life_cycle/batch/scripts/02-OAIS.sh.default
index 8ec2d2379e1..f0080f02c16 100644
--- a/modules/life_cycle/batch/scripts/02-OAIS.sh.default
+++ b/modules/life_cycle/batch/scripts/02-OAIS.sh.default
@@ -1,8 +1,8 @@
#!/bin/bash
-Mypath='/var/www/maarch/modules/life_cycle/batch'
+Mypath='/var/www/MaarchCourrier/modules/life_cycle/batch'
cd $Mypath
-Custompath='/var/www/maarch/modules/life_cycle/batch/config'
+Custompath='/var/www/MaarchCourrier/modules/life_cycle/batch/config'
for (( i=0; i < 3; i++ ));
do php $Mypath/fill_stack.php -c $Custompath/config.xml -coll res_coll -p FNTC -cy OAIS
diff --git a/modules/life_cycle/batch/scripts/parallel/01-OAIS_CACHED_0.sh.default b/modules/life_cycle/batch/scripts/parallel/01-OAIS_CACHED_0.sh.default
index c65a009da5f..771be9bc1b5 100644
--- a/modules/life_cycle/batch/scripts/parallel/01-OAIS_CACHED_0.sh.default
+++ b/modules/life_cycle/batch/scripts/parallel/01-OAIS_CACHED_0.sh.default
@@ -1,8 +1,8 @@
#!/bin/bash
-Mypath='/var/www/maarch/modules/life_cycle/batch'
+Mypath='/var/www/MaarchCourrier/modules/life_cycle/batch'
cd $Mypath
-Custompath='/var/www/maarch/modules/life_cycle/batch/config/parallel'
+Custompath='/var/www/MaarchCourrier/modules/life_cycle/batch/config/parallel'
for (( i=0; i < 3; i++ ));
do php $Mypath/fill_stack.php -c $Custompath/config_0.xml -coll res_coll -p FNTC -cy OAIS_CACHED
diff --git a/modules/life_cycle/batch/scripts/parallel/01-OAIS_CACHED_1.sh.default b/modules/life_cycle/batch/scripts/parallel/01-OAIS_CACHED_1.sh.default
index 8136c9510ce..d8425102a11 100644
--- a/modules/life_cycle/batch/scripts/parallel/01-OAIS_CACHED_1.sh.default
+++ b/modules/life_cycle/batch/scripts/parallel/01-OAIS_CACHED_1.sh.default
@@ -1,8 +1,8 @@
#!/bin/bash
-Mypath='/var/www/maarch/modules/life_cycle/batch'
+Mypath='/var/www/MaarchCourrier/modules/life_cycle/batch'
cd $Mypath
-Custompath='/var/www/maarch/modules/life_cycle/batch/config/parallel'
+Custompath='/var/www/MaarchCourrier/modules/life_cycle/batch/config/parallel'
for (( i=0; i < 3; i++ ));
do php $Mypath/fill_stack.php -c $Custompath/config_1.xml -coll res_coll -p FNTC -cy OAIS_CACHED
diff --git a/modules/life_cycle/batch/scripts/parallel/01-OAIS_CACHED_2.sh.default b/modules/life_cycle/batch/scripts/parallel/01-OAIS_CACHED_2.sh.default
index c4709f7a2bb..24b9f7e0333 100644
--- a/modules/life_cycle/batch/scripts/parallel/01-OAIS_CACHED_2.sh.default
+++ b/modules/life_cycle/batch/scripts/parallel/01-OAIS_CACHED_2.sh.default
@@ -1,8 +1,8 @@
#!/bin/bash
-Mypath='/var/www/maarch/modules/life_cycle/batch'
+Mypath='/var/www/MaarchCourrier/modules/life_cycle/batch'
cd $Mypath
-Custompath='/var/www/maarch/modules/life_cycle/batch/config/parallel'
+Custompath='/var/www/MaarchCourrier/modules/life_cycle/batch/config/parallel'
for (( i=0; i < 3; i++ ));
do php $Mypath/fill_stack.php -c $Custompath/config_2.xml -coll res_coll -p FNTC -cy OAIS_CACHED
diff --git a/modules/life_cycle/batch/scripts/parallel/01-OAIS_CACHED_3.sh.default b/modules/life_cycle/batch/scripts/parallel/01-OAIS_CACHED_3.sh.default
index af8d7bd0a40..f6b428c53cb 100644
--- a/modules/life_cycle/batch/scripts/parallel/01-OAIS_CACHED_3.sh.default
+++ b/modules/life_cycle/batch/scripts/parallel/01-OAIS_CACHED_3.sh.default
@@ -1,8 +1,8 @@
#!/bin/bash
-Mypath='/var/www/maarch/modules/life_cycle/batch'
+Mypath='/var/www/MaarchCourrier/modules/life_cycle/batch'
cd $Mypath
-Custompath='/var/www/maarch/modules/life_cycle/batch/config/parallel'
+Custompath='/var/www/MaarchCourrier/modules/life_cycle/batch/config/parallel'
for (( i=0; i < 3; i++ ));
do php $Mypath/fill_stack.php -c $Custompath/config_3.xml -coll res_coll -p FNTC -cy OAIS_CACHED
diff --git a/modules/life_cycle/batch/scripts/parallel/01-OAIS_CACHED_4.sh.default b/modules/life_cycle/batch/scripts/parallel/01-OAIS_CACHED_4.sh.default
index 9b4f2861309..6763a704430 100644
--- a/modules/life_cycle/batch/scripts/parallel/01-OAIS_CACHED_4.sh.default
+++ b/modules/life_cycle/batch/scripts/parallel/01-OAIS_CACHED_4.sh.default
@@ -1,8 +1,8 @@
#!/bin/bash
-Mypath='/var/www/maarch/modules/life_cycle/batch'
+Mypath='/var/www/MaarchCourrier/modules/life_cycle/batch'
cd $Mypath
-Custompath='/var/www/maarch/modules/life_cycle/batch/config/parallel'
+Custompath='/var/www/MaarchCourrier/modules/life_cycle/batch/config/parallel'
for (( i=0; i < 3; i++ ));
do php $Mypath/fill_stack.php -c $Custompath/config_4.xml -coll res_coll -p FNTC -cy OAIS_CACHED
diff --git a/modules/life_cycle/batch/scripts/parallel/param_cron.txt b/modules/life_cycle/batch/scripts/parallel/param_cron.txt
index 2cc77860602..1901b156776 100644
--- a/modules/life_cycle/batch/scripts/parallel/param_cron.txt
+++ b/modules/life_cycle/batch/scripts/parallel/param_cron.txt
@@ -1,12 +1,12 @@
# tous les jours toutes les 2 heures de 0h a 20h du lundi au samedi lancement des batchs de cycle de vie OAIS_CACHED
-0 0-20/2 * * 1-6 maarch /var/www/maarch/modules/life_cycle/batch/scripts/parallel/01-OAIS_CACHED_0.sh
-1 0-20/2 * * 1-6 maarch /var/www/maarch/modules/life_cycle/batch/scripts/parallel/01-OAIS_CACHED_1.sh
-2 0-20/2 * * 1-6 maarch /var/www/maarch/modules/life_cycle/batch/scripts/parallel/01-OAIS_CACHED_2.sh
-3 0-20/2 * * 1-6 maarch /var/www/maarch/modules/life_cycle/batch/scripts/parallel/01-OAIS_CACHED_3.sh
-4 0-20/2 * * 1-6 maarch /var/www/maarch/modules/life_cycle/batch/scripts/parallel/01-OAIS_CACHED_4.sh
+0 0-20/2 * * 1-6 maarch /var/www/MaarchCourrier/modules/life_cycle/batch/scripts/parallel/01-OAIS_CACHED_0.sh
+1 0-20/2 * * 1-6 maarch /var/www/MaarchCourrier/modules/life_cycle/batch/scripts/parallel/01-OAIS_CACHED_1.sh
+2 0-20/2 * * 1-6 maarch /var/www/MaarchCourrier/modules/life_cycle/batch/scripts/parallel/01-OAIS_CACHED_2.sh
+3 0-20/2 * * 1-6 maarch /var/www/MaarchCourrier/modules/life_cycle/batch/scripts/parallel/01-OAIS_CACHED_3.sh
+4 0-20/2 * * 1-6 maarch /var/www/MaarchCourrier/modules/life_cycle/batch/scripts/parallel/01-OAIS_CACHED_4.sh
# tous les samedi et dimanche toutes les 2 heures de 0h a 20h lancement des batchs de cycle de vie OAIS (purge des FASTHD)
-0 0-20/2 * * 6-7 maarch /var/www/maarch/modules/life_cycle/batch/scripts/02-OAIS.sh
+0 0-20/2 * * 6-7 maarch /var/www/MaarchCourrier/modules/life_cycle/batch/scripts/02-OAIS.sh
# a 22h30 tous les jours nettoyage des logs et repertoire temporaire du cycle de vie
-30 22 * * * maarch /var/www/maarch/modules/life_cycle/batch/scripts/purge_logs_tmp.sh
+30 22 * * * maarch /var/www/MaarchCourrier/modules/life_cycle/batch/scripts/purge_logs_tmp.sh
diff --git a/modules/life_cycle/batch/scripts/param_cron.txt b/modules/life_cycle/batch/scripts/param_cron.txt
index 3a86a04362d..13fca438257 100644
--- a/modules/life_cycle/batch/scripts/param_cron.txt
+++ b/modules/life_cycle/batch/scripts/param_cron.txt
@@ -1,8 +1,8 @@
# tous les jours toutes les 2 heures de 0h a 20h du lundi au samedi lancement des batchs de cycle de vie OAIS_CACHED
-0 0-20/2 * * 1-6 maarch /var/www/maarch/modules/life_cycle/batch/scripts/01-OAIS_CACHED.sh
+0 0-20/2 * * 1-6 maarch /var/www/MaarchCourrier/modules/life_cycle/batch/scripts/01-OAIS_CACHED.sh
# tous les samedi et dimanche toutes les 2 heures de 0h a 20h lancement des batchs de cycle de vie OAIS (purge des FASTHD)
-0 0-20/2 * * 6-7 maarch /var/www/maarch/modules/life_cycle/batch/scripts/02-OAIS.sh
+0 0-20/2 * * 6-7 maarch /var/www/MaarchCourrier/modules/life_cycle/batch/scripts/02-OAIS.sh
# a 22h30 tous les jours nettoyage des logs et repertoire temporaire du cycle de vie
-30 22 * * * maarch /var/www/maarch/modules/life_cycle/batch/scripts/purge_logs_tmp.sh
+30 22 * * * maarch /var/www/MaarchCourrier/modules/life_cycle/batch/scripts/purge_logs_tmp.sh
diff --git a/modules/life_cycle/batch/scripts/purge_logs_tmp.sh.default b/modules/life_cycle/batch/scripts/purge_logs_tmp.sh.default
index 64adaa351f6..0a1441e7c41 100644
--- a/modules/life_cycle/batch/scripts/purge_logs_tmp.sh.default
+++ b/modules/life_cycle/batch/scripts/purge_logs_tmp.sh.default
@@ -1,6 +1,6 @@
#!/bin/bash
-Mypath='/var/www/maarch/modules/life_cycle/batch'
+Mypath='/var/www/MaarchCourrier/modules/life_cycle/batch'
rm -f $Mypath/logs/fill_stack/*
rm -f $Mypath/logs/process_stack/*
diff --git a/modules/life_cycle/batch/scripts/stat_batch.bat.default b/modules/life_cycle/batch/scripts/stat_batch.bat.default
deleted file mode 100644
index 9c0bed566cc..00000000000
--- a/modules/life_cycle/batch/scripts/stat_batch.bat.default
+++ /dev/null
@@ -1,5 +0,0 @@
-
-cd c:\xampp\htdocs\maarch_trunk\modules\life_cycle\batch\
-
-"C:\xampp\php\php.exe" "extract_data.php" -c "c:\xampp\htdocs\maarch_trunk\custom\spm_miviludes\modules\life_cycle\batch\config\config_extract_data.xml" -coll "letterbox_coll"
-
diff --git a/modules/life_cycle/batch/scripts/stat_batch.sh.default b/modules/life_cycle/batch/scripts/stat_batch.sh.default
index 7039154066c..ea00c4b0518 100755
--- a/modules/life_cycle/batch/scripts/stat_batch.sh.default
+++ b/modules/life_cycle/batch/scripts/stat_batch.sh.default
@@ -1,5 +1,5 @@
#!/bin/sh
-cd /var/www/html/maarch_trunk/modules/life_cycle/batch/
+cd /var/www/MaarchCourrier/modules/life_cycle/batch/
-php "extract_data.php" -c "/var/www/html/maarch_trunk/modules/life_cycle/batch/config/config_extract_data.xml" -coll "letterbox_coll"
+php "extract_data.php" -c "/var/www/MaarchCourrier/modules/life_cycle/batch/config/config_extract_data.xml" -coll "letterbox_coll"
diff --git a/modules/notifications/batch/config/config.xml.default b/modules/notifications/batch/config/config.xml.default
index 917316950b6..ed75539a0fe 100755
--- a/modules/notifications/batch/config/config.xml.default
+++ b/modules/notifications/batch/config/config.xml.default
@@ -3,11 +3,11 @@
<!-- le nom du fichier doit etre config.xml ou config_{custom_id}.xml -->
<CONFIG>
<Lang>fr</Lang> <!-- fr, en-->
- <MaarchDirectory>/var/www/html/maarch/</MaarchDirectory>
+ <MaarchDirectory>/var/www/MaarchCourrier/</MaarchDirectory>
<customID></customID>
<MaarchUrl>http://localhost/maarch/</MaarchUrl>
<MaarchApps>maarch_entreprise</MaarchApps>
- <TmpDirectory>/var/www/html/maarch/modules/notifications/batch/tmp/</TmpDirectory>
+ <TmpDirectory>/var/www/MaarchCourrier/modules/notifications/batch/tmp/</TmpDirectory>
<debugmode>
<dontflag_mail>true</dontflag_mail>
<verbose_mode>false</verbose_mode>
@@ -28,8 +28,8 @@
<databaseserver>127.0.0.1</databaseserver>
<databaseserverport>5432</databaseserverport>
<databasetype>POSTGRESQL</databasetype>
- <databasename>maarch</databasename>
- <databaseuser>postgres</databaseuser>
+ <databasename>maarchcourrier</databasename>
+ <databaseuser>maarch</databaseuser>
<databasepassword>maarch</databasepassword>
</CONFIG_BASE>
<MAILER>
@@ -51,6 +51,6 @@
<enabled>true</enabled>
<Log4PhpLogger>loggerTechnique</Log4PhpLogger>
<Log4PhpBusinessCode>notifications</Log4PhpBusinessCode>
- <Log4PhpConfigPath>/var/www/html/maarch/apps/maarch_entreprise/xml/log4php.xml</Log4PhpConfigPath>
+ <Log4PhpConfigPath>/var/www/MaarchCourrier/apps/maarch_entreprise/xml/log4php.xml</Log4PhpConfigPath>
</LOG4PHP>
</ROOT>
diff --git a/modules/notifications/batch/scripts/nct-ncc-and-anc.bat b/modules/notifications/batch/scripts/nct-ncc-and-anc.bat
deleted file mode 100644
index aad3018087a..00000000000
--- a/modules/notifications/batch/scripts/nct-ncc-and-anc.bat
+++ /dev/null
@@ -1,6 +0,0 @@
-cd "C:\xampp\htdocs\maarch_entreprise\modules\notifications\batch"
-"C:\xampp\php\php.exe" "C:\xampp\htdocs\maarch_entreprise\modules\notifications\batch\process_event_stack.php" -c "C:\xampp\htdocs\maarch_entreprise\modules\notifications\batch\config\config.xml" -n NCT
-"C:\xampp\php\php.exe" "C:\xampp\htdocs\maarch_entreprise\modules\notifications\batch\process_event_stack.php" -c "C:\xampp\htdocs\maarch_entreprise\modules\notifications\batch\config\config.xml" -n NCC
-"C:\xampp\php\php.exe" "C:\xampp\htdocs\maarch_entreprise\modules\notifications\batch\process_event_stack.php" -c "C:\xampp\htdocs\maarch_entreprise\modules\notifications\batch\config\config.xml" -n ANC
-"C:\xampp\php\php.exe" "C:\xampp\htdocs\maarch_entreprise\modules\notifications\batch\process_event_stack.php" -c "C:\xampp\htdocs\maarch_entreprise\modules\notifications\batch\config\config.xml" -n AND
-"C:\xampp\php\php.exe" "C:\xampp\htdocs\maarch_entreprise\modules\notifications\batch\process_event_stack.php" -c "C:\xampp\htdocs\maarch_entreprise\modules\notifications\batch\config\config.xml" -n RED
diff --git a/modules/notifications/batch/scripts/nct-ncc-and-anc.sh b/modules/notifications/batch/scripts/nct-ncc-and-anc.sh
index 18fd4fb227c..ed4c1c4a3a2 100644
--- a/modules/notifications/batch/scripts/nct-ncc-and-anc.sh
+++ b/modules/notifications/batch/scripts/nct-ncc-and-anc.sh
@@ -1,8 +1,8 @@
#!/bin/sh
-eventStackPath='/var/www/maarch_entreprise/modules/notifications/batch/process_event_stack.php'
-cd /var/www/maarch_entreprise/modules/notifications/batch/
-php $eventStackPath -c /var/www/maarch_entreprise/modules/notifications/batch/config/config.xml -n NCT
-php $eventStackPath -c /var/www/maarch_entreprise/modules/notifications/batch/config/config.xml -n NCC
-php $eventStackPath -c /var/www/maarch_entreprise/modules/notifications/batch/config/config.xml -n ANC
-php $eventStackPath -c /var/www/maarch_entreprise/modules/notifications/batch/config/config.xml -n AND
-php $eventStackPath -c /var/www/maarch_entreprise/modules/notifications/batch/config/config.xml -n RED
+eventStackPath='/var/www/MaarchCourrier/modules/notifications/batch/process_event_stack.php'
+cd /var/www/MaarchCourrier/modules/notifications/batch/
+php $eventStackPath -c /var/www/MaarchCourrier/modules/notifications/batch/config/config.xml -n NCT
+php $eventStackPath -c /var/www/MaarchCourrier/modules/notifications/batch/config/config.xml -n NCC
+php $eventStackPath -c /var/www/MaarchCourrier/modules/notifications/batch/config/config.xml -n ANC
+php $eventStackPath -c /var/www/MaarchCourrier/modules/notifications/batch/config/config.xml -n AND
+php $eventStackPath -c /var/www/MaarchCourrier/modules/notifications/batch/config/config.xml -n RED
diff --git a/modules/notifications/batch/scripts/ret1-ret2.bat b/modules/notifications/batch/scripts/ret1-ret2.bat
deleted file mode 100644
index 118695cea31..00000000000
--- a/modules/notifications/batch/scripts/ret1-ret2.bat
+++ /dev/null
@@ -1,4 +0,0 @@
-cd "C:\xampp\htdocs\maarch_entreprise\modules\notifications\batch"
-"C:\xampp\php\php.exe" "C:\xampp\htdocs\maarch_entreprise\modules\notifications\batch\stack_letterbox_alerts.php" -c "C:\xampp\htdocs\maarch_entreprise\modules\notifications\batch\config\config.xml"
-"C:\xampp\php\php.exe" "C:\xampp\htdocs\maarch_entreprise\modules\notifications\batch\process_event_stack.php" -c "C:\xampp\htdocs\maarch_entreprise\modules\notifications\batch\config\config.xml" -n RET1
-"C:\xampp\php\php.exe" "C:\xampp\htdocs\maarch_entreprise\modules\notifications\batch\process_event_stack.php" -c "C:\xampp\htdocs\maarch_entreprise\modules\notifications\batch\config\config.xml" -n RET2
diff --git a/modules/notifications/batch/scripts/ret1-ret2.sh b/modules/notifications/batch/scripts/ret1-ret2.sh
index 7ddd2aee631..23190c2fb20 100644
--- a/modules/notifications/batch/scripts/ret1-ret2.sh
+++ b/modules/notifications/batch/scripts/ret1-ret2.sh
@@ -1,7 +1,7 @@
#!/bin/sh
-mlbStackPath='/var/www/maarch_entreprise/modules/notifications/batch/stack_letterbox_alerts.php'
-eventStackPath='/var/www/maarch_entreprise/modules/notifications/batch/process_event_stack.php'
-cd /var/www/maarch_entreprise/modules/notifications/batch/
-php $mlbStackPath -c /var/www/maarch_entreprise/modules/notifications/batch/config/config.xml
-php $eventStackPath -c /var/www/maarch_entreprise/modules/notifications/batch/config/config.xml -n RET1
-php $eventStackPath -c /var/www/maarch_entreprise/modules/notifications/batch/config/config.xml -n RET2
+mlbStackPath='/var/www/MaarchCourrier/modules/notifications/batch/stack_letterbox_alerts.php'
+eventStackPath='/var/www/MaarchCourrier/modules/notifications/batch/process_event_stack.php'
+cd /var/www/MaarchCourrier/modules/notifications/batch/
+php $mlbStackPath -c /var/www/MaarchCourrier/modules/notifications/batch/config/config.xml
+php $eventStackPath -c /var/www/MaarchCourrier/modules/notifications/batch/config/config.xml -n RET1
+php $eventStackPath -c /var/www/MaarchCourrier/modules/notifications/batch/config/config.xml -n RET2
diff --git a/modules/notifications/batch/scripts/sendmail.bat b/modules/notifications/batch/scripts/sendmail.bat
deleted file mode 100644
index d753b879dfe..00000000000
--- a/modules/notifications/batch/scripts/sendmail.bat
+++ /dev/null
@@ -1,3 +0,0 @@
-cd "C:\xampp\htdocs\maarch_entreprise\modules\notifications\batch"
-"C:\xampp\php\php.exe" "C:\xampp\htdocs\maarch_entreprise\modules\notifications\batch\process_email_stack.php" -c "C:\xampp\htdocs\maarch_entreprise\modules\notifications\batch\config\config.xml"
-PAUSE
\ No newline at end of file
diff --git a/modules/notifications/batch/scripts/sendmail.sh b/modules/notifications/batch/scripts/sendmail.sh
index 91537c394ae..b5500e3b29b 100644
--- a/modules/notifications/batch/scripts/sendmail.sh
+++ b/modules/notifications/batch/scripts/sendmail.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-cd /var/www/maarch_entreprise/modules/notifications/batch/
-emailStackPath='/var/www/maarch_entreprise/modules/notifications/batch/process_email_stack.php'
-php $emailStackPath -c /var/www/maarch_entreprise/modules/notifications/batch/config/config.xml
+cd /var/www/MaarchCourrier/modules/notifications/batch/
+emailStackPath='/var/www/MaarchCourrier/modules/notifications/batch/process_email_stack.php'
+php $emailStackPath -c /var/www/MaarchCourrier/modules/notifications/batch/config/config.xml
diff --git a/modules/notifications/batch/scripts/stack_letterbox_alerts.bat b/modules/notifications/batch/scripts/stack_letterbox_alerts.bat
deleted file mode 100644
index f756996a2ee..00000000000
--- a/modules/notifications/batch/scripts/stack_letterbox_alerts.bat
+++ /dev/null
@@ -1,2 +0,0 @@
-cd "C:\xampp\htdocs\maarch_entreprise\modules\notifications\batch"
-"C:\xampp\php\php.exe" "C:\xampp\htdocs\maarch_entreprise\modules\notifications\batch\stack_letterbox_alerts.php" -c "C:\xampp\htdocs\maarch_entreprise\modules\notifications\batch\config\config.xml"
diff --git a/modules/sendmail/batch/config/config.xml.default b/modules/sendmail/batch/config/config.xml.default
index ecc62a60914..bd054ae572c 100755
--- a/modules/sendmail/batch/config/config.xml.default
+++ b/modules/sendmail/batch/config/config.xml.default
@@ -2,11 +2,11 @@
<ROOT>
<CONFIG>
<Lang>fr</Lang> <!-- fr, en-->
- <MaarchDirectory>/var/www/html/maarch/</MaarchDirectory>
+ <MaarchDirectory>/var/www/MaarchCourrier/</MaarchDirectory>
<MaarchUrl>http://localhost/maarch/</MaarchUrl>
<MaarchApps>maarch_entreprise</MaarchApps>
<CustomId></CustomId>
- <TmpDirectory>/var/www/html/maarch/modules/sendmail/batch/tmp/</TmpDirectory>
+ <TmpDirectory>/var/www/MaarchCourrier/modules/sendmail/batch/tmp/</TmpDirectory>
<debugmode>
<dontflag_mail>true</dontflag_mail>
<verbose_mode>false</verbose_mode>
@@ -27,8 +27,8 @@
<databaseserver>127.0.0.1</databaseserver>
<databaseserverport>5432</databaseserverport>
<databasetype>POSTGRESQL</databasetype>
- <databasename>maarch</databasename>
- <databaseuser>postgres</databaseuser>
+ <databasename>maarchcourrier</databasename>
+ <databaseuser>maarch</databaseuser>
<databasepassword>maarch</databasepassword>
</CONFIG_BASE>
<MAILER>
@@ -50,6 +50,6 @@
<enabled>true</enabled>
<Log4PhpLogger>loggerTechnique</Log4PhpLogger>
<Log4PhpBusinessCode>sendmail</Log4PhpBusinessCode>
- <Log4PhpConfigPath>/var/www/html/maarch/apps/maarch_entreprise/xml/log4php.xml</Log4PhpConfigPath>
+ <Log4PhpConfigPath>/var/www/MaarchCourrier/apps/maarch_entreprise/xml/log4php.xml</Log4PhpConfigPath>
</LOG4PHP>
</ROOT>
\ No newline at end of file
diff --git a/modules/sendmail/batch/scripts/sendmail.bat b/modules/sendmail/batch/scripts/sendmail.bat
deleted file mode 100644
index 521ac5fc3b2..00000000000
--- a/modules/sendmail/batch/scripts/sendmail.bat
+++ /dev/null
@@ -1 +0,0 @@
-"C:\xampp\php\php.exe" "C:\xampp\htdocs\maarch_entreprise\modules\sendmail\batch\process_emails.php" -c "C:\xampp\htdocs\maarch_entreprise\modules\sendmail\batch\config\config.xml"
\ No newline at end of file
diff --git a/modules/sendmail/batch/scripts/sendmail.sh b/modules/sendmail/batch/scripts/sendmail.sh
index f6491ff5ddc..c1105313494 100644
--- a/modules/sendmail/batch/scripts/sendmail.sh
+++ b/modules/sendmail/batch/scripts/sendmail.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-cd /var/www/maarch_entreprise/modules/sendmail/batch/
-emailsPath='/var/www/maarch_entreprise/modules/sendmail/batch/process_emails.php'
-php $emailsPath -c /var/www/maarch_entreprise/modules/sendmail/batch/config/config.xml
+cd /var/www/MaarchCourrier/modules/sendmail/batch/
+emailsPath='/var/www/MaarchCourrier/modules/sendmail/batch/process_emails.php'
+php $emailsPath -c /var/www/MaarchCourrier/modules/sendmail/batch/config/config.xml
diff --git a/modules/thumbnails/xml/config_batch_attachments.xml.default b/modules/thumbnails/xml/config_batch_attachments.xml.default
index d0479e63604..1c38ff0409e 100755
--- a/modules/thumbnails/xml/config_batch_attachments.xml.default
+++ b/modules/thumbnails/xml/config_batch_attachments.xml.default
@@ -1,7 +1,7 @@
<ROOT>
<CONFIG>
<CONFIG_NAME>create_tnl_letterbox</CONFIG_NAME>
- <MaarchDirectory>/var/www/maarch/</MaarchDirectory>
+ <MaarchDirectory>/var/www/MaarchCourrier/</MaarchDirectory>
<TABLE_NAME>res_attachments</TABLE_NAME> <!-- Table a surveiller pour les documents à convertir -->
<COLLECTION>letterbox_coll</COLLECTION>
<MAX_BATCH_SIZE>500</MAX_BATCH_SIZE> <!-- Nombre d'occurences max pour les conversions -->
@@ -10,7 +10,7 @@
<databaseserver>localhost</databaseserver>
<databaseserverport>5432</databaseserverport>
<databasetype>POSTGRESQL</databasetype>
- <databasename>maarch</databasename>
+ <databasename>maarchcourrier</databasename>
<databaseuser>maarch</databaseuser>
<databasepassword>maarch</databasepassword>
</CONFIG_BASE>
@@ -18,6 +18,6 @@
<enabled>true</enabled>
<Log4PhpLogger>loggerTechnique</Log4PhpLogger>
<Log4PhpBusinessCode>thumbnails</Log4PhpBusinessCode>
- <Log4PhpConfigPath>/var/www/html/maarch/apps/maarch_entreprise/xml/log4php.xml</Log4PhpConfigPath>
+ <Log4PhpConfigPath>/var/www/MaarchCourrier/apps/maarch_entreprise/xml/log4php.xml</Log4PhpConfigPath>
</LOG4PHP>
</ROOT>
\ No newline at end of file
diff --git a/modules/thumbnails/xml/config_batch_letterbox.xml.default b/modules/thumbnails/xml/config_batch_letterbox.xml.default
index 386ed697a7c..25d12867e0b 100644
--- a/modules/thumbnails/xml/config_batch_letterbox.xml.default
+++ b/modules/thumbnails/xml/config_batch_letterbox.xml.default
@@ -1,7 +1,7 @@
<ROOT>
<CONFIG>
<CONFIG_NAME>create_tnl_letterbox</CONFIG_NAME>
- <MaarchDirectory>/var/www/maarch/</MaarchDirectory>
+ <MaarchDirectory>/var/www/MaarchCourrier/</MaarchDirectory>
<TABLE_NAME>res_letterbox</TABLE_NAME> <!-- Table a surveiller pour les documents à convertir -->
<COLLECTION>letterbox_coll</COLLECTION>
<MAX_BATCH_SIZE>500</MAX_BATCH_SIZE> <!-- Nombre d'occurences max pour les conversions -->
@@ -10,7 +10,7 @@
<databaseserver>localhost</databaseserver>
<databaseserverport>5432</databaseserverport>
<databasetype>POSTGRESQL</databasetype>
- <databasename>maarch</databasename>
+ <databasename>maarchcourrier</databasename>
<databaseuser>maarch</databaseuser>
<databasepassword>maarch</databasepassword>
</CONFIG_BASE>
@@ -18,6 +18,6 @@
<enabled>true</enabled>
<Log4PhpLogger>loggerTechnique</Log4PhpLogger>
<Log4PhpBusinessCode>thumbnails</Log4PhpBusinessCode>
- <Log4PhpConfigPath>/var/www/html/maarch/apps/maarch_entreprise/xml/log4php.xml</Log4PhpConfigPath>
+ <Log4PhpConfigPath>/var/www/MaarchCourrier/apps/maarch_entreprise/xml/log4php.xml</Log4PhpConfigPath>
</LOG4PHP>
</ROOT>
\ No newline at end of file
diff --git a/modules/visa/xml/config.xml b/modules/visa/xml/config.xml
index 54809e1d0bb..3c5d121eee0 100755
--- a/modules/visa/xml/config.xml
+++ b/modules/visa/xml/config.xml
@@ -9,7 +9,7 @@
<exeSign>C:\Program Files (x86)\Maarch\DIS\DISPDFSigner.exe</exeSign>
<showAppletSign>false</showAppletSign>
<reason>Signé et approuvé par </reason>
- <location>Miviludes, Services du Premier Ministre</location>
+ <location>Maarch-les-Bains, Ville de Maarch</location>
<licence_number>40dd49384bf59e98d10d</licence_number>
--
GitLab