diff --git a/php/RemoteDataCenter/RemoteDataCenterClass.php b/php/RemoteDataCenter/RemoteDataCenterClass.php index 1026e38..b2886e6 100644 --- a/php/RemoteDataCenter/RemoteDataCenterClass.php +++ b/php/RemoteDataCenter/RemoteDataCenterClass.php @@ -54,6 +54,7 @@ abstract class RemoteDataCenterClass { if (!is_dir(RemoteData.$this->baseID)) mkdir(RemoteData.$this->baseID, 0775, true); + chmod(RemoteData.$this->baseID,0775); $this->getRemoteTree(); } diff --git a/php/RemoteDataCenter/RemoteParamManager.php b/php/RemoteDataCenter/RemoteParamManager.php index 5bc34a1..aead128 100644 --- a/php/RemoteDataCenter/RemoteParamManager.php +++ b/php/RemoteDataCenter/RemoteParamManager.php @@ -20,10 +20,12 @@ class RemoteParamManager if (!is_dir(RemoteData."/PARAMS")) mkdir(RemoteData."/PARAMS", 0775, true); + chmod(RemoteData."/PARAMS",0775); if (!is_dir(RemoteData."/PARAMS_INFO")) mkdir(RemoteData."/PARAMS_INFO", 0775, true); - + chmod(RemoteData."/PARAMS_INFO",0775); + $this->xmlName = USERWSDIR."RemoteParams.xml"; $this->xmlDom = new DomDocument("1.0"); diff --git a/php/RemoteDataCenter/THEMIS.php b/php/RemoteDataCenter/THEMIS.php index 7a0c44f..0d005ed 100644 --- a/php/RemoteDataCenter/THEMIS.php +++ b/php/RemoteDataCenter/THEMIS.php @@ -92,7 +92,8 @@ class THEMIS extends RemoteDataCenterClientClass if (!is_dir(RemoteData."/PARAMS")) mkdir(RemoteData."/PARAMS", 0775, true); - + chmod(RemoteData."/PARAMS", 0775); + return $xml->save($xmlNameRemote); } diff --git a/php/RemoteDataCenter/getRemoteDDBaseProxies.php b/php/RemoteDataCenter/getRemoteDDBaseProxies.php index c553f50..3e52244 100644 --- a/php/RemoteDataCenter/getRemoteDDBaseProxies.php +++ b/php/RemoteDataCenter/getRemoteDDBaseProxies.php @@ -17,6 +17,7 @@ // only "DDBASE" Bases.xml if (!file_exists(DATAPATH."/RemoteData/Bases.xml")) { if (!is_dir(DATAPATH."/RemoteData")) mkdir(DATAPATH."/RemoteData", 0775, true); + chmod(DATAPATH."/RemoteData",0775); echo 'No Bases.xml file : Will use Bases.xml from DDBase'.PHP_EOL; $basesDom = new DomDocument("1.0"); @@ -30,6 +31,7 @@ $baseDir = DATAPATH."/RemoteData/$baseId"; $baseDirRemote = DDSERVICE."/BASE/INFO/bases/$baseId"; if (!is_dir($baseDir)) mkdir($baseDir, 0775, true); + chmod($baseDir,0775); if (!copy("$baseDirRemote/base.xml", "$baseDir/base.xml")) echo "Cannot copy base.xml for $baseId".PHP_EOL; } @@ -52,6 +54,7 @@ $baseDir = DATAPATH."/RemoteData/$baseId"; $baseDirRemote = DDSERVICE."/BASE/INFO/bases/$baseId"; if (!is_dir($baseDir)) mkdir($baseDir, 0775, true); + chmod($baseDir,0775); if (!copy("$baseDirRemote/base.xml", "$baseDir/base.xml")) { echo "Cannot copy base.xml for $baseId".PHP_EOL; } diff --git a/update_amda/makeRemote b/update_amda/makeRemote index 95cf631..abb4813 100755 --- a/update_amda/makeRemote +++ b/update_amda/makeRemote @@ -42,19 +42,23 @@ # "DDBASE side" ( CDAWEB-like ) data centers # - sudo chmod -R g+wrx $RemoteData - if [ ! -d "$RemoteData/PARAMS" ]; then - sudo mkdir -m 775 -p $RemoteData/PARAMS + mkdir -m 775 -p $RemoteData/PARAMS fi - sudo chmod -R g+wrx $RemoteData/PARAMS - sudo chmod -R g+wrx $PARAMS_LOCALDB_DIR + # group = apache ! + sudo chmod -R g+wrx $RemoteData $RemoteData/PARAMS $PARAMS_LOCALDB_DIR php $AMDA_IHM/php/RemoteDataCenter/getRemoteDDBaseProxies.php # copy "DDBASE" Remote Params descriptions if [ -d "$RemoteData/PARAMS" ]; then - cp $AMDA_IHM/generic_data/RemoteData/PARAMS/* $PARAMS_LOCALDB_DIR/ + for param_def in $RemoteData/PARAMS/*.xml + do + xml=`basename $param_def` + if [ ! -f "$PARAMS_LOCALDB_DIR/$xml" ]; then + cp $param_def $PARAMS_LOCALDB_DIR/ + fi + done fi -- libgit2 0.21.2