Merge remote-tracking branch 'upstream/master'

.editorconfig

@@ -0,0 +1,8 @@
+root = true
+
+[*.toml]
+indent_style = space
+indent_size = 2
+charset = utf-8
+trim_trailing_whitespace = false
+insert_final_newline = false

.github/workflows/roa.yml

@@ -4,9 +4,9 @@ name: roa_generator
 
 on:
   push:
-    branches: [ master ]
+    branches: [master]
   schedule:
-    - cron: '0 6 * * 1'
+    - cron: "0 6 * * 1"
 
 jobs:
   build:
@@ -15,54 +15,56 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@master
+      - uses: actions/checkout@master
 
-    - name: Install dependencies
+      - name: Install dependencies
-      shell: bash
+        shell: bash
-      run: |
+        run: |
-        sudo apt update -qq
+          sudo apt update -qq
-        sudo apt install -y python3 git openssh-client
+          sudo apt install -y python3 git openssh-client
-        sudo apt install -y curl
+          sudo apt install -y curl
-        curl -L https://github.com/pyenv/pyenv-installer/raw/master/bin/pyenv-installer | bash
+          curl -L https://github.com/pyenv/pyenv-installer/raw/master/bin/pyenv-installer | bash
-        export PATH="$HOME/.pyenv/bin:$PATH"
+          export PATH="$HOME/.pyenv/bin:$PATH"
-        eval "$(pyenv init -)"
+          eval "$(pyenv init -)"
-        eval "$(pyenv virtualenv-init -)"
+          eval "$(pyenv virtualenv-init -)"
-        pyenv install 3.8.2
+          pyenv install 3.8.2
-        pyenv shell 3.8.2
+          pyenv shell 3.8.2
+          pip install toml tabulate
 
-    - name: Run roa script
+      - name: Run roa script
-      shell: bash
+        shell: bash
-      run: |
+        run: |
-        export PATH="$HOME/.pyenv/bin:$PATH"
+          export PATH="$HOME/.pyenv/bin:$PATH"
-        eval "$(pyenv init -)"
+          eval "$(pyenv init -)"
-        eval "$(pyenv virtualenv-init -)"
+          eval "$(pyenv virtualenv-init -)"
-        pyenv shell 3.8.2
+          pyenv shell 3.8.2
-        maxlen4=29
+          maxlen4=29
-        maxlen6=64
+          maxlen6=64
-        mkdir -p roa_dir
+          mkdir -p roa_dir
-        pyenv exec python3 scripts/roa.py -m ${maxlen4} -M ${maxlen6}    -o roa_dir/roa46_bird2.conf
+          pyenv exec python3 scripts/roa.py -m ${maxlen4} -M ${maxlen6}    -o roa_dir/roa46_bird2.conf
-        pyenv exec python3 scripts/roa.py -m ${maxlen4} -M ${maxlen6} -4 -o roa_dir/roa4_bird2.conf
+          pyenv exec python3 scripts/roa.py -m ${maxlen4} -M ${maxlen6} -4 -o roa_dir/roa4_bird2.conf
-        pyenv exec python3 scripts/roa.py -m ${maxlen4} -M ${maxlen6} -6 -o roa_dir/roa6_bird2.conf
+          pyenv exec python3 scripts/roa.py -m ${maxlen4} -M ${maxlen6} -6 -o roa_dir/roa6_bird2.conf
-        pyenv exec python3 scripts/roa.py -m ${maxlen4} -M ${maxlen6} -j -o roa_dir/roa46.json
+          pyenv exec python3 scripts/roa.py -m ${maxlen4} -M ${maxlen6} -j -o roa_dir/roa46.json
-        pyenv exec python3 scripts/roa.py -m ${maxlen4} -M ${maxlen6} -e -o roa_dir/neonetwork.json
+          pyenv exec python3 scripts/roa.py -m ${maxlen4} -M ${maxlen6} -e -o roa_dir/neonetwork.json
-        pyenv exec python3 scripts/roa.py -m ${maxlen4} -M ${maxlen6} -r -o roa_dir/rfc8416.json
+          pyenv exec python3 scripts/roa.py -m ${maxlen4} -M ${maxlen6} -r -o roa_dir/rfc8416.json
+          pyenv exec python3 scripts/roa.py --summary --output roa_dir/README.txt
 
-    - name: Upload files
+      - name: Upload files
-      env:
+        env:
-        SSHPRIVKEY: ${{ secrets.KEY }}
+          SSHPRIVKEY: ${{ secrets.KEY }}
-      shell: bash
+        shell: bash
-      run: |
+        run: |
-        cd roa_dir
+          cd roa_dir
-        [ -n "$SSHPRIVKEY" ] || (echo SSHPRIVKEY is not set; exit 1)
+          [ -n "$SSHPRIVKEY" ] || (echo SSHPRIVKEY is not set; exit 1)
-        ( set -e;
+          ( set -e;
-          mkdir -p ~/.ssh
+            mkdir -p ~/.ssh
-          echo "$SSHPRIVKEY" |base64 -d > ~/.ssh/id_ed25519
+            echo "$SSHPRIVKEY" | base64 -d > ~/.ssh/id_ed25519
-          chmod 0600 ~/.ssh/id_ed25519
+            chmod 0600 ~/.ssh/id_ed25519
-          ssh -o StrictHostKeyChecking=no git@github.com || true
+            ssh -o StrictHostKeyChecking=no git@github.com || true
-          git init && git add .
+            git init && git add .
-          git config user.name "neonet roa bot"
+            git config user.name "neonet roa bot"
-          git config user.email "bot@github.com"
+            git config user.email "bot@github.com"
-          git commit -m "Generated at $(TZ='UTC' date +%Y%m%d-%H%M%S.%N)"
+            git commit -m "Generated at $(TZ='UTC' date +%Y%m%d-%H%M%S.%N)"
-          git push --force --quiet "git@github.com:NeoCloud/NeoNetwork-ROA.git" HEAD:master
+            git push --force --quiet "git@github.com:NeoCloud/NeoNetwork-ROA.git" HEAD:master
-        ) || (shred ~/.ssh/id_ed25519; exit 1)
+          ) || (shred ~/.ssh/id_ed25519; exit 1)
-        shred ~/.ssh/id_ed25519
+          shred ~/.ssh/id_ed25519

.github/workflows/test-your-pr.yml

@@ -13,36 +13,38 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@master
+      - uses: actions/checkout@master
-      with:
+        with:
-        ref: ${{ github.event.pull_request.head.sha }}
+          ref: ${{ github.event.pull_request.head.sha }}
 
-    - name: Install dependencies
+      - name: Install dependencies
-      shell: bash
+        shell: bash
-      run: |
+        run: |
-        sudo apt update -qq
+          sudo apt update -qq
-        sudo apt install -y python3 git openssh-client
+          sudo apt install -y python3 git openssh-client
-        sudo apt install -y curl
+          sudo apt install -y curl
-        curl -L https://github.com/pyenv/pyenv-installer/raw/master/bin/pyenv-installer | bash
+          curl -L https://github.com/pyenv/pyenv-installer/raw/master/bin/pyenv-installer | bash
-        export PATH="$HOME/.pyenv/bin:$PATH"
+          export PATH="$HOME/.pyenv/bin:$PATH"
-        eval "$(pyenv init -)"
+          eval "$(pyenv init -)"
-        eval "$(pyenv virtualenv-init -)"
+          eval "$(pyenv virtualenv-init -)"
-        pyenv install 3.8.2
+          pyenv install 3.8.2
-        pyenv shell 3.8.2
+          pyenv shell 3.8.2
+          pip install toml tabulate
 
-    - name: Run roa script
+      - name: Run roa script
-      shell: bash
+        shell: bash
-      run: |
+        run: |
-        export PATH="$HOME/.pyenv/bin:$PATH"
+          export PATH="$HOME/.pyenv/bin:$PATH"
-        eval "$(pyenv init -)"
+          eval "$(pyenv init -)"
-        eval "$(pyenv virtualenv-init -)"
+          eval "$(pyenv virtualenv-init -)"
-        pyenv shell 3.8.2
+          pyenv shell 3.8.2
-        maxlen4=29
+          maxlen4=29
-        maxlen6=64
+          maxlen6=64
-        mkdir -p roa_dir
+          mkdir -p roa_dir
-        pyenv exec python3 scripts/roa.py -m ${maxlen4} -M ${maxlen6}    -o roa_dir/roa46_bird2.conf
+          pyenv exec python3 scripts/roa.py -m ${maxlen4} -M ${maxlen6}    -o roa_dir/roa46_bird2.conf
-        pyenv exec python3 scripts/roa.py -m ${maxlen4} -M ${maxlen6} -4 -o roa_dir/roa4_bird2.conf
+          pyenv exec python3 scripts/roa.py -m ${maxlen4} -M ${maxlen6} -4 -o roa_dir/roa4_bird2.conf
-        pyenv exec python3 scripts/roa.py -m ${maxlen4} -M ${maxlen6} -6 -o roa_dir/roa6_bird2.conf
+          pyenv exec python3 scripts/roa.py -m ${maxlen4} -M ${maxlen6} -6 -o roa_dir/roa6_bird2.conf
-        pyenv exec python3 scripts/roa.py -m ${maxlen4} -M ${maxlen6} -j -o roa_dir/roa46.json
+          pyenv exec python3 scripts/roa.py -m ${maxlen4} -M ${maxlen6} -j -o roa_dir/roa46.json
-        pyenv exec python3 scripts/roa.py -m ${maxlen4} -M ${maxlen6} -e -o roa_dir/neonetwork.json
+          pyenv exec python3 scripts/roa.py -m ${maxlen4} -M ${maxlen6} -e -o roa_dir/neonetwork.json
-        pyenv exec python3 scripts/roa.py -m ${maxlen4} -M ${maxlen6} -r -o roa_dir/rfc8416.json
+          pyenv exec python3 scripts/roa.py -m ${maxlen4} -M ${maxlen6} -r -o roa_dir/rfc8416.json
+          pyenv exec python3 scripts/roa.py --summary --output roa_dir/README.txt

.vscode/extensions.json

@@ -0,0 +1,3 @@
+{
+  "recommendations": ["bungcip.better-toml", "bodil.prettier-toml"]
+}

.vscode/settings.json

@@ -0,0 +1,4 @@
+{
+  "editor.formatOnSave": true,
+  "python.formatting.provider": "black"
+}

asn/AS134098

@@ -1,4 +0,0 @@
-NAME="Licson Internal Network"
-OWNER="licson"
-DESC=""
-VALID="YES"

asn/AS134098.toml

@@ -0,0 +1,4 @@
+name = "Licson Internal Network"
+owner = "licson"
+source = "Internet"
+vaild = true

asn/AS4201270000

@@ -1,3 +0,0 @@
-NAME="NeoNetwork Origin"
-OWNER="Neo_Chen"
-DESC=""

asn/AS4201270000.toml

@@ -0,0 +1,2 @@
+name = "NeoNetwork Origin"
+owner = "Neo_Chen"

asn/AS4201270001

@@ -1,3 +0,0 @@
-NAME="Septs Inter-NeoNetwork Exchange"
-OWNER="Septs"
-DESC=""

asn/AS4201270001.toml

@@ -0,0 +1,2 @@
+name = "Septs Inter-NeoNetwork Exchange"
+owner = "septs"

asn/AS4201270002

@@ -1,3 +0,0 @@
-NAME="Septs Home"
-OWNER="Septs"
-DESC=""

asn/AS4201270002.toml

@@ -0,0 +1,2 @@
+name = "Septs HomeLabs"
+owner = "septs"

asn/AS4201270003

@@ -1,3 +0,0 @@
-NAME="chenx97"
-OWNER="chenx97"
-DESC=""

asn/AS4201270003.toml

@@ -0,0 +1,2 @@
+name = "chenx97"
+owner = "chenx97"

asn/AS4201270004

@@ -1,3 +0,0 @@
-NAME="frank"
-OWNER="frank"
-DESC=""

asn/AS4201270004.toml

@@ -0,0 +1,2 @@
+name = "frank"
+owner = "frank"

asn/AS4201270005

@@ -1,3 +0,0 @@
-NAME="Icecat"
-OWNER="Icecat"
-DESC="NextMoe Group Access Network"

asn/AS4201270005.toml

@@ -0,0 +1,3 @@
+name = "Icecat"
+owner = "Icecat"
+description = "NextMoe Group Access Network"

asn/AS4201270006

@@ -1,3 +0,0 @@
-NAME="Jerry Network"
-OWNER="JerryXiao"
-DESC=""

asn/AS4201270006.toml

@@ -0,0 +1,2 @@
+name = "Jerry Network"
+owner = "JerryXiao"

asn/AS4201270007

@@ -1,3 +0,0 @@
-NAME="Staph"
-OWNER="Staph"
-DESC=""

asn/AS4201270007.toml

@@ -0,0 +1,2 @@
+name = "Staph"
+owner = "Staph"

asn/AS4201270008

@@ -1,3 +0,0 @@
-NAME="MagicNeko"
-OWNER="Icecat"
-DESC="MagicNeko Network Internet exchange"

asn/AS4201270008.toml

@@ -0,0 +1,3 @@
+name = "MagicNeko"
+owner = "Icecat"
+description = "MagicNeko Network Internet exchange"

asn/AS4201270009

@@ -1,3 +0,0 @@
-NAME="santost12"
-OWNER="santost12"
-DESC=""

asn/AS4201270009.toml

@@ -0,0 +1,2 @@
+name = "santost12"
+owner = "santost12"

asn/AS4201270010

@@ -1,3 +0,0 @@
-NAME="Lan Tian"
-OWNER="Lan Tian"
-DESC=""

asn/AS4201270010.toml

@@ -0,0 +1,2 @@
+name = "Lan Tian"
+owner = "Lan Tian"

asn/AS4201270011

@@ -1,3 +0,0 @@
-NAME="LINE-NZ"
-OWNER="LINE-NZ"
-DESC=""

asn/AS4201270011.toml

@@ -0,0 +1,2 @@
+name = "LINE-NZ"
+owner = "LINE-NZ"

asn/AS4201270012

@@ -1,3 +0,0 @@
-NAME="Yhi Interconnect"
-OWNER="Junde Yhi"
-DESC=""

asn/AS4201270012.toml

@@ -0,0 +1,2 @@
+name = "Yhi Interconnect"
+owner = "Junde Yhi"

asn/AS4201270013

@@ -1,3 +0,0 @@
-NAME="NDOSKRNL"
-OWNER="Ndoskrnl"
-DESC="Ndoskrnl's Network"

asn/AS4201270013.toml

@@ -0,0 +1,3 @@
+name = "NDOSKRNL"
+owner = "Ndoskrnl"
+description = "Ndoskrnl's Network"

asn/AS4201270014

@@ -1,3 +0,0 @@
-NAME="leedagee"
-OWNER="leedagee"
-DESC=""

asn/AS4201270014.toml

@@ -0,0 +1,2 @@
+name = "leedagee"
+owner = "leedagee"

asn/AS4201270015

@@ -1,3 +0,0 @@
-NAME="James58899"
-OWNER="James58899"
-DESC=""

asn/AS4201270015.toml

@@ -0,0 +1,2 @@
+name = "James58899"
+owner = "James58899"

asn/AS4242420140

@@ -1,3 +0,0 @@
-NAME="Yangfl Network"
-OWNER="Yangfl"
-DESC=""

asn/AS4242420140.toml

@@ -0,0 +1,2 @@
+name = "Yangfl Network"
+owner = "Yangfl"

asn/AS4242420916

@@ -1,3 +0,0 @@
-NAME="alanyhq"
-OWNER="alanyhq"
-DESC="alanyhq main"

asn/AS4242420916.toml

@@ -0,0 +1,3 @@
+name = "alanyhq"
+owner = "alanyhq"
+description = "alanyhq main"

asn/AS4242421037

@@ -1,3 +0,0 @@
-NAME="LibreHouse"
-OWNER="LibreHouse"
-DESC=""

asn/AS4242421037.toml

@@ -0,0 +1,2 @@
+name = "SUNNET"
+owner = "SUNNET"

asn/AS4242423088

@@ -1,3 +0,0 @@
-NAME="SUNNET"
-OWNER="SUNNET"
-DESC=""

asn/AS4242423088.toml

@@ -0,0 +1,2 @@
+name = "Yangfl Network"
+owner = "Yangfl"

document/asn-dir.txt

@@ -1,6 +1,7 @@
 # as-dir Template
 # ===============
 # Filename format: AS<Number>
+# ASN range: 4201270000 ~ 4201279999
 # Remove any line which starts with '#' when applying
 # AS Name
 NAME=""
@@ -8,7 +9,10 @@ NAME=""
 OWNER=""
 # Description
 DESC=""
+# Source of this ASN
+# Possible values: "NeoNetwork", "DN42" or "INET"
+SOURCE=""
 # if it's a ASN registered from *NIC, this variable records
 # whether members of NeoNetwork have validated its ownership yet
-# possible value: "YES" "NO"
+# Possible values: "YES" "NO"
 VALID=""

document/route-dir.txt

@@ -36,7 +36,7 @@ Detailed Information of Each Variable
 	Available options are: Tinc, WireGuard, L2TP, GRE, IPsec/L2TP, IPsec/GRE, OpenVPN, SLIRP, PPP
 
 3. NAME:	Name
-4. ASN:		ASN
+4. ASN:		ASN (without prefix "AS")
 5. UPSTREAM:	Upstream Node Name
 6. DOWNSTREAM:	Downstream Node Name
 7. DESC:	Description

entity/Icecat

@@ -1,13 +0,0 @@
-NAME="Icecat"
-DESC=""
-CONTACT=(
-	"EMAIL:"
-	"TELEGRAM:@fakeicecat"
-	"IRC:"
-	"MASTODON:"
-	"GITHUB:Myer921"
-)
-BABEL=(
-	""
-)
-AUTH=""

entity/Icecat.toml

@@ -0,0 +1,5 @@
+name = "Icecat"
+
+[contact]
+telegram = "fakeicecat"
+github = "Myer921"

entity/James58899

@@ -1,13 +0,0 @@
-NAME="James58899"
-DESC=""
-CONTACT=(
-	"EMAIL:"
-	"TELEGRAM:"
-	"IRC:"
-	"MASTODON:"
-	"GITHUB:"
-)
-BABEL=(
-	""
-)
-AUTH=""

entity/James58899.toml

@@ -0,0 +1 @@
+name = "James58899"

entity/JerryXiao

@@ -1,13 +0,0 @@
-NAME="JerryXiao"
-DESC=""
-CONTACT=(
-	"EMAIL:neonet@mail.jerryxiao.cc"
-	"TELEGRAM:@JerryXiao"
-	"IRC:JerryXiao@hackint"
-	"MASTODON:"
-	"GITHUB:isjerryxiao"
-)
-BABEL=(
-	""
-)
-AUTH="PGP:186242204A2EC70438E9CE3B9D9CE43650FF2BAA"

entity/JerryXiao.toml

@@ -0,0 +1,10 @@
+name = "JerryXiao"
+
+[contact]
+email = "neonet@mail.jerryxiao.cc"
+telegram = "JerryXiao"
+irc = "JerryXiao@hackint"
+github = "isjerryxiao"
+
+[persona]
+pgp = "186242204A2EC70438E9CE3B9D9CE43650FF2BAA"

entity/Junde Yhi

@@ -1,19 +0,0 @@
-NAME="Junde Yhi"
-DESC=""
-CONTACT=(
-	"EMAIL:lmy441900@live.com"
-	"TELEGRAM:@lmy441900"
-	"MASTODON:@lmy441900@sn.angry.im"
-	"GITHUB:lmy441900"
-)
-BABEL=(
-	"zh-N"
-	"zh-hans-N"
-	"zh-hant-2"
-	"en-3"
-	"de-0"
-	"ru-0"
-	"jp-0"
-	"fi-0"
-)
-AUTH="PGP:E6C74782A1FBEE741D09885FD274286F672C800A"

entity/Junde Yhi.toml

@@ -0,0 +1,20 @@
+name = "Junde Yhi"
+babel = [
+    "zh-N",
+    "zh-hans-N",
+    "zh-hant-2",
+    "en-3",
+    "de-0",
+    "ru-0",
+    "jp-0",
+    "fi-0",
+]
+
+[contact]
+email = "lmy441900@live.com"
+telegram = "lmy441900"
+mastodon = "@lmy441900@sn.angry.im"
+github = "lmy441900"
+
+[persona]
+pgp = "E6C74782A1FBEE741D09885FD274286F672C800A"

entity/LINE-NZ

@@ -1,13 +0,0 @@
-NAME="LINE-NZ"
-DESC=""
-CONTACT=(
-	"EMAIL:dn42@line.co.nz"
-	"TELEGRAM:"
-	"IRC:"
-	"MASTODON:"
-	"GITHUB:line-nz"
-)
-BABEL=(
-	"en"
-)
-AUTH=""

entity/LINE-NZ.toml

@@ -0,0 +1,6 @@
+name = "LINE-NZ"
+babel = ["en"]
+
+[contact]
+email = "dn42@line.co.nz"
+github = "line-nz"

entity/Lan Tian

@@ -1,13 +0,0 @@
-NAME="Lan Tian"
-DESC=""
-CONTACT=(
-	"EMAIL:"
-	"TELEGRAM:"
-	"IRC:"
-	"MASTODON:"
-	"GITHUB:"
-)
-BABEL=(
-	""
-)
-AUTH=""

entity/Lan Tian.toml

@@ -0,0 +1 @@
+name = "Lan Tian"

entity/LibreHouse

@@ -1,17 +0,0 @@
-NAME="LibreHouse"
-DESC=""
-CONTACT=(
-	"EMAIL:i+noc@outv.im"
-	"TELEGRAM:@outvi"
-	"IRC:"
-	"MASTODON:@outvi@moe.cat"
-	"GITHUB:@outloudvi"
-)
-BABEL=(
-	"zh-N"
-	"zh-hans-N"
-	"zh-hant-3"
-	"en-2"
-	"ja-0"
-)
-AUTH=""

entity/LibreHouse.toml

@@ -0,0 +1,11 @@
+name = "LibreHouse"
+babel = ["zh-N", "en-2"]
+
+[contact]
+email = "i+noc@outv.im"
+telegram = "outvi"
+mastodon = "@outvi@moe.cat"
+github = "outloudvi"
+
+[persona]
+pgp = "47627D2288B20CC033C7B7D72D83E4E89C15DA36"

entity/Ndoskrnl

@@ -1,13 +0,0 @@
-NAME="Ndoskrnl"
-DESC="We can start chat happily with Google Translate :)"
-CONTACT=(
-	"EMAIL:lollipop.studio.cn@gmail.com"
-	"TELEGRAM:"
-	"IRC:"
-	"MASTODON:"
-	"GITHUB:magic0whi"
-)
-BABEL=(
-	"zh|en-1"
-)
-AUTH=""

entity/Ndoskrnl.toml

@@ -0,0 +1,7 @@
+name = "Ndoskrnl"
+description = "We can start chat happily with Google Translate :)"
+babel = ["en-1", "zh-1"]
+
+[contact]
+email = "lollipop.studio.cn@gmail.com"
+github = "magic0whi"

entity/Neo_Chen

@@ -1,14 +0,0 @@
-NAME="Neo_Chen"
-DESC=""
-CONTACT=(
-	"EMAIL:chenkolei@gmail.com"
-	"TELEGRAM:@Neo_Chen"
-	"IRC:Neo_Chen"
-	"MASTODON:@Neo_Chen@mastodon.xyz"
-	"GITHUB:NeoChen1024"
-)
-BABEL=(
-	"zh-N"
-	"en-2"
-)
-AUTH="PGP:D306BB628837043150CD1E42CA0957540FD996CD"

entity/Neo_Chen.toml

@@ -0,0 +1,12 @@
+name = "Neo_Chen"
+babel = ["zh-N", "en-2"]
+
+[contact]
+email = "chenkolei@gmail.com"
+telegram = "Neo_Chen"
+irc = "Neo_Chen"
+mastodon = "@Neo_Chen@mastodon.xyz"
+github = "Neo_Chen"
+
+[persona]
+pgp = "D306BB628837043150CD1E42CA0957540FD996CD"

entity/SUNNET

@@ -1,13 +0,0 @@
-NAME="SUNNET"
-DESC=""
-CONTACT=(
-	"EMAIL:"
-	"TELEGRAM:"
-	"IRC:"
-	"MASTODON:"
-	"GITHUB:"
-)
-BABEL=(
-	""
-)
-AUTH=""

entity/SUNNET.toml

@@ -0,0 +1 @@
+name = "SUNNET"

entity/Septs

@@ -1,13 +0,0 @@
-NAME="Septs"
-DESC=""
-CONTACT=(
-	"EMAIL:bgp@septs.email"
-	"TELEGRAM:"
-	"IRC:"
-	"MASTODON:"
-	"GITHUB:"
-)
-BABEL=(
-	""
-)
-AUTH=""

entity/Staph

@@ -1,17 +0,0 @@
-NAME="Staph"
-DESC="A programming prokaryotic organism"
-CONTACT=(
-	"EMAIL: staph@aosc.io"
-	"TELEGRAM: @Staph"
-	"IRC: Staph_aureus"
-	"MASTODON:"
-	"GITHUB: StephDC"
-)
-BABEL=(
-	"zh-N"
-	"en-4"
-	"ja-2"
-	"es-1"
-	"fr-1"
-)
-AUTH=""

entity/Staph.toml

@@ -0,0 +1,9 @@
+name = "Staph"
+description = "A programming prokaryotic organism"
+babel = ["zh-N", "en-4", "ja-2", "es-1", "fr-1"]
+
+[contact]
+email = "staph@aosc.io"
+telegram = "Staph"
+irc = "Staph_aureus"
+github = "StephDC"

entity/Yangfl

@@ -1,13 +0,0 @@
-NAME="Yangfl Network"
-DESC=""
-CONTACT=(
-	"EMAIL:"
-	"TELEGRAM:"
-	"IRC:"
-	"MASTODON:"
-	"GITHUB:"
-)
-BABEL=(
-	""
-)
-AUTH=""

entity/Yangfl.toml

@@ -0,0 +1 @@
+name = "Yangfl Network"

entity/alanyhq

@@ -1,14 +0,0 @@
-NAME="alanyhq"
-DESC=""
-CONTACT=(
-	"EMAIL:"
-	"TELEGRAM:@alanyhq"
-	"IRC:alanyhq"
-	"MASTODON:"
-	"GITHUB:"
-)
-BABEL=(
-	"zh-N"
-	"en-2"
-)
-AUTH=""

entity/alanyhq.toml

@@ -0,0 +1,5 @@
+name = "alanyhq"
+babel = ["zh-N", "en-2"]
+
+[contact]
+telegram = "alanyhq"

entity/chenx97

@@ -1,13 +0,0 @@
-NAME="chenx97"
-DESC=""
-CONTACT=(
-	"EMAIL:chenx97@gmail.com"
-	"TELEGRAM:"
-	"IRC:"
-	"MASTODON:"
-	"GITHUB:chenx97"
-)
-BABEL=(
-	""
-)
-AUTH=""

entity/chenx97.toml

@@ -0,0 +1,5 @@
+name = "chenx97"
+
+[contact]
+email = "chenx97@gmail.com"
+github = "chenx97"

entity/frank

@@ -1,13 +0,0 @@
-NAME="frank"
-DESC=""
-CONTACT=(
-	"EMAIL:"
-	"TELEGRAM:"
-	"IRC:"
-	"MASTODON:"
-	"GITHUB:"
-)
-BABEL=(
-	""
-)
-AUTH=""

entity/frank.toml

@@ -0,0 +1 @@
+name = "frank"

entity/leedagee

@@ -1,13 +0,0 @@
-NAME="leedagee"
-DESC=""
-CONTACT=(
-	"EMAIL:leedageea@gmail.com"
-	"TELEGRAM:@leedagee"
-	"IRC:lizr"
-	"GITHUB:leedagee"
-)
-BABEL=(
-	"zh-N"
-	"en-2"
-)
-AUTH="PGP:47627D2288B20CC033C7B7D72D83E4E89C15DA36"

entity/leedagee.toml

@@ -0,0 +1,8 @@
+name = "leedagee"
+babel = ["zh-N", "zh-hans-N", "zh-hant-3", "en-2", "ja-0"]
+
+[contact]
+email = "leedageea@gmail.com"
+telegram = "leedagee"
+irc = "lizr"
+github = "leedagee"

entity/licson

@@ -1,13 +0,0 @@
-NAME="licson"
-DESC=""
-CONTACT=(
-	"EMAIL:admin@licson.net"
-	"TELEGRAM:licson"
-	"IRC:licson"
-	"MASTODON:"
-	"GITHUB:licson0729"
-)
-BABEL=(
-	""
-)
-AUTH=""

entity/licson.toml

@@ -0,0 +1,6 @@
+name = "licson"
+
+[contact]
+email = "admin@licson.net"
+telegram = "licson"
+github = "licson0729"

entity/santost12

@@ -1,13 +0,0 @@
-NAME="santost12"
-DESC=""
-CONTACT=(
-	"EMAIL:tylersantos12@protonmail.com"
-	"TELEGRAM:"
-	"IRC:"
-	"MASTODON:"
-	"GITHUB:santost12"
-)
-BABEL=(
-	""
-)
-AUTH=""

entity/santost12.toml

@@ -0,0 +1,5 @@
+name = "santost12"
+
+[contact]
+email = "tylersantos12@protonmail.com"
+github = "santost12"

entity/septs.toml

@@ -0,0 +1,6 @@
+name = "septs"
+
+[contact]
+email = "bgp@septs.email"
+telegram = "septs"
+github = "septs"

node/Icecat-GroupAccessNetwork

@@ -1,6 +0,0 @@
-ASN="4201270005"
-DESC=""
-IP=(
-	"10.127.233.1/24"
-	"fd10:127:233:1c3c::1/64"
-)

node/Icecat.toml

@@ -0,0 +1,3 @@
+[Icecat-GroupAccessNetwork]
+asn = 4201270005
+cidr = ["10.127.233.1/24", "fd10:127:233:1c3c::1/64"]

node/James58899

@@ -1,4 +0,0 @@
-ASN="4201270015"
-DESC=""
-IP=(
-)

node/James58899.toml

@@ -0,0 +1,2 @@
+[James58899]
+asn = 4201270015

node/JerryXiao

@@ -1,5 +0,0 @@
-ASN="4201270006"
-DESC=""
-IP=(
-	"10.127.x.x/x"
-)

node/JerryXiao-HK1

@@ -1,4 +0,0 @@
-ASN="4201270006"
-DESC=""
-IP=(
-)

node/JerryXiao-HK2

@@ -1,4 +0,0 @@
-ASN="4201270006"
-DESC=""
-IP=(
-)

node/JerryXiao-SH1

@@ -1,4 +0,0 @@
-ASN="4201270006"
-DESC=""
-IP=(
-)

node/JerryXiao.toml

@@ -0,0 +1,11 @@
+[JerryXiao]
+asn = 4201270006
+
+[JerryXiao-SH1]
+asn = 4201270006
+
+[JerryXiao-HK1]
+asn = 4201270006
+
+[JerryXiao-HK2]
+asn = 4201270006

node/LINE-NZ-AU01

@@ -1,5 +0,0 @@
-ASN="4201270011"
-DESC="LINE-NZ Cloud"
-IP=(
-	"10.127.22.9/29"
-)

node/LINE-NZ-NZ01

@@ -1,5 +0,0 @@
-ASN="4201270011"
-DESC="LINE-NZ Home"
-IP=(
-	"10.127.22.1/29"
-)

node/LINE-NZ.toml

@@ -0,0 +1,9 @@
+[LINE-NZ-NZ01]
+asn = 4201270011
+description = "LINE-NZ Home"
+cidr = ["10.127.22.1/29"]
+
+[LINE-NZ-AU01]
+asn = 4201270011
+description = "LINE-NZ Cloud"
+cidr = ["10.127.22.9/29"]

node/LanTian

@@ -1,4 +0,0 @@
-ASN="4201270010"
-DESC=""
-IP=(
-)