Use https instead of http for alice-ccdb.cern.ch (DATA subfolder)

davidrohr · davidrohr · commit 9c3be7083049 · 2022-09-27T10:14:51.000+02:00
diff --git a/DATA/production/calib/hmp-pedestals-processing.sh b/DATA/production/calib/hmp-pedestals-processing.sh
@@ -64,7 +64,7 @@ then
 fi
 if [ $HMP_CCDB_REC == 'true' ];
 then
-  WORKFLOW+="--use-ccdb --ccdb-uri 'http://alice-ccdb.cern.ch' "
+  WORKFLOW+="--use-ccdb --ccdb-uri 'https://alice-ccdb.cern.ch' "
 fi
 if [ $HMP_FILES_REC == 'true' ];
 then
diff --git a/DATA/production/configurations/2021/OCT/apass3/setenv_extra.sh b/DATA/production/configurations/2021/OCT/apass3/setenv_extra.sh
@@ -51,7 +51,7 @@ export CONFIG_EXTRA_PROCESS_o2_its_reco_workflow="ITSVertexerParam.phiCut=0.5;IT
 export CONFIG_EXTRA_PROCESS_o2_gpu_reco_workflow="$VDRIFT;GPU_global.gainCalibFile=GainMap_2021-12-15_krypton_0.5T.v2.root;GPU_global.dEdxSplineTopologyCorrFile=splines_for_dedx_3D_scaled_Threshold_3.5.root;GPU_global.dEdxCorrFile=calibdEdx.${RUNNUMBER}.root"
 
 # ad-hoc settings for TOF reco
-# export ARGS_EXTRA_PROCESS_o2_tof_reco_workflow="--use-ccdb --ccdb-url-tof \"http://alice-ccdb.cern.ch\""
+# export ARGS_EXTRA_PROCESS_o2_tof_reco_workflow="--use-ccdb --ccdb-url-tof \"https://alice-ccdb.cern.ch\""
 # since commit on Dec, 4
 export ARGS_EXTRA_PROCESS_o2_tof_reco_workflow="--use-ccdb"
 
diff --git a/DATA/production/configurations/2021/OCT/apass3_zerofield/setenv_extra.sh b/DATA/production/configurations/2021/OCT/apass3_zerofield/setenv_extra.sh
@@ -50,7 +50,7 @@ export CONFIG_EXTRA_PROCESS_o2_its_reco_workflow="ITSVertexerParam.phiCut=0.5;IT
 export CONFIG_EXTRA_PROCESS_o2_gpu_reco_workflow="$VDRIFT"
 
 # ad-hoc settings for TOF reco
-# export ARGS_EXTRA_PROCESS_o2_tof_reco_workflow="--use-ccdb --ccdb-url-tof \"http://alice-ccdb.cern.ch\""
+# export ARGS_EXTRA_PROCESS_o2_tof_reco_workflow="--use-ccdb --ccdb-url-tof \"https://alice-ccdb.cern.ch\""
 # since commit on Dec, 4
 export ARGS_EXTRA_PROCESS_o2_tof_reco_workflow="--use-ccdb"
 
diff --git a/DATA/production/configurations/2021/OCT/apass4/setenv_extra.sh b/DATA/production/configurations/2021/OCT/apass4/setenv_extra.sh
@@ -47,7 +47,7 @@ export CONFIG_EXTRA_PROCESS_o2_its_reco_workflow="ITSVertexerParam.phiCut=0.5;IT
 export CONFIG_EXTRA_PROCESS_o2_gpu_reco_workflow="$VDRIFT;GPU_global.dEdxUseFullGainMap=1;GPU_global.dEdxDisableResidualGainMap=1"
 
 # ad-hoc settings for TOF reco
-# export ARGS_EXTRA_PROCESS_o2_tof_reco_workflow="--use-ccdb --ccdb-url-tof \"http://alice-ccdb.cern.ch\""
+# export ARGS_EXTRA_PROCESS_o2_tof_reco_workflow="--use-ccdb --ccdb-url-tof \"https://alice-ccdb.cern.ch\""
 # since commit on Dec, 4
 export ARGS_EXTRA_PROCESS_o2_tof_reco_workflow="--use-ccdb"
 
diff --git a/DATA/production/configurations/2021/OCT/apass5/setenv_extra.sh b/DATA/production/configurations/2021/OCT/apass5/setenv_extra.sh
@@ -47,7 +47,7 @@ export CONFIG_EXTRA_PROCESS_o2_its_reco_workflow="ITSVertexerParam.phiCut=0.5;IT
 export CONFIG_EXTRA_PROCESS_o2_gpu_reco_workflow="$VDRIFT;GPU_global.dEdxUseFullGainMap=1;GPU_global.dEdxDisableResidualGainMap=1"
 
 # ad-hoc settings for TOF reco
-# export ARGS_EXTRA_PROCESS_o2_tof_reco_workflow="--use-ccdb --ccdb-url-tof \"http://alice-ccdb.cern.ch\""
+# export ARGS_EXTRA_PROCESS_o2_tof_reco_workflow="--use-ccdb --ccdb-url-tof \"https://alice-ccdb.cern.ch\""
 # since commit on Dec, 4
 export ARGS_EXTRA_PROCESS_o2_tof_reco_workflow="--use-ccdb"
 
diff --git a/DATA/production/configurations/2022/LHC22f/apass1/getTPCvdrift.C b/DATA/production/configurations/2022/LHC22f/apass1/getTPCvdrift.C
@@ -9,10 +9,10 @@
 #include "DataFormatsTPC/LtrCalibData.h"
 #include "TPCBase/ParameterGas.h"
 
-float getTPCvdrift(int run, std::string_view ltrUrl = "http://alice-ccdb.cern.ch")
+float getTPCvdrift(int run, std::string_view ltrUrl = "https://alice-ccdb.cern.ch")
 {
   o2::ccdb::CcdbApi c;
-  c.init("http://alice-ccdb.cern.ch");
+  c.init("https://alice-ccdb.cern.ch");
   std::map<std::string, std::string> headers, metadataRCT, metadata, mm;
   headers = c.retrieveHeaders(fmt::format("RCT/Info/RunInformation/{}", run), metadataRCT, -1);
   printf("\nLooking for vdrift for run %d\n", run);
diff --git a/DATA/production/configurations/2022/LHC22f/apass1/setenv_extra.sh b/DATA/production/configurations/2022/LHC22f/apass1/setenv_extra.sh
@@ -21,7 +21,7 @@ fi
 
 # checking for remapping
 if [[ $remappingITS == 1 ]] || [[ $remappingMFT == 1 ]]; then
-  REMAPPING="--condition-remap \"http://alice-ccdb.cern.ch/RecITSMFT="
+  REMAPPING="--condition-remap \"https://alice-ccdb.cern.ch/RecITSMFT="
   if [[ $remappingITS == 1 ]]; then
     REMAPPING=$REMAPPING"ITS/Calib/ClusterDictionary"
     if [[ $remappingMFT == 1 ]]; then
@@ -85,7 +85,7 @@ export CONFIG_EXTRA_PROCESS_o2_its_reco_workflow="ITSVertexerParam.phiCut=0.5;IT
 export CONFIG_EXTRA_PROCESS_o2_gpu_reco_workflow="GPU_global.dEdxDisableResidualGainMap=1;$VDRIFTPARAMOPTION;"
 
 # ad-hoc settings for TOF reco
-# export ARGS_EXTRA_PROCESS_o2_tof_reco_workflow="--use-ccdb --ccdb-url-tof \"http://alice-ccdb.cern.ch\""
+# export ARGS_EXTRA_PROCESS_o2_tof_reco_workflow="--use-ccdb --ccdb-url-tof \"https://alice-ccdb.cern.ch\""
 # since commit on Dec, 4
 export ARGS_EXTRA_PROCESS_o2_tof_reco_workflow="--use-ccdb"
 
diff --git a/DATA/production/configurations/2022/LHC22f/apass1_TPCcalib/getTPCvdrift.C b/DATA/production/configurations/2022/LHC22f/apass1_TPCcalib/getTPCvdrift.C
@@ -9,10 +9,10 @@
 #include "DataFormatsTPC/LtrCalibData.h"
 #include "TPCBase/ParameterGas.h"
 
-float getTPCvdrift(int run, std::string_view ltrUrl = "http://alice-ccdb.cern.ch")
+float getTPCvdrift(int run, std::string_view ltrUrl = "https://alice-ccdb.cern.ch")
 {
   o2::ccdb::CcdbApi c;
-  c.init("http://alice-ccdb.cern.ch");
+  c.init("https://alice-ccdb.cern.ch");
   std::map<std::string, std::string> headers, metadataRCT, metadata, mm;
   headers = c.retrieveHeaders(fmt::format("RCT/Info/RunInformation/{}", run), metadataRCT, -1);
   printf("\nLooking for vdrift for run %d\n", run);
diff --git a/DATA/production/configurations/2022/LHC22f/apass1_TPCcalib/setenv_extra.sh b/DATA/production/configurations/2022/LHC22f/apass1_TPCcalib/setenv_extra.sh
@@ -21,7 +21,7 @@ fi
 
 # checking for remapping
 if [[ $remappingITS == 1 ]] || [[ $remappingMFT == 1 ]]; then
-  REMAPPING="--condition-remap \"http://alice-ccdb.cern.ch/RecITSMFT="
+  REMAPPING="--condition-remap \"https://alice-ccdb.cern.ch/RecITSMFT="
   if [[ $remappingITS == 1 ]]; then
     REMAPPING=$REMAPPING"ITS/Calib/ClusterDictionary"
     if [[ $remappingMFT == 1 ]]; then
@@ -70,7 +70,7 @@ export CONFIG_EXTRA_PROCESS_o2_its_reco_workflow="ITSVertexerParam.phiCut=0.5;IT
 export CONFIG_EXTRA_PROCESS_o2_gpu_reco_workflow="TPCGasParam.DriftV=$VDRIFT;GPU_global.dEdxDisableResidualGainMap=1"
 
 # ad-hoc settings for TOF reco
-# export ARGS_EXTRA_PROCESS_o2_tof_reco_workflow="--use-ccdb --ccdb-url-tof \"http://alice-ccdb.cern.ch\""
+# export ARGS_EXTRA_PROCESS_o2_tof_reco_workflow="--use-ccdb --ccdb-url-tof \"https://alice-ccdb.cern.ch\""
 # since commit on Dec, 4
 export ARGS_EXTRA_PROCESS_o2_tof_reco_workflow="--use-ccdb"
 
diff --git a/DATA/production/configurations/2022/MayJunePilotBeam/apass1/getTPCvdrift.C b/DATA/production/configurations/2022/MayJunePilotBeam/apass1/getTPCvdrift.C
@@ -12,7 +12,7 @@
 float getTPCvdrift(int run, std::string_view ltrUrl = "http://ccdb-test.cern.ch:8080")
 {
   o2::ccdb::CcdbApi c;
-  c.init("http://alice-ccdb.cern.ch");
+  c.init("https://alice-ccdb.cern.ch");
   std::map<std::string, std::string> headers, metadataRCT, metadata, mm;
   headers = c.retrieveHeaders(fmt::format("RCT/Info/RunInformation/{}", run), metadataRCT, -1);
   printf("\nLooking for vdrift for run %d\n", run);
diff --git a/DATA/production/configurations/2022/MayJunePilotBeam/apass1/setenv_extra.sh b/DATA/production/configurations/2022/MayJunePilotBeam/apass1/setenv_extra.sh
@@ -21,7 +21,7 @@ fi
 
 # checking for remapping
 if [[ $remappingITS == 1 ]] || [[ $remappingMFT == 1 ]]; then
-  REMAPPING="--condition-remap \"http://alice-ccdb.cern.ch/RecITSMFT="
+  REMAPPING="--condition-remap \"https://alice-ccdb.cern.ch/RecITSMFT="
   if [[ $remappingITS == 1 ]]; then
     REMAPPING=$REMAPPING"ITS/Calib/ClusterDictionary"
     if [[ $remappingMFT == 1 ]]; then
@@ -51,7 +51,7 @@ fi
 # TPC vdrift
 CCDB_TPC_VDRIFT="http://ccdb-test.cern.ch:8080"
 if [[ $RUNNUMBER -ge 518737 ]]; then
-  CCDB_TPC_VDRIFT="http://alice-ccdb.cern.ch"
+  CCDB_TPC_VDRIFT="https://alice-ccdb.cern.ch"
 fi
 echo "CCDB for TPC Vdrift = $CCDB_TPC_VDRIFT"
 root -b -q "$O2DPG_ROOT/DATA/production/configurations/$ALIEN_JDL_LPMANCHORYEAR/$O2DPGPATH/$ALIEN_JDL_LPMPASSNAME/getTPCvdrift.C+($RUNNUMBER, \"$CCDB_TPC_VDRIFT\" )"
@@ -77,7 +77,7 @@ export CONFIG_EXTRA_PROCESS_o2_its_reco_workflow="ITSVertexerParam.phiCut=0.5;IT
 export CONFIG_EXTRA_PROCESS_o2_gpu_reco_workflow="TPCGasParam.DriftV=$VDRIFT;GPU_global.dEdxDisableResidualGainMap=1"
 
 # ad-hoc settings for TOF reco
-# export ARGS_EXTRA_PROCESS_o2_tof_reco_workflow="--use-ccdb --ccdb-url-tof \"http://alice-ccdb.cern.ch\""
+# export ARGS_EXTRA_PROCESS_o2_tof_reco_workflow="--use-ccdb --ccdb-url-tof \"https://alice-ccdb.cern.ch\""
 # since commit on Dec, 4
 export ARGS_EXTRA_PROCESS_o2_tof_reco_workflow="--use-ccdb"
 
diff --git a/DATA/production/qc-sync/cpv.json b/DATA/production/qc-sync/cpv.json
@@ -19,7 +19,7 @@
           "url": "alio2-cr1-hv-aliecs:8500"
       },
       "conditionDB": {
-        "url": "http://alice-ccdb.cern.ch/"
+        "url": "https://alice-ccdb.cern.ch/"
       }
     },
     "tasks": {
diff --git a/DATA/production/qc-sync/its.json b/DATA/production/qc-sync/its.json
@@ -19,7 +19,7 @@
         "url": "http://ali-consul.cern.ch:8500"
       },
       "conditionDB": {
-        "url": "http://alice-ccdb.cern.ch"
+        "url": "https://alice-ccdb.cern.ch"
       }
     },
     "tasks": {
diff --git a/DATA/production/qc-sync/mft.json b/DATA/production/qc-sync/mft.json
@@ -19,7 +19,7 @@
         "url": "http://ali-consul.cern.ch:8500"
       },
       "conditionDB": {
-        "url": "http://alice-ccdb.cern.ch"
+        "url": "https://alice-ccdb.cern.ch"
       }
     },
     "tasks": {
diff --git a/DATA/production/qc-sync/mft_track.json b/DATA/production/qc-sync/mft_track.json
@@ -19,7 +19,7 @@
         "url": "http://ali-consul.cern.ch:8500"
       },
       "conditionDB": {
-        "url": "http://alice-ccdb.cern.ch"
+        "url": "https://alice-ccdb.cern.ch"
       }
     },
     "tasks": {
diff --git a/DATA/production/qc-sync/phs.json b/DATA/production/qc-sync/phs.json
@@ -19,7 +19,7 @@
         "url": "http://ali-consul.cern.ch:8500"
       },
       "conditionDB": {
-        "url": "http://alice-ccdb.cern.ch"
+        "url": "https://alice-ccdb.cern.ch"
       }
     },
     "tasks": {
diff --git a/DATA/production/qc-sync/qc-global.json b/DATA/production/qc-sync/qc-global.json
@@ -19,7 +19,7 @@
         "url": ""
       },
       "conditionDB": {
-        "url": "http://alice-ccdb.cern.ch"
+        "url": "https://alice-ccdb.cern.ch"
       },
       "infologger": {
         "filterDiscardDebug": "true",
diff --git a/DATA/production/qc-sync/tpc.json b/DATA/production/qc-sync/tpc.json
@@ -20,7 +20,7 @@
         "url": "http://ali-consul.cern.ch:8500"
       },
       "conditionDB": {
-        "url": "http://alice-ccdb.cern.ch"
+        "url": "https://alice-ccdb.cern.ch"
       }
     },
     "tasks": {
diff --git a/DATA/production/qc-workflow.sh b/DATA/production/qc-workflow.sh
@@ -201,7 +201,7 @@ elif [[ -z $QC_JSON_FROM_OUTSIDE ]]; then
     fi
 
     if [[ "0$GEN_TOPO_QC_OVERRIDE_CCDB_SERVER" != "0" ]]; then
-      sed -i "s,http://alice-ccdb.cern.ch,$GEN_TOPO_QC_OVERRIDE_CCDB_SERVER,g" $MERGED_JSON_FILENAME
+      sed -i "s,https://alice-ccdb.cern.ch,$GEN_TOPO_QC_OVERRIDE_CCDB_SERVER,g" $MERGED_JSON_FILENAME
     fi
     QC_JSON_FROM_OUTSIDE="$MERGED_JSON_FILENAME"
   fi

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`float getTPCvdrift(int run, std::string_view ltrUrl = "http://ccdb-test.cern.ch:8080")`
`13`	`13`	`{`
`14`	`14`	`o2::ccdb::CcdbApi c;`
`15`		`- c.init("http://alice-ccdb.cern.ch");`
	`15`	`+ c.init("https://alice-ccdb.cern.ch");`
`16`	`16`	`std::map<std::string, std::string> headers, metadataRCT, metadata, mm;`
`17`	`17`	`headers = c.retrieveHeaders(fmt::format("RCT/Info/RunInformation/{}", run), metadataRCT, -1);`
`18`	`18`	`printf("\nLooking for vdrift for run %d\n", run);`