Merge pull request #10 from DrDaveD/update-to-2.4

Add openhtc.io aliases for direct proxies

Author: DrDaveD

config-osg.opensciencegrid.org.conf

@@ -1 +1,6 @@
-CVMFS_SERVER_URL="http://cvmfs-s1bnl.opensciencegrid.org:8000/cvmfs/@fqrn@;http://cvmfs-s1fnal.opensciencegrid.org:8000/cvmfs/@fqrn@;http://cvmfs-s1goc.opensciencegrid.org:8000/cvmfs/@fqrn@"
+if [ "$CVMFS_HTTP_PROXY" = "DIRECT" ] || [ "$CVMFS_HTTP_PROXY" = "auto;DIRECT" ]; then
+    CVMFS_SERVER_URL="http://s1bnl-cvmfs.openhtc.io/cvmfs/@fqrn@;http://s1fnal-cvmfs.openhtc.io/cvmfs/@fqrn@;http://s1osggoc-cvmfs.openhtc.io/cvmfs/@fqrn@"
+    CVMFS_FALLBACK_PROXY=""
+else
+    CVMFS_SERVER_URL="http://cvmfs-s1bnl.opensciencegrid.org:8000/cvmfs/@fqrn@;http://cvmfs-s1fnal.opensciencegrid.org:8000/cvmfs/@fqrn@;http://cvmfs-s1goc.opensciencegrid.org:8000/cvmfs/@fqrn@"
+fi

debian/cvmfs-config-osg.dsc

@@ -1,7 +1,7 @@
 # created by obsupdate.sh, do not edit by hand
-Debtransform-Tar: cvmfs-config-osg-2.3.tar.gz
+Debtransform-Tar: cvmfs-config-osg-2.4.tar.gz
 Format: 1.0
-Version: 2.3.1
+Version: 2.4.1
 Binary: cvmfs-config-osg
 Source: cvmfs-config-osg
 Maintainer: Dave Dykstra <dwd@fnal.gov>

rpm/cvmfs-config-osg.spec

@@ -1,6 +1,6 @@
 Summary: CernVM File System OSG Configuration and Public Keys
 Name: cvmfs-config-osg
-Version: 2.3
+Version: 2.4
 Release: 1%{?dist}
 # download with:
 # $ curl -L -o cvmfs-config-osg-%{version}.tar.gz \
@@ -39,6 +39,10 @@ make install-redhat DESTDIR=$RPM_BUILD_ROOT
 %config %{_sysconfdir}/cvmfs/config.d/*
 
 %changelog
+* Tue Jul 23 2019 Dave Dykstra <dwd@fnal.gov> - 2.4-1
+- Change the server urls for the config-osg repository to use openhtc.io
+  aliases when the proxy url can use DIRECT.
+
 * Fri Feb 23 2018 Dave Dykstra <dwd@fnal.gov> - 2.3-1
 - Change the changelog date on version 2.0.3 from Feb 28 2017 to
   May 28 2017 because osg-build complained about non-descending order