From 9788f38c1158c8c66b3e579be6ad95ba1bad894d Mon Sep 17 00:00:00 2001
From: Kris Moore <kris@pcbsd.org>
Date: Fri, 28 Jun 2013 16:42:12 -0400
Subject: [PATCH] Switch us over to the new PC-BSD CDN

---
 src-sh/libsh/functions.sh                     |  39 ++++++++++++++----
 src-sh/pbi-manager/pbi-manager                |  10 +++--
 src-sh/pbi-manager/repo/pcbsd.rpo             | Bin 976 -> 896 bytes
 src-sh/pc-metapkgmanager/pc-metapkgmanager    |   2 +-
 src-sh/pc-thinclient/pc-thinclient            |   2 +-
 src-sh/warden/scripts/backend/createjail.sh   |   2 +-
 .../warden/scripts/backend/createtemplate.sh  |   2 +-
 src-sh/warden/scripts/backend/functions.sh    |   2 +-
 8 files changed, 44 insertions(+), 15 deletions(-)

diff --git a/src-sh/libsh/functions.sh b/src-sh/libsh/functions.sh
index 44039ae16..906abea08 100755
--- a/src-sh/libsh/functions.sh
+++ b/src-sh/libsh/functions.sh
@@ -46,7 +46,7 @@ download_cache_packages()
   PKGREL=`uname -r | cut -d '-' -f 1-2`
 
   # Where are the packages on our mirrors?
-  pkgUrl="/packages/${PKGREL}/${ARCH}"
+  pkgUrl="/${PKGREL}/${ARCH}"
 
   if [ ! -d "$PKG_CACHEDIR/All" ] ; then
      mkdir -p ${PKG_CACHEDIR}/All
@@ -65,7 +65,7 @@ download_cache_packages()
 	#dSize=`ls -al `
 	rm ${PKG_CACHEDIR}/All/${i} ; 
     fi
-    get_file_from_mirrors "${pkgUrl}/All/${i}" "${PKG_CACHEDIR}/All/${i}"
+    get_file_from_mirrors "${pkgUrl}/All/${i}" "${PKG_CACHEDIR}/All/${i}" "pkg"
     if [ $? -ne 0 ] ; then
       echo "Failed downloading: /${pkgUrl}/All/${i}"
       return 1
@@ -125,23 +125,42 @@ get_aria_mirror_list()
   if [ -z $1 ] ; then
      exit_err "Need to supply file to grab from mirrors..."
   fi
+  if [ -z $2 ] ; then
+     exit_err "Need to supply which mirror to fetch from..."
+  fi
+
+  case $2 in
+    pkg) mirrorTag="PKG_MIRROR" 
+         mirrorFile="/usr/local/share/pcbsd/conf/pkg-mirror"
+         ;;
+    pbi) mirrorTag="PBI_MIRROR" 
+         mirrorFile="/usr/local/share/pcbsd/conf/pbi-mirror"
+         ;;
+    iso) mirrorTag="ISO_MIRROR" 
+         mirrorFile="/usr/local/share/pcbsd/conf/iso-mirror"
+         ;;
+  update) mirrorTag="UPDATE_MIRROR" 
+         mirrorFile="/usr/local/share/pcbsd/conf/update-mirror"
+         ;;
+    *) exit_err "Bad mirror type!" ;;
+  esac
 
   # Set the mirror URL
-  local VAL="`cat ${PCBSD_ETCCONF} 2>/dev/null | grep 'PCBSD_MIRROR: ' | sed 's|PCBSD_MIRROR: ||g'`"
+  local VAL=`cat ${PCBSD_ETCCONF} 2>/dev/null | grep "^${mirrorTag}:" | sed "s|^${mirrorTag}: ||g"`
   if [ -n "$VAL" ] ; then
      echo "${VAL}${1}"
      return
   fi
 
-  if [ ! -e "/usr/local/share/pcbsd/conf/pcbsd-mirrors" ] ; then
-     exit_err "Missing mirror list: /usr/local/share/pcbsd/conf/pcbsd-mirrors"
+  if [ ! -e "${mirrorFile}" ] ; then
+     exit_err "Missing mirror list: ${mirrorFile}"
   fi
 
   # Build the mirror list
   while read line
   do
     VAL="$VAL ${line}${1}"
-  done < /usr/local/share/pcbsd/conf/pcbsd-mirrors
+  done < ${mirrorFile}
   echo ${VAL}
 }
 
@@ -152,6 +171,12 @@ get_file_from_mirrors()
 {
    _rf="${1}"
    _lf="${2}"
+   _mtype="${3}"
+
+   case $_mtype in
+      iso|pbi|pkg|update) ;;
+      *) exit_err "Fixme! Missing mirror type in get_file_from_mirrors" ;;
+   esac
 
    # Get any proxy information
    . /etc/profile
@@ -175,7 +200,7 @@ get_file_from_mirrors()
    touch $aStatFile
 
    # Get mirror list
-   local mirrorList="$(get_aria_mirror_list $1)"
+   local mirrorList="$(get_aria_mirror_list ${_rf} ${_mtype})"
    
    # Running from a non GUI?
    if [ "$GUI_FETCH_PARSING" != "YES" -a "$PBI_FETCH_PARSING" != "YES" -a -z "$PCFETCHGUI" ] ; then
diff --git a/src-sh/pbi-manager/pbi-manager b/src-sh/pbi-manager/pbi-manager
index cb080d8c2..ae4dae8bb 100755
--- a/src-sh/pbi-manager/pbi-manager
+++ b/src-sh/pbi-manager/pbi-manager
@@ -5501,8 +5501,12 @@ pbi_update_dl() {
 	# Start download from repos mirror(s) in order
 	for _cMirror in $_mirrorList
 	do
-		if [ "$_cMirror" = "PCBSDCDN" ] ; then
-			get_file_from_mirrors "${_uFile}" "$_dl_loc"
+		if [ "$_cMirror" = "PCBSDCDN" -o "$_cMirror" = "http://pbi.cdn.pcbsd.org" ] ; then
+
+			# Strip the /PBI from the mirror URL
+			_uFile="`echo ${_uFile} | sed 's|^/PBI||g'`"
+			
+			get_file_from_mirrors "${_uFile}" "$_dl_loc" "pbi"
 			if [ "$?" != "0" ]  ; then 
 				rm "${_dl_loc}" >/dev/null 2>/dev/null
 				echo "Download Failed: ${_furl}"
@@ -6948,7 +6952,7 @@ mk_chroot_file() {
           for i in $dFiles
           do
             echo "Downloading /${SYSVER}/${ARCH}/dist/${i} ..."
-            get_file_from_mirrors "/${SYSVER}/${ARCH}/dist/${i}" "${i}"
+            get_file_from_mirrors "/${SYSVER}/${ARCH}/dist/${i}" "${i}" "iso"
             [ $? -ne 0 ] && exit_err "Error while downloading the freebsd world."
           done
 
diff --git a/src-sh/pbi-manager/repo/pcbsd.rpo b/src-sh/pbi-manager/repo/pcbsd.rpo
index 19722495593d91e6a7203f0ae7af01dd8899d528..c2e6fbd9fe66d280bf980ac3551235f954561e72 100644
GIT binary patch
literal 896
zcmV-`1AqJ<iwFRK@y$^H1MStxj-y5ZfZ;jw6uw(Mh60QoDTjh)HDJKFZMcDL_I<}s
zKkiO6iY7|>5Ot5Dsqaz}AXS0tr<z+;K3#9^<;%yxaePfti^oVXH1XH*Pb9e@2pRyI
z!5Io)-~?Dx^p^$xfouA%Z#%DfEG2E?_TQd+@BSZeviLs!PwayrzQkU(Ft{i7@Vu}d
z`=O1yvYD};y)@(#G_U>VanqE|ht2VB{{*oh0I?=X2B+7r{gZ%1{eKFBdsNRo>!|i$
z(_8<2lYQhI@1Os~kLN!P7}Wn~h`O%&ZMEvFtJmGWR(^bqo3EELNB@Ig!)yQPZT{M}
zANLD*^uW;cKlV>hB>qGHB%o0LpW^8i%ZswUFpjJ$bBi7Cyj{dJS>_}g>TH<SQ5uWe
z5oe*v3lQ!(7?$w$K5Onc7>sZY+%XMbv>@(5F;>}`OB#&h%e&-+(LfHRQJhv(pnD=7
z9GlE$ZH*U|36e7qt2XF}4d^cC%W;{wgb-fZNaBHkX_Xu}CxVEIkk5^drPQL`MR(jy
zE>jx&<7sP4oaWjJ=^SzDc{3^gN$P{)D2}UWl59*mNx^<@LxsH`H><O#Zl~oE_+ZCf
z)oc*m)0OKgeL4zTqVC~bM$jTkc49_X$eNJcW3z3WOYTKz>}%ID#Eqs%cJ1&{kk$!b
zf@OZ^z3~kEwsB8z3S#qCy}ZOnXS{`zHTDiB<^u2rXm1N?mwHl_hX*3(880+R%~FP~
z4E!#DU7Z!Zp4G*yX}5^(+0yOhAPJ5Vwl8(f%Af<1V8><3-13K^cIVOx=ZkZ=ULjaV
zalIDR;<Bd)M({i(8`o*ckM+!0kikYF4@!Bj`jSXThRji_ZlpD7)MAMjlj7(pe(>a;
z9Js*uj9djJ9^Ms-0LhBZL0V%&<Ix+1O2tr8@ohy$k8gP%t>G44t4vDVX6J0A3~*G+
zX~9|C_q`n~1BX=OR@gCKj`1*&h!yQDIZ`rRdnYNI#`Jx&+YL;0Z_6>TMJF^F?cP{y
zzcrPO)SaC;R{4W0he?H%z-KwZak*AV!c>N=$3r*PDsZ2fsh!WII$Q^{eb&YU;250(
z8=fkdPL+)2Cc7I2t8DzdvKU)0))y+REf{Jng#7Q=+fL{8=f7?KpWP*bAP9mW2!bF8
Wf*=TjAP9o|7vBJum9H-VC;$K>*2W9~

literal 976
zcmV;>126m^iwFQ)kBLwK1MSz#bD~Hb2k@NvE4*8g?gm7+Y7an=hk!4P!VOR!g7OCO
zuOB8!WoKt=HYYQ+oBkZ6<OkIa-QTtykq>tV0ALwr&>tboz#otA1`q)nQT=rQ4FH6Y
zMGph!{#|=`sLRSJ`mV%9RQ}s_AJyNU<Nf#_F(Qj&mOh@NqDYH7wb8$iF-`w^{2|T$
zHU4nik3U5N_%Hx>>d)VN@$p{@{N_n`G6=uQ{vgTMc~Fj`(i^2kKxVZ|W}aIf-s=75
z=;ix+_4SUoa(`mvB*~BU*SmlBV`9JXmjAj)?$^dg`3DpnK*%7(uz;mOpMNwS(>VX1
zA*^14TW1HSI*u|oIz+|DOV2p5U&Cwu<6}1}%X=*WAMF1iO@W{C-~ayO{C|qa?|4yC
zjKOltYl<+Ki`L6YLRS<)HaUY2;yjEaY1#swTZuD{TL@f`a^LIxYA$eo%Z-uU#=*1h
zM>V>%S+W;S1tEy(O}2utp_+7g*^#twI1=!;MPl-%E=uZ^qdFvIrC-4bs=U3o9iD7B
z3%oLvMYJUJO!2K9gyAI+&&!IZwM#h<Z@@lz*En+9-PDu?-8NOq+5-A%a#h`(T>H&d
zYRT{_n}ocR{Y6&>Du3Hf$i1XZufrj7(OfuaNh8_2gHUD0bvv8Fyym(z<km3duWW12
zk|LlML}!|-q3}E_%tKYO@W{{<KeoiskMon5qT%@_I_)00Wnu5Qs~@e7+4FO>wc2BF
zUAMJGNaq=H8qS<v<azAK**Vz2v&cHZiqh9=GgXjV`COGJm)c13OQ-9{kg569t`+~}
zZ)IYU8u~inEOhecLZWu1xM^~`OV>f?S)0RwL*p>Y$C7sO7EHs=97j#sah!^6-mz<r
zCED59PnCt{$`TVU6@k`_Wt>yXTuQ;^s#-=2HjYwLjo`b^@~oj01UHq2=tMGS6z4=!
zILt()V=0g|FwLm2f0z4q-5i5MmdGc&m|GJ$K>{5My1$neb#3}X-=egroXuJ1Oo-e`
zh9qMR1xjAo=3G`M#maS8)x2S|TbZ`LDOtga)o;a`ucs?@B3FAWiZpSfD8VTsQsnZ&
z%(8`Yb_!yJ;~kN+BRxa6j=h%MKGm8-vnrqTc7p`gpwUF6FKngB%i^fm6P3tJuqW57
zX<Wu09p`H<(0Ps%|0G^!x@bK8WAgv*Tz;0f{omnOdUtE%<NY7?^ZE|}!t4KMSonVA
yMNTqU3XlCi!NIzp4P{iNMfYVQfMFPhVHk#C7=~dOhG7`?zw`|fR3T6RC;$Kn>G#b5

diff --git a/src-sh/pc-metapkgmanager/pc-metapkgmanager b/src-sh/pc-metapkgmanager/pc-metapkgmanager
index 01bb8ff68..ef64c64fd 100644
--- a/src-sh/pc-metapkgmanager/pc-metapkgmanager
+++ b/src-sh/pc-metapkgmanager/pc-metapkgmanager
@@ -335,7 +335,7 @@ get_file_dl()
       dlOut="`basename $2`"
       dlPath="$2"
    fi
-   get_file_from_mirrors "$dlPath" "$dlOut"
+   get_file_from_mirrors "$dlPath" "$dlOut" "iso"
    exit $?
 }
 
diff --git a/src-sh/pc-thinclient/pc-thinclient b/src-sh/pc-thinclient/pc-thinclient
index 3bfc7d0f4..c6e48cbfc 100644
--- a/src-sh/pc-thinclient/pc-thinclient
+++ b/src-sh/pc-thinclient/pc-thinclient
@@ -269,7 +269,7 @@ check_world() {
   do
     echo "Downloading ${MIRRORURL}/${SYSVER}/${ARCH}/dist/${i} ..."
     
-    get_file_from_mirrors "/${SYSVER}/${ARCH}/dist/${i}" "$i"
+    get_file_from_mirrors "/${SYSVER}/${ARCH}/dist/${i}" "$i" "iso"
     [ $? -ne 0 ] && exit_err "Error while downloading the freebsd world."
   done
 
diff --git a/src-sh/warden/scripts/backend/createjail.sh b/src-sh/warden/scripts/backend/createjail.sh
index f790d443c..64d5eb375 100755
--- a/src-sh/warden/scripts/backend/createjail.sh
+++ b/src-sh/warden/scripts/backend/createjail.sh
@@ -245,7 +245,7 @@ then
   mkdir -p "${JAILDIR}/usr/src"
   cd ${JAILDIR}
   SYSVER="$(uname -r | cut -d '-' -f 1-2)"
-  get_file_from_mirrors "/${SYSVER}/${ARCH}/dist/src.txz" "src.txz"
+  get_file_from_mirrors "/${SYSVER}/${ARCH}/dist/src.txz" "src.txz" "iso"
   if [ $? -ne 0 ] ; then
     echo "Error while downloading the freebsd world."
   else
diff --git a/src-sh/warden/scripts/backend/createtemplate.sh b/src-sh/warden/scripts/backend/createtemplate.sh
index 5736e2c2e..6af647f4f 100755
--- a/src-sh/warden/scripts/backend/createtemplate.sh
+++ b/src-sh/warden/scripts/backend/createtemplate.sh
@@ -22,7 +22,7 @@ download_template_files() {
   if [ -n "$TRUEOSVER" ] ; then
      for f in $DFILES
      do
-       get_file_from_mirrors "/${TRUEOSVER}/${FBSDARCH}/dist/$f" "${JDIR}/.download/$f"
+       get_file_from_mirrors "/${TRUEOSVER}/${FBSDARCH}/dist/$f" "${JDIR}/.download/$f" "iso"
        if [ $? -ne 0 ] ; then
          exit_err "Failed downloading: /${TRUEOS}/${FBSDARCH}/dist/${f}"
        fi
diff --git a/src-sh/warden/scripts/backend/functions.sh b/src-sh/warden/scripts/backend/functions.sh
index 9016be194..5a2928d3a 100755
--- a/src-sh/warden/scripts/backend/functions.sh
+++ b/src-sh/warden/scripts/backend/functions.sh
@@ -822,7 +822,7 @@ bootstrap_pkgng()
   chmod 755 "${jaildir}/bootstrap-pkgng"
 
   if [ -e "pkg.txz" ] ; then rm pkg.txz ; fi
-  get_file_from_mirrors "/packages/${release}/${arch}/Latest/pkg.txz" "pkg.txz"
+  get_file_from_mirrors "/${release}/${arch}/Latest/pkg.txz" "pkg.txz" "pkg"
   if [ $? -eq 0 ] ; then
     chroot ${jaildir} /bootstrap-pkgng
     if [ $? -eq 0 ] ; then