From 75492fe870b14ea8af6ee713d232d8d849fe98cf Mon Sep 17 00:00:00 2001
From: Benjamin Renard <benjamin.renard@akka.eu>
Date: Sat, 31 Mar 2018 13:46:06 +0200
Subject: [PATCH] Remove some obsoletes files + Put all locata data in LocalData directorie

---
 .gitignore                        | 7 -------
 generic_data/ParamInfo/.gitignore | 4 ----
 generic_data/Plot/DD_Request.res  | 4 ----
 php/config.php                    | 5 +----
 4 files changed, 1 insertion(+), 19 deletions(-)
 delete mode 100644 generic_data/ParamInfo/.gitignore
 delete mode 100644 generic_data/Plot/DD_Request.res

diff --git a/.gitignore b/.gitignore
index d48982f..2554c11 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,15 +2,8 @@ data/
 shared_data/
 generic_data/EPNResources/*.xml
 generic_data/LocalData/
-generic_data/Param/*.xml
 generic_data/RemoteData/
 generic_data/Statistics/
-generic_data/newKernelDDBase/
-generic_data/ParamTemplate/
-generic_data/ParamInfo/*.xml
-generic_data/DataSetInfo/
-generic_data/InstrumentInfo/
-generic_data/MissionInfo/
 js/lib/ext
 help/simu
 help/auto
diff --git a/generic_data/ParamInfo/.gitignore b/generic_data/ParamInfo/.gitignore
deleted file mode 100644
index 5e7d273..0000000
--- a/generic_data/ParamInfo/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-# Ignore everything in this directory
-*
-# Except this file
-!.gitignore
diff --git a/generic_data/Plot/DD_Request.res b/generic_data/Plot/DD_Request.res
deleted file mode 100644
index fc505d9..0000000
--- a/generic_data/Plot/DD_Request.res
+++ /dev/null
@@ -1,4 +0,0 @@
-portrait
-38         ;Color Table
-triplex    ;Font
-1000       ; ppp
diff --git a/php/config.php b/php/config.php
index aee3107..49fbe8e 100644
--- a/php/config.php
+++ b/php/config.php
@@ -19,7 +19,7 @@ define('BASE_PATH', IHM_SRC_DIR);
 define('AMDA_IHM', IHM_SRC_DIR);
 
 //log for AmdaUpdate/AmdaInstall
-define('log', LOG_DIR.'LOG');
+define('log', IHM_SRC_DIR.'/LOG');
 
 if (is_file('amda_version.php')) require_once 'amda_version.php';
 if (is_file('errors.php')) require_once 'errors.php';
@@ -109,9 +109,6 @@ define('wsdl_AMDA', webAlias."public/wsdl/Methods_AMDA.wsdl");
 
 define('DD_WSDL',DDSERVICE.'/dd.wsdl');
 
-// AKKA - KERNELBIN is now the new kernel bin dir
-define('KERNELBIN',NEWKERNEL_INSTALL_DIR.'bin/');
-
 putenv("LD_LIBRARY_PATH=".COTS_BASE_DIR."/lib:/lib:/usr/local/lib:/usr/local/lib64");
 putenv("PATH=./:".COTS_BASE_DIR."/bin:/bin:/usr/bin:/usr/local/bin:".IHM_SRC_DIR."/php/bin");
 
--
libgit2 0.21.2