Merge pull request #121 from matyasselmeci/pr/SOFTWARE-5449.voms2.fna…

…l.gov Update DN for voms2.fnal.gov to remove OU=Fermilab (SOFTWARE-5449)
opensciencegrid · Feb 13, 2023 · 6cdabed · 6cdabed
2 parents 7aeb888 + a030edd
commit 6cdabed
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 7 deletions.
diff --git a/rpm/vo-client.spec b/rpm/vo-client.spec
@@ -3,7 +3,7 @@
 %define iam 1
 
 Name:           vo-client
-Version:        129
+Version:        130
 Release:        1%{?dist}
 Summary:        Contains vomses file for use with user authentication
 
@@ -84,6 +84,9 @@ find $RPM_BUILD_ROOT/%{_sysconfdir}/grid-security/vomsdir -type d -exec chmod 75
 %config(noreplace) %{_datadir}/osg/grid-vorolemap
 
 %changelog
+* Mon Feb 13 2023 Mátyás Selmeci <[email protected]> - 130-1
+- Update DN for voms2.fnal.gov (SOFTWARE-5449)
+
 * Mon Jan 30 2023 Mátyás Selmeci <[email protected]> - 129-1
 - Update DN for voms1.fnal.gov (SOFTWARE-5449)
 

diff --git a/vomsdir/des/voms2.fnal.gov.lsc b/vomsdir/des/voms2.fnal.gov.lsc
@@ -1,2 +1,2 @@
-/DC=org/DC=incommon/C=US/ST=Illinois/O=Fermi Research Alliance/OU=Fermilab/CN=voms2.fnal.gov
+/DC=org/DC=incommon/C=US/ST=Illinois/O=Fermi Research Alliance/CN=voms2.fnal.gov
 /C=US/O=Internet2/OU=InCommon/CN=InCommon IGTF Server CA
diff --git a/vomsdir/dune/voms2.fnal.gov.lsc b/vomsdir/dune/voms2.fnal.gov.lsc
@@ -1,2 +1,2 @@
-/DC=org/DC=incommon/C=US/ST=Illinois/O=Fermi Research Alliance/OU=Fermilab/CN=voms2.fnal.gov
+/DC=org/DC=incommon/C=US/ST=Illinois/O=Fermi Research Alliance/CN=voms2.fnal.gov
 /C=US/O=Internet2/OU=InCommon/CN=InCommon IGTF Server CA
diff --git a/vomsdir/fermilab/voms2.fnal.gov.lsc b/vomsdir/fermilab/voms2.fnal.gov.lsc
@@ -1,2 +1,2 @@
-/DC=org/DC=incommon/C=US/ST=Illinois/O=Fermi Research Alliance/OU=Fermilab/CN=voms2.fnal.gov
+/DC=org/DC=incommon/C=US/ST=Illinois/O=Fermi Research Alliance/CN=voms2.fnal.gov
 /C=US/O=Internet2/OU=InCommon/CN=InCommon IGTF Server CA
diff --git a/vomses b/vomses
@@ -29,9 +29,9 @@
 "vo.cta.in2p3.fr" "cclcgvomsli01.in2p3.fr" "15008" "/O=GRID-FR/C=FR/O=CNRS/OU=CC-IN2P3/CN=cclcgvomsli01.in2p3.fr" "vo.cta.in2p3.fr"
 "xenon.biggrid.nl" "voms.grid.sara.nl" "30008" "/O=dutchgrid/O=hosts/OU=sara.nl/CN=voms.grid.sara.nl" "xenon.biggrid.nl"
 "fermilab" "voms1.fnal.gov" "15001" "/DC=org/DC=incommon/C=US/ST=Illinois/O=Fermi Research Alliance/CN=voms1.fnal.gov" "fermilab"
-"fermilab" "voms2.fnal.gov" "15001" "/DC=org/DC=incommon/C=US/ST=Illinois/O=Fermi Research Alliance/OU=Fermilab/CN=voms2.fnal.gov" "fermilab"
+"fermilab" "voms2.fnal.gov" "15001" "/DC=org/DC=incommon/C=US/ST=Illinois/O=Fermi Research Alliance/CN=voms2.fnal.gov" "fermilab"
 "des" "voms1.fnal.gov" "15017" "/DC=org/DC=incommon/C=US/ST=Illinois/O=Fermi Research Alliance/CN=voms1.fnal.gov" "des"
-"des" "voms2.fnal.gov" "15017" "/DC=org/DC=incommon/C=US/ST=Illinois/O=Fermi Research Alliance/OU=Fermilab/CN=voms2.fnal.gov" "des"
+"des" "voms2.fnal.gov" "15017" "/DC=org/DC=incommon/C=US/ST=Illinois/O=Fermi Research Alliance/CN=voms2.fnal.gov" "des"
 "ilc" "grid-voms.desy.de" "15110" "/DC=org/DC=terena/DC=tcs/C=DE/ST=Hamburg/O=Deutsches Elektronen-Synchrotron DESY/CN=grid-voms.desy.de" "ilc"
 "lhcb" "lcg-voms2.cern.ch" "15003" "/DC=ch/DC=cern/OU=computers/CN=lcg-voms2.cern.ch" "lhcb"
 "lhcb" "voms2.cern.ch" "15003" "/DC=ch/DC=cern/OU=computers/CN=voms2.cern.ch" "lhcb"
@@ -46,7 +46,7 @@
 "lz" "voms.hep.wisc.edu" "15001" "/DC=org/DC=incommon/C=US/ST=Wisconsin/L=Madison/O=University of Wisconsin-Madison/OU=OCIS/CN=voms.hep.wisc.edu" "lz"
 "lz" "lzvoms.grid.hep.ph.ic.ac.uk" "15001" "/C=UK/O=eScience/OU=Imperial/L=Physics/CN=lzvoms.grid.hep.ph.ic.ac.uk" "lz"
 "dune" "voms1.fnal.gov" "15042" "/DC=org/DC=incommon/C=US/ST=Illinois/O=Fermi Research Alliance/CN=voms1.fnal.gov" "dune"
-"dune" "voms2.fnal.gov" "15042" "/DC=org/DC=incommon/C=US/ST=Illinois/O=Fermi Research Alliance/OU=Fermilab/CN=voms2.fnal.gov" "dune"
+"dune" "voms2.fnal.gov" "15042" "/DC=org/DC=incommon/C=US/ST=Illinois/O=Fermi Research Alliance/CN=voms2.fnal.gov" "dune"
 "supercdms" "voms1.slac.stanford.edu" "16003" "/DC=org/DC=incommon/C=US/ST=California/O=Stanford University/CN=voms1.slac.stanford.edu" "supercdms"
 "supercdms" "voms.slac.stanford.edu" "15001" "/DC=org/DC=incommon/C=US/ST=California/L=Stanford/O=Stanford University/OU=SLAC/CN=voms.slac.stanford.edu" "supercdms"
 "dteam" "voms2.hellasgrid.gr" "15004" "/C=GR/O=HellasGrid/OU=hellasgrid.gr/CN=voms2.hellasgrid.gr" "dteam"