Commit 71d01aa6 authored by Xiaowu Zhang's avatar Xiaowu Zhang

powerdns: split china's ip according to isp

isp data is from https://www.whoismyisp.org/ip
cn-t for china telecom, default one if isp is other value
cn-m for china mobile
cn-u for china unicom
parent 0d443554
...@@ -42,10 +42,22 @@ ...@@ -42,10 +42,22 @@
"default": "na", "default": "na",
"type": "string" "type": "string"
}, },
"china": { "china-telecom": {
"title": "China RR", "title": "China Telecom RR",
"description": "Records to use for China", "description": "Records to use for China Telecom",
"default": "cn", "default": "cn-t",
"type": "string"
},
"china-unicom": {
"title": "China Unicom RR",
"description": "Records to use for China Unicom",
"default": "cn-u",
"type": "string"
},
"china-mobile": {
"title": "China Mobile RR",
"description": "Records to use for China Mobile",
"default": "cn-m",
"type": "string" "type": "string"
}, },
"japan": { "japan": {
......
...@@ -45,7 +45,7 @@ mode = 0644 ...@@ -45,7 +45,7 @@ mode = 0644
recipe = hexagonit.recipe.download recipe = hexagonit.recipe.download
ignore-existing = true ignore-existing = true
url = ${:_profile_base_location_}/template/zz.countries.nexedi.dk.rbldnsd url = ${:_profile_base_location_}/template/zz.countries.nexedi.dk.rbldnsd
md5sum = 078bbe893aae7272270b4ec22505de33 md5sum = c4dc8c141d81b92d92cdb82ca67a13ee
location = ${buildout:parts-directory}/${:_buildout_section_name_} location = ${buildout:parts-directory}/${:_buildout_section_name_}
filename = zz.countries.nexedi.dk.rbldnsd filename = zz.countries.nexedi.dk.rbldnsd
download-only = true download-only = true
...@@ -55,7 +55,7 @@ mode = 0644 ...@@ -55,7 +55,7 @@ mode = 0644
recipe = hexagonit.recipe.download recipe = hexagonit.recipe.download
ignore-existing = true ignore-existing = true
url = ${:_profile_base_location_}/template/cdn.conf.in url = ${:_profile_base_location_}/template/cdn.conf.in
md5sum = 9d9b431d8373c2e1850f3cef5ae1898a md5sum = 29c29f93b3b0bd2f71f86f7b337e4543
location = ${buildout:parts-directory}/${:_buildout_section_name_} location = ${buildout:parts-directory}/${:_buildout_section_name_}
filename = cdn.conf.in filename = cdn.conf.in
download-only = true download-only = true
......
...@@ -93,8 +93,12 @@ $ORIGIN {{ cdn.get('origin') }} ...@@ -93,8 +93,12 @@ $ORIGIN {{ cdn.get('origin') }}
152 {{ cdn.get('south-america', 'sa') }} 152 {{ cdn.get('south-america', 'sa') }}
# Cameroon # Cameroon
120 {{ cdn.get('africa', 'af') }} 120 {{ cdn.get('africa', 'af') }}
# China # China telecom
156 {{ cdn.get('china', 'cn') }} 155 {{ cdn.get('china-telecom', 'cn-t') }}
#china unicom
156 {{ cdn.get('china-unicom', 'cn-u') }}
#china mobile
157 {{ cdn.get('china-mobile', 'cn-m') }}
# Colombia # Colombia
170 {{ cdn.get('south-america', 'sa') }} 170 {{ cdn.get('south-america', 'sa') }}
# Costa Rica # Costa Rica
......
This source diff could not be displayed because it is too large. You can view the blob instead.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment