Merge pull request #12 from edquist/SOFTWARE-2643

VO Package 72 updates

edg-mkgridmap.config

@@ -46,9 +46,6 @@ group vomss://voms2.cern.ch:8443/voms/geant4 geant4
 # USER-VO-MAP osg OSG -- 23 -- Rob Quick ([email protected])    
 group vomss://voms.opensciencegrid.org:8443/voms/osg osg
 #-------------------
-# USER-VO-MAP osgedu OSGEDU -- 24 -- Rob Quick ([email protected])    
-group vomss://voms.grid.iu.edu:8443/voms/osgedu osgedu
-#-------------------
 # USER-VO-MAP ops OPS -- 26 -- Rob Quick ([email protected])    
 group vomss://voms2.cern.ch:8443/voms/ops ops
 #-------------------
@@ -79,9 +76,6 @@ group vomss://hcc-voms.unl.edu:8443/voms/hcc hcc
 #USER-VO-MAP belle belle - 44 - Tom Fifeld ([email protected])
 group vomss://voms.cc.kek.jp:8443/voms/belle belle 
 #-------------------
-#USER-VO-MAP csiu csiu - 45 - Rob Quick ([email protected])
-group vomss://voms.grid.iu.edu:8443/voms/CSIU csiu 
-#-------------------
 #USER-VO-MAP suragrid SURAGrid - 46 - Alan Sill ([email protected])
 group vomss://voms.hpcc.ttu.edu:8443/voms/suragrid suragrid
 #-------------------

gums.config.template

@@ -355,16 +355,6 @@
 			sslKeyPasswd=''
 			sslCAFiles='/etc/grid-security/certificates/*.0'/>
 
-		<vomsServer
-			name='osgedu'
-			description=''
-			persistenceFactory='mysql'
-			baseUrl='https://voms.grid.iu.edu:8443/voms/osgedu'
-			sslKey='/etc/grid-security/http/httpkey.pem'
-			sslCertfile='/etc/grid-security/http/httpcert.pem'
-			sslKeyPasswd=''
-			sslCAFiles='/etc/grid-security/certificates/*.0'/>
-
 		<vomsServer
 			name='project8'
 			description=''
@@ -981,15 +971,6 @@
 			acceptProxyWithoutFQAN='true'
 			voGroup='/osg'/>
 
-		<vomsUserGroup
-			name='osgedu'
-			access='read self'
-			description=''
-			vomsServer='osgedu'
-			matchFQAN='vo'
-			acceptProxyWithoutFQAN='true'
-			voGroup='/osgedu'/>
-
 		<vomsUserGroup
 			name='project8'
 			access='read self'
@@ -1317,11 +1298,6 @@
 			description=''
 			accountName='osg'/>
 
-		<groupAccountMapper
-			name='osgedu'
-			description=''
-			accountName='osgedu'/>
-
 		<groupAccountMapper
 			name='project8'
 			description=''
@@ -1828,14 +1804,6 @@
 			userGroups='osg'
 			accountMappers='osg'/>
 
-		<groupToAccountMapping
-			name='osgedu'
-			description=''
-			accountingVoSubgroup='osgedu'
-			accountingVo='OSGEDU'
-			userGroups='osgedu'
-			accountMappers='osgedu'/>
-
 		<groupToAccountMapping
 			name='project8'
 			description=''
@@ -1953,7 +1921,7 @@
 	<hostToGroupMappings>
 
 		<hostToGroupMapping
-			groupToAccountMappings='cdf-fnal, cdfdev-fnal, cdffgrid-fnal, cdfnam-fnal, cdftestcaf-fnal, fermilab, mis, star, uscmsuser, cmsuser, uscmst2admin, uscmssoft, cmssoft, uscmsprod, uscmsphedex, cmsphedex2, uscmsfrontier, cmsuser-null, cmsproduction, LIGO, dzerouser, dzeroana, dzeroservice, dosar, des, glow, nanohub, geant4, geant4-lcgadmin, osg, newUsatlasProd, newUsatlasSoft, newUsatlas, newAtlas, osgedu, ops, des-production, ilc, sbgrid, cigi, icecube, alice, gluex, gridunesp, hcc, belle, bellepro, suragrid, gcvo, gcedu, dream, lsst, lqcd, auger, glast.org, enmr.eu, vo.cta.in2p3.fr, xenon.biggrid.nl, snoplus.snolab.ca, LZ, dune, dune-production, duneana, dunegli, project8, project8_prod, miniclean, miniclean_prod'
+			groupToAccountMappings='cdf-fnal, cdfdev-fnal, cdffgrid-fnal, cdfnam-fnal, cdftestcaf-fnal, fermilab, mis, star, uscmsuser, cmsuser, uscmst2admin, uscmssoft, cmssoft, uscmsprod, uscmsphedex, cmsphedex2, uscmsfrontier, cmsuser-null, cmsproduction, LIGO, dzerouser, dzeroana, dzeroservice, dosar, des, glow, nanohub, geant4, geant4-lcgadmin, osg, newUsatlasProd, newUsatlasSoft, newUsatlas, newAtlas, ops, des-production, ilc, sbgrid, cigi, icecube, alice, gluex, gridunesp, hcc, belle, bellepro, suragrid, gcvo, gcedu, dream, lsst, lqcd, auger, glast.org, enmr.eu, vo.cta.in2p3.fr, xenon.biggrid.nl, snoplus.snolab.ca, LZ, dune, dune-production, duneana, dunegli, project8, project8_prod, miniclean, miniclean_prod'
 			description=''
 			cn='*/?*.@DOMAINNAME@'/>
 

vomses

@@ -12,14 +12,12 @@
 "SBGrid" "hpc.sbgrid.org" "15002" "/DC=org/DC=opensciencegrid/O=Open Science Grid/OU=Services/CN=hpc.sbgrid.org" "SBGrid"
 "CIGI" "voms.cigi.uiuc.edu" "15001" "/DC=org/DC=opensciencegrid/O=Open Science Grid/OU=Services/CN=voms.cigi.uiuc.edu" "cigi"
 "mis" "voms.grid.iu.edu" "15001" "/DC=org/DC=opensciencegrid/O=Open Science Grid/OU=Services/CN=voms.grid.iu.edu" "mis"
-"osgedu" "voms.grid.iu.edu" "15003" "/DC=org/DC=opensciencegrid/O=Open Science Grid/OU=Services/CN=voms.grid.iu.edu" "osgedu"
 "icecube" "grid-voms.desy.de" "15109" "/C=DE/O=GermanGrid/OU=DESY/CN=host/grid-voms.desy.de" "icecube"
 "alice" "voms2.cern.ch" "15000" "/DC=ch/DC=cern/OU=computers/CN=voms2.cern.ch" "alice"
 "Gluex" "gryphn.phys.uconn.edu" "15014" "/DC=org/DC=opensciencegrid/O=Open Science Grid/OU=Services/CN=voms/gryphn.phys.uconn.edu" "Gluex"
 "GridUNESP" "voms.grid.unesp.br" "15000" "/C=BR/O=ANSP/OU=ANSPGrid CA/OU=Services/CN=voms.grid.unesp.br" "GridUNESP"
 "hcc" "hcc-voms.unl.edu" "15000" "/DC=org/DC=opensciencegrid/O=Open Science Grid/OU=Services/CN=hcc-voms.unl.edu" "hcc"
 "belle" "voms.cc.kek.jp" "15020" "/C=JP/O=KEK/OU=CRC/CN=host/voms.cc.kek.jp" "belle"
-"CSIU" "voms.grid.iu.edu" "15008" "/DC=org/DC=opensciencegrid/O=Open Science Grid/OU=Services/CN=voms.grid.iu.edu" "CSIU"
 "suragrid" "voms.hpcc.ttu.edu" "15003" "/DC=org/DC=opensciencegrid/O=Open Science Grid/OU=Services/CN=voms.hpcc.ttu.edu" "suragrid"
 "gcvo" "gc-voms.javeriana.edu.co" "15002" "/DC=org/DC=doegrids/OU=Services/CN=gc-voms.javeriana.edu.co" "gcvo"
 "gcedu" "gc-voms.javeriana.edu.co" "15001" "/DC=org/DC=doegrids/OU=Services/CN=gc-voms.javeriana.edu.co" "gcedu"
@@ -46,6 +44,7 @@
 "lqcd" "voms2.fnal.gov" "15024" "/DC=org/DC=opensciencegrid/O=Open Science Grid/OU=Services/CN=voms2.fnal.gov" "lqcd"
 "osg" "voms1.opensciencegrid.org" "15027" "/DC=org/DC=opensciencegrid/O=Open Science Grid/OU=Services/CN=voms1.opensciencegrid.org" "osg"
 "osg" "voms2.opensciencegrid.org" "15027" "/DC=org/DC=opensciencegrid/O=Open Science Grid/OU=Services/CN=voms2.opensciencegrid.org" "osg"
+"osg" "voms.grid.iu.edu" "15027" "/DC=org/DC=opensciencegrid/O=Open Science Grid/OU=Services/CN=voms.grid.iu.edu" "osg"
 "snoplus.snolab.ca" "voms.gridpp.ac.uk" "15503" "/C=UK/O=eScience/OU=Manchester/L=HEP/CN=voms.gridpp.ac.uk" "snoplus.snolab.ca"
 "lz" "voms.hep.wisc.edu" "15001" "/DC=org/DC=opensciencegrid/O=Open Science Grid/OU=Services/CN=voms.hep.wisc.edu" "lz"
 "dune" "voms1.fnal.gov" "15042" "/DC=org/DC=opensciencegrid/O=Open Science Grid/OU=Services/CN=voms1.fnal.gov" "dune"