diff --git a/Federation/create_allow-list.sh b/Federation/create_allow-list.sh index f1b5289..548e8af 100755 --- a/Federation/create_allow-list.sh +++ b/Federation/create_allow-list.sh @@ -48,16 +48,9 @@ fi #cat $FEDINFO/in/prod.txt | cut -d : -f1 | sort -u | awk -F. '{if ($NF == "uk" || $NF == "fr" || $NF == "it" || $(NF-1) == "cern" ) print $(NF-2)"."$(NF-1)"."$NF; else if ( $(NF-1) == "vanderbilt" ) print $(NF-3)"."$(NF-2)"."$(NF-1)"."$NF; else if ( $(NF-1) == "mit" ) print $(NF-2)"."$(NF-1)"."$NF; else print $(NF-1)"."$NF}' | sort -u > $FEDINFO/in/prod_domain.txt -#Quick fix for "[" character in prod.txt -cat $FEDINFO/in/prod.txt | awk '{ if ($1 == "[") print "Unknown.Host"; else print $1;}' > $FEDINFO/in/tmp -cp $FEDINFO/in/tmp $FEDINFO/in/prod.txt -rm $FEDINFO/in/tmp - - - cat $FEDINFO/in/prod.txt | sort -u | awk -F. '{if ($NF == "uk" && $(NF-2) != "rl" || $NF == "fr" || $(NF-1) == "cern" || $(NF-1) == "fnal" ) print $(NF-2)"."$(NF-1)"."$NF; else if ( $(NF-2) == "cnaf") print $(NF-4)"."$(NF-2); else if ( $NF == "it" && $(NF-2) != "cnaf" ) print $(NF-2)"."$(NF-1)"."$NF; else if ( $(NF-1) == "vanderbilt" ) print $(NF-3)"."$(NF-2)"."$(NF-1)"."$NF; else if ( $(NF-1) == "mit" ) print $(NF-2)"."$(NF-1)"."$NF; else if ( $(NF-2) == "rl" ) print $(NF-3)"."$(NF-2)"."$(NF-1)"."$NF; else if ( $NF == "kr") print $(NF-3)"."$(NF-2)"."$(NF-1)"."$NF; else if ( $NF == "be" ) print $(NF-2)"."$(NF-1)"."$NF; else print $(NF-1)"."$NF}' | sort -u > $FEDINFO/in/prod_domain.txt -cat $FEDINFO/in/trans.txt | cut -d : -f1 | sort -u | awk -F. '{if ($NF == "uk" || $NF == "fr" || $NF == "kr" ) print $(NF-2)"."$(NF-1)"."$NF; else if ($NF == "it" && $(NF-2) == "cnaf" ) print $(NF-4)"."$(NF-3)"."$(NF-2)"."$(NF-1)"."$NF; else if ( $(NF-2) == "ts" ) print $(NF-3)"."$(NF-2)"."$(NF-1)"."$NF; else print $(NF-1)"."$NF}' | sort -u > $FEDINFO/in/trans_domain.txt +cat $FEDINFO/in/trans.txt | cut -d : -f1 | sort -u | awk -F. '{if ($NF == "uk" || $NF == "fr" || $NF == "kr" || $NF == "it" && $(NF-2) != "cnaf" ) print $(NF-2)"."$(NF-1)"."$NF; else if ($NF == "it" && $(NF-2) == "cnaf" ) print $(NF-4)"."$(NF-3)"."$(NF-2)"."$(NF-1)"."$NF; else print $(NF-1)"."$NF}' | sort -u > $FEDINFO/in/trans_domain.txt exit 0; diff --git a/Federation/exceptions.json b/Federation/exceptions.json index adfb02a..92d0d23 100644 --- a/Federation/exceptions.json +++ b/Federation/exceptions.json @@ -19,11 +19,11 @@ "VOname" : "T2_US_Nebraska" }, - "ds-05-01.cr.cnaf.infn.it" : { + "ds-t3-01.cr.cnaf.infn.it" : { "VOname" : "T3_IT_Bologna" }, - "ds-05-02.cr.cnaf.infn.it" : { + "ds-t3-02.cr.cnaf.infn.it" : { "VOname" : "T3_IT_Bologna" }, @@ -65,6 +65,27 @@ "cmsxrd.ts.infn.it" : { "VOname" : "T3_IT_Trieste" + }, + + "se11.accre.vanderbilt.edu" : { + "VOname" : "T2_US_Vanderbilt" + }, + + "se9.accre.vanderbilt.edu" : { + "VOname" : "T2_US_Vanderbilt" + }, + + "se1.accre.vanderbilt.edu" : { + "VOname" : "T2_US_Vanderbilt" + }, + + "se4.accre.vanderbilt.edu" : { + "VOname" : "T2_US_Vanderbilt" + }, + + "se8.accre.vanderbilt.edu" : { + "VOname" : "T2_US_Vanderbilt" } + }