Skip to content

Commit c594c97

Browse files
committed
Try to be smarter when guessing the CMS web proxy.
1 parent 6c54be6 commit c594c97

File tree

1 file changed

+12
-4
lines changed

1 file changed

+12
-4
lines changed

lobster/cmssw/data/wrapper.sh

+12-4
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,20 @@ else
4040
&& -f /cvmfs/grid.cern.ch/3.2.11-1/etc/profile.d/grid-env.sh \
4141
&& -f /cvmfs/cms.cern.ch/SITECONF/local/JobConfig/site-local-config.xml) ]]; then
4242
if [ -f /etc/cvmfs/default.local ]; then
43-
cvmfsproxy=$(awk -F = '/PROXY/ {print $2}' /etc/cvmfs/default.local|sed 's/"//g')
44-
echo ">>> using CVMFS proxy: $cvmfsproxy"
43+
echo
44+
echo ">>> trying to get proxy out of"
45+
echo "---8<---"
46+
cat /etc/cvmfs/default.local
47+
echo "--->8---"
48+
echo
49+
cvmfsproxy=$(cat /etc/cvmfs/default.local|perl -ne '$file = ""; while (<>) { s/\\\n//; $file .= $_ }; my $proxy = (grep /PROXY/, split("\n", $file))[0]; $proxy =~ s/^.*="?|"$//g; print $proxy;')
50+
# cvmfsproxy=$(awk -F = '/PROXY/ {print $2}' /etc/cvmfs/default.local|sed 's/"//g')
51+
echo ">>> found CVMFS proxy: $cvmfsproxy"
4552
export HTTP_PROXY=${HTTP_PROXY:-$cvmfsproxy}
46-
else
47-
export HTTP_PROXY=${HTTP_PROXY:-http://ndcms.crc.nd.edu:3128}
4853
fi
54+
55+
export HTTP_PROXY=${HTTP_PROXY:-http://ndcms.crc.nd.edu:3128;DIRECT}
56+
echo ">>> using CVMFS proxy: $HTTP_PROXY"
4957
export VO_CMS_SW_DIR=/cvmfs/cms.cern.ch
5058

5159
# These are allowed to be modified via the environment

0 commit comments

Comments
 (0)