Switch geodns to use GeoIP2

[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 7921e9f6290869e2398412eb35bbe0554695e035..dfd84c38b0ce7ae862de246b91803c3ff637acbe 100644 (file)
--- a/cookbooks/geodns/templates/default/config.erb
+++ b/cookbooks/geodns/templates/default/config.erb
@@ -2,8 +2,8 @@ plugins => {
   geoip => {
     maps => {
       country => {
-        geoip_db => /usr/share/GeoIP/GeoIPv6.dat
-        datacenters => [ad,ae,af,ag,ai,al,am,an,ao,ap,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,eu,fi,fj,fk,fm,fo,fr,fx,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]
+        geoip2_db => /var/lib/GeoIP/GeoLite2-Country.mmdb
+        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 => {
@@ -76,7 +76,6 @@ plugins => {
             AE => [ae]
             AF => [af]
             AM => [am]
-            AP => [ap]
             AZ => [az]
             BD => [bd]
             BH => [bh]
@@ -143,11 +142,9 @@ plugins => {
             DK => [dk]
             EE => [ee]
             ES => [es]
-            EU => [eu]
             FI => [fi]
             FO => [fo]
             FR => [fr]
-            FX => [fx]
             GB => [gb]
             GG => [gg]
             GI => [gi]
@@ -187,7 +184,6 @@ plugins => {
           NA => {
             AG => [ag]
             AI => [ai]
-            AN => [an]
             AW => [aw]
             BB => [bb]
             BL => [bl]
@@ -283,9 +279,7 @@ plugins => {
           ai => ai.tile.openstreetmap.org.
           al => al.tile.openstreetmap.org.
           am => am.tile.openstreetmap.org.
-          an => an.tile.openstreetmap.org.
           ao => ao.tile.openstreetmap.org.
-          ap => ap.tile.openstreetmap.org.
           aq => aq.tile.openstreetmap.org.
           ar => ar.tile.openstreetmap.org.
           as => as.tile.openstreetmap.org.
@@ -345,14 +339,12 @@ plugins => {
           er => er.tile.openstreetmap.org.
           es => es.tile.openstreetmap.org.
           et => et.tile.openstreetmap.org.
-          eu => eu.tile.openstreetmap.org.
           fi => fi.tile.openstreetmap.org.
           fj => fj.tile.openstreetmap.org.
           fk => fk.tile.openstreetmap.org.
           fm => fm.tile.openstreetmap.org.
           fo => fo.tile.openstreetmap.org.
           fr => fr.tile.openstreetmap.org.
-          fx => fx.tile.openstreetmap.org.
           ga => ga.tile.openstreetmap.org.
           gb => gb.tile.openstreetmap.org.
           gd => gd.tile.openstreetmap.org.