Purge old squid to clean config and upgrade squidclient

[chef.git] / cookbooks / geodns / templates / default / config.erb

diff --git a/cookbooks/geodns/templates/default/config.erb b/cookbooks/geodns/templates/default/config.erb
index 87539febf9ef57ba1ba42a838a4a4423e80b13f6..cb17fd5796ae170860886504b294f2fefbd2ff6d 100644 (file)
--- a/cookbooks/geodns/templates/default/config.erb
+++ b/cookbooks/geodns/templates/default/config.erb
@@ -3,7 +3,7 @@ plugins => {
     maps => {
       country => {
         geoip_db => /usr/share/GeoIP/GeoIPv6.dat
-        datacenters => [ad,ae,af,ag,ai,al,am,ao,aq,ar,as,at,au,aw,ax,az,ba,bb,bd,be,bf,bg,bh,bi,bj,bl,bm,bn,bo,bq,br,bs,bt,bv,bw,by,bz,ca,cc,cd,cf,cg,ch,ci,ck,cl,cm,cn,co,cr,cu,cv,cw,cx,cy,cz,de,dj,dk,dm,do,dz,ec,ee,eg,eh,er,es,et,fi,fj,fk,fm,fo,fr,ga,gb,gd,ge,gf,gg,gh,gi,gl,gm,gn,gp,gq,gr,gs,gt,gu,gw,gy,hk,hm,hn,hr,ht,hu,id,ie,il,im,in,io,iq,ir,is,it,je,jm,jo,jp,ke,kg,kh,ki,km,kn,kp,kr,kw,ky,kz,la,lb,lc,li,lk,lr,ls,lt,lu,lv,ly,ma,mc,md,me,mf,mg,mh,mk,ml,mm,mn,mo,mp,mq,mr,ms,mt,mu,mv,mw,mx,my,mz,na,nc,ne,nf,ng,ni,nl,no,np,nr,nu,nz,om,pa,pe,pf,pg,ph,pk,pl,pm,pn,pr,ps,pt,pw,py,qa,re,ro,rs,ru,rw,sa,sb,sc,sd,se,sg,sh,si,sj,sk,sl,sm,sn,so,sr,st,sv,sx,sy,sz,tc,td,tf,tg,th,tj,tk,tl,tm,tn,to,tr,tt,tv,tw,tz,ua,ug,um,us,uy,uz,va,vc,ve,vg,vi,vn,vu,wf,ws,xx,ye,yt,za,zm,zw]
+        datacenters => [ad,ae,af,ag,ai,al,am,ao,aq,ar,as,at,au,aw,ax,az,ba,bb,bd,be,bf,bg,bh,bi,bj,bl,bm,bn,bo,br,bs,bt,bv,bw,by,bz,ca,cc,cd,cf,cg,ch,ci,ck,cl,cm,cn,co,cr,cu,cv,cx,cy,cz,de,dj,dk,dm,do,dz,ec,ee,eg,eh,er,es,et,fi,fj,fk,fm,fo,fr,ga,gb,gd,ge,gf,gg,gh,gi,gl,gm,gn,gp,gq,gr,gs,gt,gu,gw,gy,hk,hm,hn,hr,ht,hu,id,ie,il,im,in,io,iq,ir,is,it,je,jm,jo,jp,ke,kg,kh,ki,km,kn,kp,kr,kw,ky,kz,la,lb,lc,li,lk,lr,ls,lt,lu,lv,ly,ma,mc,md,me,mf,mg,mh,mk,ml,mm,mn,mo,mp,mq,mr,ms,mt,mu,mv,mw,mx,my,mz,na,nc,ne,nf,ng,ni,nl,no,np,nr,nu,nz,om,pa,pe,pf,pg,ph,pk,pl,pm,pn,pr,ps,pt,pw,py,qa,re,ro,rs,ru,rw,sa,sb,sc,sd,se,sg,sh,si,sj,sk,sl,sm,sn,so,sr,st,sv,sy,sz,tc,td,tf,tg,th,tj,tk,tl,tm,tn,to,tr,tt,tv,tw,tz,ua,ug,um,us,uy,uz,va,vc,ve,vg,vi,vn,vu,wf,ws,xx,ye,yt,za,zm,zw]
         map => {
           default => [xx]
           AF => {
@@ -84,6 +84,7 @@ plugins => {
             CC => [cc]
             CN => [cn]
             CX => [cx]
+            CY => [cy]
             GE => [ge]
             HK => [hk]
             ID => [id]
@@ -119,8 +120,8 @@ plugins => {
             SY => [sy]
             TH => [th]
             TJ => [tj]
+            TL => [tl]
             TM => [tm]
-            TR => [tr]
             TW => [tw]
             UZ => [uz]
             VN => [vn]
@@ -136,7 +137,6 @@ plugins => {
             BG => [bg]
             BY => [by]
             CH => [ch]
-            CY => [cy]
             CZ => [cz]
             DE => [de]
             DK => [dk]
@@ -177,6 +177,7 @@ plugins => {
             SJ => [sj]
             SK => [sk]
             SM => [sm]
+            TR => [tr]
             UA => [ua]
             VA => [va]
           }
@@ -187,13 +188,11 @@ plugins => {
             BB => [bb]
             BL => [bl]
             BM => [bm]
-            BQ => [bq]
             BS => [bs]
             BZ => [bz]
             CA => [ca]
             CR => [cr]
             CU => [cu]
-            CW => [cw]
             DM => [dm]
             DO => [do]
             GD => [gd]
@@ -215,7 +214,6 @@ plugins => {
             PM => [pm]
             PR => [pr]
             SV => [sv]
-            SX => [sx]
             TC => [tc]
             TT => [tt]
             US => [us]
@@ -244,7 +242,6 @@ plugins => {
             PW => [pw]
             SB => [sb]
             TK => [tk]
-            TL => [tl]
             TO => [to]
             TV => [tv]
             UM => [um]
@@ -304,7 +301,6 @@ plugins => {
           bm => bm.tile.openstreetmap.org.
           bn => bn.tile.openstreetmap.org.
           bo => bo.tile.openstreetmap.org.
-          bq => bq.tile.openstreetmap.org.
           br => br.tile.openstreetmap.org.
           bs => bs.tile.openstreetmap.org.
           bt => bt.tile.openstreetmap.org.
@@ -327,7 +323,6 @@ plugins => {
           cr => cr.tile.openstreetmap.org.
           cu => cu.tile.openstreetmap.org.
           cv => cv.tile.openstreetmap.org.
-          cw => cw.tile.openstreetmap.org.
           cx => cx.tile.openstreetmap.org.
           cy => cy.tile.openstreetmap.org.
           cz => cz.tile.openstreetmap.org.
@@ -484,7 +479,6 @@ plugins => {
           sr => sr.tile.openstreetmap.org.
           st => st.tile.openstreetmap.org.
           sv => sv.tile.openstreetmap.org.
-          sx => sx.tile.openstreetmap.org.
           sy => sy.tile.openstreetmap.org.
           sz => sz.tile.openstreetmap.org.
           tc => tc.tile.openstreetmap.org.