SHUTTLE test configuration updated

diff --git a/SHUTTLE/schema/ACO.ldif b/SHUTTLE/schema/ACO.ldif
index 253dfb813640f7270cf9af11af5dcf4beae613d2..b397613c62f4f303192243a6261474c7729ee5fe 100644 (file)
--- a/SHUTTLE/schema/ACO.ldif
+++ b/SHUTTLE/schema/ACO.ldif
@@ -1,14 +1,14 @@
 # ACO config
-dn: det=ACO,o=alice,dc=cern,dc=ch
+dn: det=ACO,o=shuttle,dc=cern,dc=ch
 objectClass: detectorConfig
 det: ACO
 strictRunOrder: 0
 responsible: pedro.gonzalez@fcfm.buap.mx
 responsible: irais@fcfm.buap.mx
 
-dn: dcsHost=aldcs052.cern.ch,det=ACO,o=alice,dc=cern,dc=ch
+dn: dcsHost=aldcs052.cern.ch,det=ACO,o=shuttle,dc=cern,dc=ch
 objectClass: dcsConfig
 dcsHost: aldcs052.cern.ch
-dcsPort: 4242
-multiSplit: 1
+dcsPort: 1337
+multiSplit: 4000
 dcsAlias: ACO_HV_MODULE[00..59]

diff --git a/SHUTTLE/schema/DAQ.ldif b/SHUTTLE/schema/DAQ.ldif
index 3f8d6deeede37837a6d3692fa2b84e5b2c5c0e5e..2e465fd995d6033df968c4d3a31885c26ffa4bd3 100644 (file)
--- a/SHUTTLE/schema/DAQ.ldif
+++ b/SHUTTLE/schema/DAQ.ldif
@@ -1,15 +1,15 @@
 # DAQ config
-dn: system=DAQ,o=alice,dc=cern,dc=ch
+dn: system=DAQ,o=shuttle,dc=cern,dc=ch
 objectClass: top
 objectClass: fxsConfig
 system: DAQ
 dbHost: aldaqgw01-gpn.cern.ch
-dbPort: 1434
+dbPort: 1444
 dbPasswd: alice
-dbUser: shuttle
+dbUser: shuttle_test_rw
 dbName: SHUTTLE_TEST
 dbTable: daqFES_files
 fxsHost: aldaqgw01-gpn.cern.ch
-fxsPort: 1433
-fxsUser: shuttle
+fxsPort: 1443
+fxsUser: shuttle_test_rw
 

diff --git a/SHUTTLE/schema/DCS.ldif b/SHUTTLE/schema/DCS.ldif
index ea054bf931051a1f32e41b05df36f24fd3a195a9..005e2907189d8b973b22a0bdd05056b3fb6fec27 100644 (file)
--- a/SHUTTLE/schema/DCS.ldif
+++ b/SHUTTLE/schema/DCS.ldif
@@ -1,5 +1,5 @@
 # DCS config
-dn: system=DCS,o=alice,dc=cern,dc=ch
+dn: system=DCS,o=shuttle,dc=cern,dc=ch
 objectClass: top
 objectClass: fxsConfig
 system: DCS

diff --git a/SHUTTLE/schema/EMC.ldif b/SHUTTLE/schema/EMC.ldif
index ce00705fd52c99585018d6f7fc9435e70605952a..17bd6590be2c82beae2db5cd70266b4b8c364960 100644 (file)
--- a/SHUTTLE/schema/EMC.ldif
+++ b/SHUTTLE/schema/EMC.ldif
@@ -1,13 +1,13 @@
 # EMC config
-dn: det=EMC,o=alice,dc=cern,dc=ch
+dn: det=EMC,o=shuttle,dc=cern,dc=ch
 objectClass: top
 objectClass: detectorConfig
 det: EMC
 strictRunOrder: 0
 responsible: gustavo.conesa.balbastre@cern.ch
 
-dn: dcsHost=aldcs052.cern.ch,det=EMC,o=alice,dc=cern,dc=ch
+dn: dcsHost=aldcs052.cern.ch,det=EMC,o=shuttle,dc=cern,dc=ch
 objectClass: dcsConfig
 dcsHost: aldcs052.cern.ch
-dcsPort: 4242
-multiSplit: 1
+dcsPort: 1337
+multiSplit: 4000

diff --git a/SHUTTLE/schema/FMD.ldif b/SHUTTLE/schema/FMD.ldif
index e5221436ea069619423b2f1322745e095e7f8646..f6d7bba157c2b1464387e388fe783c919b377869 100644 (file)
--- a/SHUTTLE/schema/FMD.ldif
+++ b/SHUTTLE/schema/FMD.ldif
@@ -1,5 +1,5 @@
 # FMD Config
-dn: det=FMD,o=alice,dc=cern,dc=ch
+dn: det=FMD,o=shuttle,dc=cern,dc=ch
 objectClass: top
 objectClass: detectorConfig
 det: FMD

diff --git a/SHUTTLE/schema/GRP.ldif b/SHUTTLE/schema/GRP.ldif
index 66de5730db952bf494a1241244023ddf6330de5a..191d8679a3c5cf22119257b9041862427a148e13 100644 (file)
--- a/SHUTTLE/schema/GRP.ldif
+++ b/SHUTTLE/schema/GRP.ldif
@@ -1,15 +1,15 @@
 # GRP config
-dn: det=GRP,o=alice,dc=cern,dc=ch
+dn: det=GRP,o=shuttle,dc=cern,dc=ch
 objectClass: detectorConfig
 det: GRP
 strictRunOrder: 0
 responsible: Panos.Christakoglou@cern.ch
 
-dn: dcsHost=aldcs052.cern.ch,det=GRP,o=alice,dc=cern,dc=ch
+dn: dcsHost=aldcs052.cern.ch,det=GRP,o=shuttle,dc=cern,dc=ch
 objectClass: dcsConfig
 dcsHost: aldcs052.cern.ch
-dcsPort: 4242
-multiSplit: 1
+dcsPort: 1337
+multiSplit: 4000
 dcsAlias: LHCState
 dcsAlias: LHCPeriod
 dcsAlias: LHCLuminosity

diff --git a/SHUTTLE/schema/Global.ldif b/SHUTTLE/schema/Global.ldif
index 13281af3d04a91980970405f5907f7ed20e9db1d..845632194f295d83d434aa1e518ed0fd209828b3 100644 (file)
--- a/SHUTTLE/schema/Global.ldif
+++ b/SHUTTLE/schema/Global.ldif
@@ -1,17 +1,19 @@
 # Global config
-dn: name=globalConfig,o=alice,dc=cern,dc=ch
+dn: name=globalConfig,o=shuttle,dc=cern,dc=ch
 objectClass: top
 objectClass: globalConfig
 name: globalConfig
 daqLbHost: aldaqgw01-gpn.cern.ch
-daqLbUser: shuttle
+daqLbUser: shuttle_test_rw
 daqLbPasswd: alice
 daqLbDB: SHUTTLE_TEST
-daqLbPort: 1434
+daqLbPort: 1444
 daqLbTable: logbook
 shuttleLbTable: logbook_shuttle
 runTypeLbTable: logbook_detectors
 ppTimeOut: 3600
 ppMaxMem: 2097152
 ppMaxRetries: 2
+monitorHost: aliendb1.cern.ch
+monitorTable: SHUTTLE
 

diff --git a/SHUTTLE/schema/HLT.ldif b/SHUTTLE/schema/HLT.ldif
index f1a6b711f796ae3f31e9bb00be27ee2d0b026c85..4fbf37c356a242d77bbefb1296c80f39c14c1b2d 100644 (file)
--- a/SHUTTLE/schema/HLT.ldif
+++ b/SHUTTLE/schema/HLT.ldif
@@ -1,5 +1,5 @@
 # HLT Config
-dn: system=HLT,o=alice,dc=cern,dc=ch
+dn: system=HLT,o=shuttle,dc=cern,dc=ch
 objectClass: top
 objectClass: fxsConfig
 system: HLT

diff --git a/SHUTTLE/schema/HMP.ldif b/SHUTTLE/schema/HMP.ldif
index 3b0ac22645239450c363bd95a195451c9d8434c3..8affa73ae56780462ee14ee4df08f040ddf8a7b5 100644 (file)
--- a/SHUTTLE/schema/HMP.ldif
+++ b/SHUTTLE/schema/HMP.ldif
@@ -1,16 +1,16 @@
 # HMP config
-dn: det=HMP,o=alice,dc=cern,dc=ch
+dn: det=HMP,o=shuttle,dc=cern,dc=ch
 objectClass: detectorConfig
 det: HMP
 strictRunOrder: 0
 responsible: Giacomo.Volpe@ba.infn.it 
 responsible: Domenico.Dibari@ba.infn.it
 
-dn: dcsHost=aldcs052.cern.ch,det=HMP,o=alice,dc=cern,dc=ch
+dn: dcsHost=aldcs052.cern.ch,det=HMP,o=shuttle,dc=cern,dc=ch
 objectClass: dcsConfig
 dcsHost: aldcs052.cern.ch
-dcsPort: 4242
-multiSplit: 1
+dcsPort: 1337
+multiSplit: 4000
 dcsAlias: HMP_DET/HMP_MP0/HMP_MP0_PW/HMP_MP0_SEC0/HMP_MP0_SEC0_HV.actual.vMon
 dcsAlias: HMP_DET/HMP_MP0/HMP_MP0_PW/HMP_MP0_SEC1/HMP_MP0_SEC1_HV.actual.vMon
 dcsAlias: HMP_DET/HMP_MP0/HMP_MP0_PW/HMP_MP0_SEC2/HMP_MP0_SEC2_HV.actual.vMon
@@ -95,11 +95,6 @@ dcsAlias: HMP_DET/HMP_MP6/HMP_MP6_PW/HMP_MP6_SEC2/HMP_MP6_SEC2_HV.actual.iMon
 dcsAlias: HMP_DET/HMP_MP6/HMP_MP6_PW/HMP_MP6_SEC3/HMP_MP6_SEC3_HV.actual.iMon
 dcsAlias: HMP_DET/HMP_MP6/HMP_MP6_PW/HMP_MP6_SEC4/HMP_MP6_SEC4_HV.actual.iMon
 dcsAlias: HMP_DET/HMP_MP6/HMP_MP6_PW/HMP_MP6_SEC5/HMP_MP6_SEC5_HV.actual.iMon
-
-dn: dcsHost=aldcs053.cern.ch,det=HMP,o=alice,dc=cern,dc=ch
-objectClass: dcsConfig
-dcsHost: aldcs053.cern.ch
-dcsPort: 4242
 dcsAlias: HMP_DET/HMP_MP0/HMP_MP0_PW/HMP_MP0_GRID.actual.vMon
 dcsAlias: HMP_DET/HMP_MP1/HMP_MP1_PW/HMP_MP1_GRID.actual.vMon
 dcsAlias: HMP_DET/HMP_MP2/HMP_MP2_PW/HMP_MP2_GRID.actual.vMon

diff --git a/SHUTTLE/schema/MCH.ldif b/SHUTTLE/schema/MCH.ldif
index 7a7fd6d5ed53c15e50e0013c5c061df3eee48997..7a47284af364daceff3cb473a0cf2f56e79bf422 100644 (file)
--- a/SHUTTLE/schema/MCH.ldif
+++ b/SHUTTLE/schema/MCH.ldif
@@ -1,16 +1,16 @@
 #MCH config
-dn: det=MCH,o=alice,dc=cern,dc=ch
+dn: det=MCH,o=shuttle,dc=cern,dc=ch
 objectClass: detectorConfig
 det: MCH
 strictRunOrder: 0
 responsible: aphecetc@in2p3.fr
 
 
-dn: dcsHost=aldcs052.cern.ch,det=MCH,o=alice,dc=cern,dc=ch
+dn: dcsHost=aldcs052.cern.ch,det=MCH,o=shuttle,dc=cern,dc=ch
 objectClass: dcsConfig
 dcsHost: aldcs052.cern.ch
-dcsPort: 4242
-multiSplit: 1
+dcsPort: 1337
+multiSplit: 4000
 dcsAlias: MchHvLvRight/Chamber[00..03]Right/Quad0Sect[0..2].actual.vMon
 dcsAlias: MchHvLvLeft/Chamber[00..03]Left/Quad1Sect[0..2].actual.vMon
 dcsAlias: MchHvLvLeft/Chamber[00..03]Left/Quad2Sect[0..2].actual.vMon

diff --git a/SHUTTLE/schema/MTR.ldif b/SHUTTLE/schema/MTR.ldif
index 854a7c2dfd0d35f52c04461545f9bb21ddb44873..15176c2e8c63d912e6f1d58d5f5b24b22aa34bd7 100644 (file)
--- a/SHUTTLE/schema/MTR.ldif
+++ b/SHUTTLE/schema/MTR.ldif
@@ -1,5 +1,5 @@
 #MTR config
-dn: det=MTR,o=alice,dc=cern,dc=ch
+dn: det=MTR,o=shuttle,dc=cern,dc=ch
 objectClass: detectorConfig
 det: MTR
 strictRunOrder: 0

diff --git a/SHUTTLE/schema/PHS.ldif b/SHUTTLE/schema/PHS.ldif
index 40881d8b2e2d9e2940509769558476d52c31cf92..3ea594f58dba297432acea082bf376a227d80d9f 100644 (file)
--- a/SHUTTLE/schema/PHS.ldif
+++ b/SHUTTLE/schema/PHS.ldif
@@ -1,15 +1,15 @@
 # PHS config
-dn: det=PHS,o=alice,dc=cern,dc=ch
+dn: det=PHS,o=shuttle,dc=cern,dc=ch
 objectClass: detectorConfig
 det: PHS
 strictRunOrder: 0
 responsible: Boris.Polichtchouk@cern.ch
 
-dn: dcsHost=aldcs052.cern.ch,det=PHS,o=alice,dc=cern,dc=ch
+dn: dcsHost=aldcs052.cern.ch,det=PHS,o=shuttle,dc=cern,dc=ch
 objectClass: dcsConfig
 dcsHost: aldcs052.cern.ch
-dcsPort: 4242
-multiSplit: 1
+dcsPort: 1337
+multiSplit: 4000
 dcsAlias: phs_hvIsegMeasVoltage[0..4]
 dcsAlias: phs_hvIsegMeasCurrent[0..4]
 dcsAlias: phs_hvIsegMeasAlarm[0..4]

diff --git a/SHUTTLE/schema/PMD.ldif b/SHUTTLE/schema/PMD.ldif
index 3acc443c8df36e8e2aa1f8e68db531b843d09a6d..187749924ffbc9644dc8f9b391a04dc718f30c83 100644 (file)
--- a/SHUTTLE/schema/PMD.ldif
+++ b/SHUTTLE/schema/PMD.ldif
@@ -1,13 +1,13 @@
 # PMD Config
-dn: det=PMD,o=alice,dc=cern,dc=ch
+dn: det=PMD,o=shuttle,dc=cern,dc=ch
 objectClass: top
 objectClass: detectorConfig
 det: PMD
 strictRunOrder: 0
 responsible: Zubayer.Ahammed@cern.ch
 
-dn: dcsHost=aldcs052.cern.ch,det=PMD,o=alice,dc=cern,dc=ch
+dn: dcsHost=aldcs052.cern.ch,det=PMD,o=shuttle,dc=cern,dc=ch
 objectClass: dcsConfig
 dcsHost: aldcs052.cern.ch
-dcsPort: 4242
-multiSplit: 1
+dcsPort: 1337
+multiSplit: 4000

diff --git a/SHUTTLE/schema/SDD.ldif b/SHUTTLE/schema/SDD.ldif
index dc953b925b3abd96a6861bd96ad35ce17612d134..80891a679ec3e8a0dd8ee5daf34df8486559717b 100644 (file)
--- a/SHUTTLE/schema/SDD.ldif
+++ b/SHUTTLE/schema/SDD.ldif
@@ -1,5 +1,5 @@
 # SDD config
-dn: det=SDD,o=alice,dc=cern,dc=ch
+dn: det=SDD,o=shuttle,dc=cern,dc=ch
 objectClass: top
 objectClass: detectorConfig
 det: SDD
@@ -7,8 +7,8 @@ strictRunOrder: 0
 responsible: francesco.prino@cern.ch
 responsible: elisabetta.crescio@to.infn.it
 
-dn: dcsHost=aldcs052.cern.ch,det=SDD,o=alice,dc=cern,dc=ch
+dn: dcsHost=aldcs052.cern.ch,det=SDD,o=shuttle,dc=cern,dc=ch
 objectClass: dcsConfig
 dcsHost: aldcs052.cern.ch
-dcsPort: 4242
-multiSplit: 1
+dcsPort: 1337
+multiSplit: 4000

diff --git a/SHUTTLE/schema/SPD.ldif b/SHUTTLE/schema/SPD.ldif
index 6c28ba8adbfc8303de81b723f3164b2bf7fbeeb5..0cb4287c3a0c63b9e2becbe963ec50cb0fd55cb3 100644 (file)
--- a/SHUTTLE/schema/SPD.ldif
+++ b/SHUTTLE/schema/SPD.ldif
@@ -1,13 +1,13 @@
 # SPD Config
-dn: det=SPD,o=alice,dc=cern,dc=ch
+dn: det=SPD,o=shuttle,dc=cern,dc=ch
 objectClass: top
 objectClass: detectorConfig
 det: SPD
 strictRunOrder: 0
 responsible: Henrik.Tydesjo@cern.ch
 
-dn: dcsHost=aldcs052.cern.ch,det=SPD,o=alice,dc=cern,dc=ch
+dn: dcsHost=aldcs052.cern.ch,det=SPD,o=shuttle,dc=cern,dc=ch
 objectClass: dcsConfig
 dcsHost: aldcs052.cern.ch
-dcsPort: 4242
-multiSplit: 1
+dcsPort: 1337
+multiSplit: 4000

diff --git a/SHUTTLE/schema/SSD.ldif b/SHUTTLE/schema/SSD.ldif
index 1032dbc3bbd32677794250f1eab3da73976bc007..c4af0f7a1ee4af6d51818b9c666d108c4d5bc3bc 100644 (file)
--- a/SHUTTLE/schema/SSD.ldif
+++ b/SHUTTLE/schema/SSD.ldif
@@ -1,13 +1,13 @@
 # SSD config
-dn: det=SSD,o=alice,dc=cern,dc=ch
+dn: det=SSD,o=shuttle,dc=cern,dc=ch
 objectClass: top
 objectClass: detectorConfig
 det: SSD
 strictRunOrder: 0
 responsible: enrico.fragiacomo@ts.infn.it
 
-dn: dcsHost=aldcs052.cern.ch,det=SSD,o=alice,dc=cern,dc=ch
+dn: dcsHost=aldcs052.cern.ch,det=SSD,o=shuttle,dc=cern,dc=ch
 objectClass: dcsConfig
 dcsHost: aldcs052.cern.ch
-dcsPort: 4242
-multiSplit: 1
+dcsPort: 1337
+multiSplit: 4000

diff --git a/SHUTTLE/schema/T00.ldif b/SHUTTLE/schema/T00.ldif
index ae7e46c1f34aadfc76f871ddfcf3e9222deeceb0..8e01291194f04bb6c4831dbe22f6977cbebd1ef6 100644 (file)
--- a/SHUTTLE/schema/T00.ldif
+++ b/SHUTTLE/schema/T00.ldif
@@ -1,5 +1,5 @@
 # T00 config;
-dn: det=T00,o=alice,dc=cern,dc=ch
+dn: det=T00,o=shuttle,dc=cern,dc=ch
 objectClass: top
 objectClass: detectorConfig
 det: T00
@@ -7,11 +7,11 @@ strictRunOrder: 0
 responsible: tomatkie@cc.jyu.fi
 responsible: moledzki@gmail.com
 
-dn: dcsHost=aldcs052.cern.ch,det=T00,o=alice,dc=cern,dc=ch
+dn: dcsHost=aldcs052.cern.ch,det=T00,o=shuttle,dc=cern,dc=ch
 objectClass: dcsConfig
 dcsHost: aldcs052.cern.ch
-dcsPort: 4242
-multiSplit: 1
+dcsPort: 1337
+multiSplit: 4000
 dcsAlias: t00_a_hv_imon_[00..11]
 dcsAlias: t00_a_hv_vmon_[00..11]
 dcsAlias: t00_a_lv_imon_[0..1]

diff --git a/SHUTTLE/schema/TOF.ldif b/SHUTTLE/schema/TOF.ldif
index 5543d59c8946be2cc0a4a651ef786ca1181ad707..b8ad9bbdb4091640685461788b510290d9956fe2 100644 (file)
--- a/SHUTTLE/schema/TOF.ldif
+++ b/SHUTTLE/schema/TOF.ldif
@@ -1,16 +1,16 @@
 # TOF Config
-dn: det=TOF,o=alice,dc=cern,dc=ch
+dn: det=TOF,o=shuttle,dc=cern,dc=ch
 objectClass: detectorConfig
 det: TOF
 strictRunOrder: 0
 responsible: Chiara.Zampolli@bo.infn.it
 responsible: arcelli@bo.infn.it
 
-dn: dcsHost=aldcs052.cern.ch,det=TOF,o=alice,dc=cern,dc=ch
+dn: dcsHost=aldcs052.cern.ch,det=TOF,o=shuttle,dc=cern,dc=ch
 objectClass: dcsConfig
 dcsHost: aldcs052.cern.ch
-dcsPort: 4242
-multiSplit: 1
+dcsPort: 1337
+multiSplit: 4000
 dcsAlias: tof_hv_vp_[00..89]
 dcsAlias: tof_hv_vn_[00..89]
 dcsAlias: tof_hv_ip_[00..89]

diff --git a/SHUTTLE/schema/TPC.ldif b/SHUTTLE/schema/TPC.ldif
index a003498fcd94d48971876d2c7570b8a466218cb8..1b6eb77251b0a9f450e1740d81e39c572e0d4ce8 100644 (file)
--- a/SHUTTLE/schema/TPC.ldif
+++ b/SHUTTLE/schema/TPC.ldif
@@ -1,15 +1,15 @@
 # TPC Config
-dn: det=TPC,o=alice,dc=cern,dc=ch
+dn: det=TPC,o=shuttle,dc=cern,dc=ch
 objectClass: detectorConfig
 det: TPC
 strictRunOrder: 0
 responsible: Haavard.Helstrup@cern.ch
 
-dn: dcsHost=aldcs052.cern.ch,det=TPC,o=alice,dc=cern,dc=ch
+dn: dcsHost=aldcs052.cern.ch,det=TPC,o=shuttle,dc=cern,dc=ch
 objectClass: dcsConfig
 dcsHost: aldcs052.cern.ch
-dcsPort: 4242
-multiSplit: 1
+dcsPort: 1337
+multiSplit: 4000
 dcsAlias: tpc_PT_[321..344].Temperature
 dcsAlias: tpc_PT_[353..379].Temperature
 dcsAlias: tpc_PT_[385..396].Temperature

diff --git a/SHUTTLE/schema/TRD.ldif b/SHUTTLE/schema/TRD.ldif
index 98dec61d6834a3124349a2202e801fe23f1a2579..778046ab70c2090fb8e6096e969046d1e456fdef 100644 (file)
--- a/SHUTTLE/schema/TRD.ldif
+++ b/SHUTTLE/schema/TRD.ldif
@@ -1,15 +1,15 @@
 # TRD Config
-dn: det=TRD,o=alice,dc=cern,dc=ch
+dn: det=TRD,o=shuttle,dc=cern,dc=ch
 objectClass: detectorConfig
 det: TRD
 strictRunOrder: 0
 responsible: r.bailhache@gsi.de
 
-dn: dcsHost=aldcs053.cern.ch,det=TRD,o=alice,dc=cern,dc=ch
+dn: dcsHost=aldcs053.cern.ch,det=TRD,o=shuttle,dc=cern,dc=ch
 objectClass: dcsConfig
 dcsHost: aldcs053.cern.ch
-dcsPort: 4242
-multiSplit: 1
+dcsPort: 1337
+multiSplit: 4000
 dcsAlias: trd_chamberStatus[000..539]
 dcsAlias: trd_goofieHv
 dcsAlias: trd_goofiePeakPos00

diff --git a/SHUTTLE/schema/V00.ldif b/SHUTTLE/schema/V00.ldif
index b8e46a61ab8ec20797aa5c5a02b3ff4c2d49a91d..8a3ebdb8bd025ee89fdb723c2c3f6ebb524a10bb 100644 (file)
--- a/SHUTTLE/schema/V00.ldif
+++ b/SHUTTLE/schema/V00.ldif
@@ -1,5 +1,5 @@
 # V00 config;
-dn: det=V00,o=alice,dc=cern,dc=ch
+dn: det=V00,o=shuttle,dc=cern,dc=ch
 objectClass: top
 objectClass: detectorConfig
 det: V00
@@ -8,10 +8,10 @@ responsible: b.cheynis@ipnl.in2p3.fr
 responsible: tieulent@in2p3.fr
  
 
-dn: dcsHost=aldcs053.cern.ch,det=V00,o=alice,dc=cern,dc=ch
+dn: dcsHost=aldcs053.cern.ch,det=V00,o=shuttle,dc=cern,dc=ch
 objectClass: dcsConfig
 dcsHost: aldcs053.cern.ch
-dcsPort: 4242
-multiSplit: 1
+dcsPort: 1337
+multiSplit: 4000
 dcsAlias: V00/HV/V0A/SECTOR[0..7]/RING[0..3]
 dcsAlias: V00/HV/V0C/SECTOR[0..7]/RING[0..3]

diff --git a/SHUTTLE/schema/ZDC.ldif b/SHUTTLE/schema/ZDC.ldif
index 46ae4e2da4e97492214e52fd67fb7b9c0385d866..c3a5e78af6a9e3a57fefa7cf3f09635aeb5596ca 100644 (file)
--- a/SHUTTLE/schema/ZDC.ldif
+++ b/SHUTTLE/schema/ZDC.ldif
@@ -1,14 +1,14 @@
 # ZDC config
-dn: det=ZDC,o=alice,dc=cern,dc=ch
+dn: det=ZDC,o=shuttle,dc=cern,dc=ch
 objectClass: detectorConfig
 det: ZDC
 strictRunOrder: 0
 responsible: chiara.oppedisano@to.infn.it
 
-dn: dcsHost=aldcs052.cern.ch,det=ZDC,o=alice,dc=cern,dc=ch
+dn: dcsHost=aldcs052.cern.ch,det=ZDC,o=shuttle,dc=cern,dc=ch
 objectClass: dcsConfig
 dcsHost: aldcs052.cern.ch
-dcsPort: 4242
+dcsPort: 1337
 multiSplit: 4000
 dcsAlias: ZDC_ZPA_HV[0..4].actual.vMon
 dcsAlias: ZDC_ZNA_HV[0..4].actual.vMon

diff --git a/SHUTTLE/schema/shuttle.schema b/SHUTTLE/schema/shuttle.schema
index fe4401bef1b727ceb6463e2c2e35f927a6c7604c..590f047c6218b6c73a913cecbcfcdb3baa2eba85 100644 (file)
--- a/SHUTTLE/schema/shuttle.schema
+++ b/SHUTTLE/schema/shuttle.schema
@@ -63,12 +63,14 @@ attributetype ( GLOBAL_CONFIG:8  NAME 'runTypeLbTable' DESC 'RunType Logbook tab
 attributetype ( GLOBAL_CONFIG:9  NAME 'ppmaxRetries'   DESC 'retries before pp fail'      EQUALITY caseIgnoreMatch    SUP name SINGLE-VALUE )
 attributetype ( GLOBAL_CONFIG:10 NAME 'ppTimeOut'      DESC 'seconds before pp abort'     EQUALITY caseIgnoreMatch    SUP name SINGLE-VALUE )
 attributetype ( GLOBAL_CONFIG:11 NAME 'ppMaxMem'       DESC 'max pp mem consumption (KB)'  EQUALITY caseIgnoreMatch    SUP name SINGLE-VALUE )
+attributetype ( GLOBAL_CONFIG:12 NAME 'monitorHost'    DESC 'monitoring server host'       EQUALITY caseIgnoreMatch    SUP name SINGLE-VALUE )
+attributetype ( GLOBAL_CONFIG:13 NAME 'monitorTable'   DESC 'monitoring table name'        EQUALITY caseIgnoreMatch    SUP name SINGLE-VALUE )
 
 objectclass ( GLOBAL_CONFIG
         NAME 'globalConfig'
         DESC 'ALICE: settings for DAQ logbook access'
         SUP top
-        MUST (name $ daqLbHost $ daqLbUser $ daqLbPasswd $ daqLbDB $ daqLbTable $ shuttleLbTable $ runTypeLbTable $ ppMaxRetries $ ppTimeOut $ ppMaxMem)
+        MUST (name $ daqLbHost $ daqLbUser $ daqLbPasswd $ daqLbDB $ daqLbTable $ shuttleLbTable $ runTypeLbTable $ ppMaxRetries $ ppTimeOut $ ppMaxMem $ monitorHost $ monitorTable)
         MAY ( daqLbPort ) )
 
 

diff --git a/SHUTTLE/schema/slapd.conf b/SHUTTLE/schema/slapd.conf
index 603a1101161daea1f08f30a04a3be9d7e4cec6f1..464e959f1fa7d428070e0b402b02cc9fd53dc6f5 100644 (file)
--- a/SHUTTLE/schema/slapd.conf
+++ b/SHUTTLE/schema/slapd.conf
@@ -1,27 +1,41 @@
+
 #
 # See slapd.conf(5) for details on configuration options.
 # This file should NOT be world readable.
 #
-include                /home/byordano/install/etc/openldap/schema/core.schema
-include                /home/byordano/install/etc/openldap/schema/shuttle.schema
+include                /etc/openldap/schema/core.schema
+include                /etc/openldap/schema/cosine.schema
+include                /etc/openldap/schema/inetorgperson.schema
+include                /etc/openldap/schema/nis.schema
+include         /etc/openldap/schema/shuttle.schema
 
-# Define global ACLs to disable default read access.
+# Allow LDAPv2 client connections.  This is NOT the default.
+#allow bind_v2
 
 # Do not enable referrals until AFTER you have a working directory
 # service AND an understanding of referrals.
 #referral      ldap://root.openldap.org
 
-pidfile                /home/byordano/install/var/run/slapd.pid
-argsfile       /home/byordano/install/var/run/slapd.args
+pidfile                /var/run/slapd.pid
+argsfile       /var/run/slapd.args
 
 # Load dynamic backend modules:
-# modulepath   /home/byordano/install/libexec/openldap
+# modulepath   /usr/sbin/openldap
 # moduleload   back_bdb.la
 # moduleload   back_ldap.la
 # moduleload   back_ldbm.la
 # moduleload   back_passwd.la
 # moduleload   back_shell.la
 
+# The next three lines allow use of TLS for encrypting connections using a
+# dummy test certificate which you can generate by changing to
+# /usr/share/ssl/certs, running "make slapd.pem", and fixing permissions on
+# slapd.pem so that the ldap user or group can read it.  Your client software
+# may balk at self-signed certificates, however.
+# TLSCACertificateFile /usr/share/ssl/certs/ca-bundle.crt
+# TLSCertificateFile /usr/share/ssl/certs/slapd.pem
+# TLSCertificateKeyFile /usr/share/ssl/certs/slapd.pem
+
 # Sample security restrictions
 #      Require integrity protection (prevent hijacking)
 #      Require 112-bit (3DES or better) encryption for updates
@@ -38,9 +52,8 @@ argsfile      /home/byordano/install/var/run/slapd.args
 #      Directives needed to implement policy:
 # access to dn.base="" by * read
 # access to dn.base="cn=Subschema" by * read
-access to *
-       by self write
-       by * read
+# access to *
+#      by self write
 #      by users read
 #      by anonymous auth
 #
@@ -50,20 +63,44 @@ access to *
 #
 # rootdn can always read and write EVERYTHING!
 
+#access to * 
+#  by * read
+#  by anonymous read
+
+allow bind_anon_dn
+allow bind_anon_cred
+#allow bind_anon
+
 #######################################################################
-# BDB database definitions
+# ldbm and/or bdb database definitions
 #######################################################################
 
-database       bdb
-suffix         "dc=alice,dc=cern,dc=ch"
-rootdn         "cn=Manager,dc=alice,dc=cern,dc=ch"
+database       ldbm
+suffix         "dc=cern, dc=ch"
+rootdn         "cn=Manager,dc=cern, dc=ch"
 # Cleartext passwords, especially for the rootdn, should
-# be avoid.  See slappasswd(8) and slapd.conf(5) for details.
+# be avoided.  See slappasswd(8) and slapd.conf(5) for details.
 # Use of strong authentication encouraged.
-rootpw         secret
+# rootpw               secret
+# rootpw               {crypt}ijFYNcSNctBYg
+
 # The database directory MUST exist prior to running slapd AND 
 # should only be accessible by the slapd and slap tools.
 # Mode 700 recommended.
-directory      /home/byordano/install/var/openldap-data
-# Indices to maintain
-index  objectClass     eq
+directory      /var/lib/ldap
+
+# Indices to maintain for this database
+index objectClass                       eq,pres
+index ou,cn,mail,surname,givenname      eq,pres,sub
+index uidNumber,gidNumber,loginShell    eq,pres
+index uid,memberUid                     eq,pres,sub
+index nisMapName,nisMapEntry            eq,pres,sub
+
+# Replicas of this database
+#replogfile /var/lib/ldap/openldap-master-replog
+#replica host=ldap-1.example.com:389 starttls=critical
+#     bindmethod=sasl saslmech=GSSAPI
+#     authcId=host/ldap-master.example.com@EXAMPLE.COM
+
+### shuttle configuration
+rootpw  {SSHA}OztXD9506FAbxxHmZU+/5JDyPKHldGNh