include also default.conf into config repo's configuration

Author: DrDaveD

config-osg.opensciencegrid.org.conf

@@ -1,5 +1,13 @@
 # Other than setting the CVMFS_SERVER_URL, this file copies the logic from
-#  common.conf in the configuration repository
+#  default.conf and common.conf in the configuration repository
+
+if [ -z "$CVMFS_PAC_URLS" ] || [ "$CVMFS_PAC_URLS" = "http://wpad/wpad.dat" ]; then
+  if [ "$(($$ % 2))" -eq 1 ]; then
+    CVMFS_PAC_URLS="http://grid-wpad/wpad.dat;http://wpad/wpad.dat;http://cernvm-wpad.fnal.gov/wpad.dat;http://cernvm-wpad.cern.ch/wpad.dat"
+  else
+    CVMFS_PAC_URLS="http://grid-wpad/wpad.dat;http://wpad/wpad.dat;http://cernvm-wpad.cern.ch/wpad.dat;http://cernvm-wpad.fnal.gov/wpad.dat"
+  fi
+fi
 
 if [ "$CVMFS_CLIENT_PROFILE" = "single" ]; then
   if [ "$CVMFS_HTTP_PROXY" = "" ]; then

rpm/cvmfs-config-osg.spec

@@ -42,8 +42,9 @@ make install-redhat DESTDIR=$RPM_BUILD_ROOT
 %changelog
 * Mon Oct 12 2020 Dave Dykstra <[email protected]> - 2.5-1
 - Update the configuration for the config repo to apply all the logic
-  from the config repo's common.conf.  That is, support USE_CVMFS_CDN
-  and CVMFS_CLIENT_PROFILE.
+  from the config repo's default.conf and common.conf.  That is, support
+  USE_CVMFS_CDN and CVMFS_CLIENT_PROFILE and set default CVMFS_PAC_URLS
+  covering the WLCG Web Proxy Auto Discovery.
 - Reverse the order of the fallback proxies because of the bug in 
   https://sft.its.cern.ch/jira/browse/CVM-1920