Merge branch 'master' into kebe-20200705/add-ipv6-range

2025-10-31 03:30:49 +08:00 · 2020-07-05 16:12:52 +00:00 · 2020-07-05 16:12:52 +00:00 · 954f037c59
commit 954f037c59
parent 6e263bb65d 7b707b9445
3 changed files with 51 additions and 74 deletions
--- a/data/key-cert/PGPKEY-08EBD2E8
+++ b/data/key-cert/PGPKEY-08EBD2E8
@ -1,73 +0,0 @@
-key-cert:           PGPKEY-08EBD2E8
-method:             PGP
-owner:              Christoffer <christoffer@netravnen.de>
-fingerpr:           18DD 23C5 5029 3098 DE07  052A 9DCF 2CA0 08EB D2E8
-remarks:            https://www.netravnen.de/pgp/?fingerprint=18dd23c550293098de07052a9dcf2ca008ebd2e8
-org:                ORG-NETRAVNEN
-tech-c:             ORG-NETRAVNEN-DN42
-admin-c:            ORG-NETRAVNEN-DN42
-mnt-by:             NETRAVNEN-MNT
-source:             DN42
-certif:             -----BEGIN PGP PUBLIC KEY BLOCK-----
-certif:             
-certif:             mDMEXAAS+xYJKwYBBAHaRw8BAQdALbnw1RxC+0YdAmJ1+yfqVZk0c47PpF1yhCZF
-certif:             rmUBPZq0LUNocmlzdG9mZmVyIEhhbnNlbiA8Y2hyaXN0b2ZmZXJAbmV0cmF2bmVu
-certif:             LmRlPoiWBBMWCAA+FiEEGN0jxVApMJjeBwUqnc8soAjr0ugFAlwAEvsCGwMFCQtJ
-certif:             i7UFCwkIBwIGFQoJCAsCBBYCAwECHgECF4AACgkQnc8soAjr0uglrwEAswZ2Bl4w
-certif:             dTriXbJ9SxcB0OZdclc9DW8I/Kw+BlISKh8BAPijRMhM2Nrqf05wLjJ34rtwhBwj
-certif:             IHeXBr+J355R6Z4AiQIzBBABCAAdFiEEEt0CHXrC08M9KiVicy9K+wlgyMkFAlwA
-certif:             E0sACgkQcy9K+wlgyMmH8A/9E5VV88bMdvzQHCUF6HUp9ZlLNxZyOe5rodExwEEU
-certif:             bUH3C/oV+g1CCsh9JxGRIzHeDA3sfXcd4uEFYNIcCPG8P3bNEWQJkaYFOw6L4T1x
-certif:             QO5MyZ9YE1kdmaIcXtflP1y7ZYLQqLyTJu2okanzhtt6UyQWUgDN4MNghAswL/6w
-certif:             W55AzByzgH4QmMBXv1n/hzoHkNBpc90zUmOZAtyVTxf27iQhjNOJhBzLhAyVkB+4
-certif:             X3Lm9RERyza2dPBQF2nC1dTiXIVEZMKDpJr4u7vjENP94B6SXl0hRFsX49o5cQrx
-certif:             nQSkvUsDbdyWB3qnRIDt62tNDUuW2yTJziJ/zefFXgPymMzZa0A5MOXjH07GmWfm
-certif:             LPLrP9iqYexPPw64rMsubp0Ld02jjWSKqaIMWQEXXX9j4MgY0k2j3ON3zTUCuMFY
-certif:             W3OKQ9Vwbr8xgULtURhu7uwelUuOUNzoGTvkdBMxEgm9FolJi656HDLaU266A6Jf
-certif:             nDT1qXPMFgQsYTxhWxgT9lInvICD7oDlrRf9mRsxTa8j653HCKBjsW6lmBo8eWeE
-certif:             Y2oU1waQfOqqb7FQul/xVY+cRNQCWNA9QvG8j78MLvBKNYLlnjZgEFirnXWby9+W
-certif:             eC42l0wSGQO5w8pngOaZwd6vQtzPG5Iuigz5sCnSJNLhyddW43xKN4BPdlmns600
-certif:             dO+JAjMEEAEIAB0WIQSv46oqSEzjX1YsHape9PHYlKS//AUCXAATYQAKCRBe9PHY
-certif:             lKS//IgqD/4+e2Ncs33b0jXZWNBliG/Ulp+04DS2DFhCFnuep0ka1y/eyCMMbtTz
-certif:             lc2JfFk1IcCoesOKUlz4vrAgLIikXhhWA4AjqWHoHGPfZ4H1aSbCOevw1ToAo/QI
-certif:             ubH0kWaUzs1deWkyBnNM7EXl/uCOCmCE0P4V5QV+S3mmK7b+cQVSfRBaNFD3jnVw
-certif:             2cTjUQfY5s3++YjGu1pSQmALKgGsCK9udXzRYHIT252phIdYwD8CWnAYnrpzRNOx
-certif:             9ebP6N563LapB71C4QYD6em2jtiB3jHdSMWpxGI5GXR+IBYmrb7Cl/bvJGEsJGbv
-certif:             dHgy1D9gZjBoPM5ZCGpjHycR4eCNQqjkyIsiHC7jqP4wKZ2IS+neZskcu8rKD8Kw
-certif:             IwWXpz4PJZzxpRWYwVOH2tPTMH3wWsqKik9NUi8iw6/IM6Tf2Lmj2j6Z9luMYCYt
-certif:             PG3UkAT3izWW1oo2sAA6A/oVCQ/dCArPcQgSj3k+ahJJ3RmfQZiieHOJx/W/EodA
-certif:             YCBmxUVJDJ8j1xNDSIonqB8wdKXKBYjTiz5b4+1UWI5ZzrNKBInGhKfHETqiJLGq
-certif:             QajyvrgyMJ3n9wJxjiJ+ez9B5MBmV9ntmYj6GXNPNWtM59SfgEoLsigiC3B10PUP
-certif:             JnqMyK7CcCbLU7y5NnRmBxtMZMwUusGXVp4nWOhSTRYYvlldsT+a2IkCMwQQAQgA
-certif:             HRYhBMizgqihzc23cf6yTMZUlI/ahr7NBQJcABOBAAoJEMZUlI/ahr7Nna4P/2/n
-certif:             3FgfOo2Y9LywB8hxB96jhD8RtlG77kwWi/dMqK4scs9tjLBO/L9bFUihC8j03DwJ
-certif:             v9Nck8XsGK8pTMWgsvHIzXKoKm5fRfaEGCOdgcXL3Af/qG56PZ42Jb20KxBlvBNv
-certif:             Q4ZW9oO1/q4ZTwEsBlVbz2XzeqVKVy/xyHziHqBlIpC3h8TS04aju2KBus6hLArs
-certif:             cE+sWfbLzWvpDjfiz8l7I6vHE2xtaLgtIaErk9YkopJf3HJqYunfRg2GOOV4amhP
-certif:             JHd5cd8qmgIHzeX55uEbr/+n37I1xcoZ8mFZDoKikQQ5eIivTz64KFzt2yHgbG3z
-certif:             FwOY4Wwi39Y+XhWGYb70gExx0yPj5icRF/Toa2KP3zlhrGL/awKM9xPxdcHkcCcK
-certif:             PFAr+UBLWOCJAoK/m/C6NyTw5ULHoC6ZLffHMvEzzn/X7gFeXB3pHRvGop+0dJQG
-certif:             K6JWxP/LePPeLyfHPGEZ4D1pMPFWtTaXtX//0t35nQ/5Z6BKah2U+lpl4KtIrtwj
-certif:             WtnTqtXsuRJirIb1tkikc1WQA3if3ZnTJWE4UjWf5WDsyXRmAxTK1minH817kEeZ
-certif:             JPYV1K/xibafd2hUcQnrXKbqE7YBHMKNTfLPwTxR8EUjWTpWmRtL540kPWtSmzfi
-certif:             r+V2x2yxHLVbESHZYzeXb1Q6RcQJ8LjQALPAUUQRiHUEExYIAB0WIQR7k1zO+XqQ
-certif:             lTVRW8wKEDuIVflGfAUCXRIXUAAKCRAKEDuIVflGfIEVAP9j4BS3rE9A8n45fDoq
-certif:             24BlQhs78ARQ0GSQKM5wQJO9nAD6A9OE9r6Cu9jlPUUPAIIMNq72sPwlFejDLgS0
-certif:             3eUpXwiIdQQTFggAHRYhBDbv891ns/z4wLa/pZJk57oBuReSBQJdEhdtAAoJEJJk
-certif:             57oBuReSu6kA/21oebeoJFOQpto6te2t6gqGDCQcgRTIzin7+31UiuB7AP9juIsR
-certif:             funsjb3qIA59Z0GHP4v+p1ze8825QKV3wUSDD4h1BBMWCAAdFiEEvLzeKtZH3fG2
-certif:             9JBjXnzscaX7ODYFAl0SF4UACgkQXnzscaX7ODa46wD/dTfb1Y0K8DvDjtkj/mPr
-certif:             P4VaeaPgxNf6S82kgLs0ke0A+wQuHw64gjVUept9SvFP6OLbY7j+7lADYPHvbhno
-certif:             e84NiHUEExYIAB0WIQTi3HRSsE7Fb+UZv0VDOXrh55mTDgUCXRIX1AAKCRBDOXrh
-certif:             55mTDllKAP96I+qMLFmn4IlgbUy5ZJIgdGGG4OrvZZQ1btMKbde/3AEApotJBGh8
-certif:             FZ77zvYNR+e7u6j7TW3kl/QFHmE6j/G2iQS0LUNocml6dG9mZmVyIGhhbnNlbiA8
-certif:             Y2hyaXp0b2ZmZXJAbmV0cmF2bmVuLmRlPoiWBBMWCAA+FiEEGN0jxVApMJjeBwUq
-certif:             nc8soAjr0ugFAl1CkjcCGwMFCQtJi7UFCwkIBwIGFQoJCAsCBBYCAwECHgECF4AA
-certif:             CgkQnc8soAjr0ujdiQEA8THG8mVVoVP83+7994daFh5TZZbY/1HvZG/ZdBf+nVEB
-certif:             ALs6YFBOl0i3eHDE0Sv2UvgOPWS6nr7fylNwygicxoQFuDgEXAAS+xIKKwYBBAGX
-certif:             VQEFAQEHQEN5FPc25RO2t5S1PS6u0nBiuP0A4PI+8wl5Rcg5oCEXAwEIB4h+BBgW
-certif:             CAAmFiEEGN0jxVApMJjeBwUqnc8soAjr0ugFAlwAEvsCGwwFCQtJi7UACgkQnc8s
-certif:             oAjr0uhz6gD/dvSGpgZLK4CabU6LtAgSG5+R0uvwGjubKTXUpEhy3FMA/2uvgG5Q
-certif:             HH5JLMwY3XJYSTTUBtkYz1jdQF5afgBUZacF
-certif:             =MN7u
-certif:             -----END PGP PUBLIC KEY BLOCK-----
--- a/data/key-cert/PGPKEY-62E3F629
+++ b/data/key-cert/PGPKEY-62E3F629
@ -0,0 +1,50 @@
+key-cert:           PGPKEY-62E3F629
+method:             PGP
+owner:              Netravnen <netravnen+wbkq9@gmail.com>
+fingerpr:           4853 5AFD 5BA0 CABC 81C2  089B E957 87C0 62E3 F629
+org:                ORG-NETRAVNEN
+tech-c:             ORG-NETRAVNEN-DN42
+admin-c:            ORG-NETRAVNEN-DN42
+mnt-by:             NETRAVNEN-MNT
+source:             DN42
+certif:             -----BEGIN PGP PUBLIC KEY BLOCK-----
+certif:             
+certif:             mQGNBF8BzRwBDADXhylTOPMYTphe31YyWm8Y22usJEQhPJlnaN0dUdNK84PLJ39X
+certif:             ApSdJ0+M4w7ePiM16KARETI5l58cbWLxeYx6biCT7+TXy28bCqI+M3mx9nsDEakj
+certif:             Gsx/h0FZdQ2tRlm6x+BtS0KgPk9efB6DrT6HADxAnVjPq0QJCUTVajyX4CknZ41f
+certif:             H0lpCWRyORDSZezXpe4ZkJjyzujiVeGRsbTEQEoUWrwAFDMtSYRgLqhTYiftChG7
+certif:             eQKdLTc2MJ0eD30bbr3NbrbphbFYcUcsb5kMbG6YH7noZaqvV9qdU9ROuWCYopIR
+certif:             bsBylULPOWzmlwXVgz1f8fk2AruUncBsHxluiR0Q3TL+oY8xqoELmhshfKlmFJsl
+certif:             zF+ohKh8EWXFPQah3rSEq5ypwKeBX+h2b+W+wNL6jwVhIaDaqtwaPoEkDCIvpRQ9
+certif:             nqQ2TvURoOvQCcTNLXxzgRE0PxTCksVuIyHzfsblCehqDsrvab7gWwnwHlLaYLWC
+certif:             KCr+7wCxzWsSWjUAEQEAAbQlTmV0cmF2bmVuIDxuZXRyYXZuZW4rd2JrcTlAZ21h
+certif:             aWwuY29tPokB1AQTAQoAPhYhBEhTWv1boMq8gcIIm+lXh8Bi4/YpBQJfAc0cAhsD
+certif:             BQkDwmcABQsJCAcCBhUKCQgLAgQWAgMBAh4BAheAAAoJEOlXh8Bi4/YpdkYL/1s3
+certif:             0hGUoQfOiovHZUkDWtiw3TYZIMVwc8OT2tCS2jzbeA38SI8I0aPPlUcHS72pF8qR
+certif:             zEmuRW65xIRebvtX0Boa1XK0+AveaB52cSSutD91GO6MDT75eqsdoR0DMo25wd4+
+certif:             IqwnzUg9Y+Y5eoX2Vw+go96h/XgWd8lnS7o3wr0KRQBTCfF4lxbFfD4yobH8GJgV
+certif:             BVFDGY8mAfTd+2B2/B1eEd8fdbypPvu0LaC9KSl46TvhC8gJyZ4J24EUDxytiryf
+certif:             v99M2NcZyHTPJAdf7/k7T+ucQqz/aZg550HtSGAX2x/2LeQEB7RlSTVGjk+tuc25
+certif:             Vw2RhlYAuUDXso+lRe/jizcaqyQLg8fwzMmxJlCQAA8e01BQjTFXcwOx8xLIS28A
+certif:             st6nRwNrVWnd/deXXd+OOT6vz0PvGYgP3PLjv0Bn/SIlfdyej8WBfXkiOmggjwrB
+certif:             060rUOQkQIDCZS0AWRJPXkgTLXvxNu1S6BFM39JmARsXpuA91Yfha6Ba7XiLRrkB
+certif:             jQRfAc0cAQwAtNMs5gqGRVGXVF2DwuKLdZMhtg/J6q1M5CH78cse2AggDl78OUZl
+certif:             daqUrhoRq56g4wVHIGioyshcWN1z6RavNBMtPQpOMTOKzWsJQwOe1UmFnMCiAIoo
+certif:             J93jHdegIX41EgrHCr2hqsxJHKp1kg5jaJ7MEDhnYYzGTfLJz4lX72RREAZR4wRF
+certif:             1Hc/qfAMEPcoD9BdO0ek9CrytxrRRAmPHxJ6SSWAo23fhi0yPGnL/Jgbn5cnNtLg
+certif:             A7GB8Hqfj0viOkBczHd9dfvII/e77PHx5apIRX45ScheScvRkLipSF90pCdps1Ao
+certif:             oFQMpHUn+Q8tcrgJa+fwKvBYjl7Ys6xGSsh4MU8bALKXtgwcNuho/OrnDc8p5lL0
+certif:             CgfZ6XdDRJzmY+KZPUDMiCHgO31E6qYhUtPDTpBDyAgke7wzWkhw0B8En9yELmOW
+certif:             HtCmeNawuYN265EDml/IcjxgztU9zyzOu7QGWmU7LHMRkpkgS3Jn5u2Qy5ACrR5Y
+certif:             gPc1IgCk8FORABEBAAGJAbwEGAEKACYWIQRIU1r9W6DKvIHCCJvpV4fAYuP2KQUC
+certif:             XwHNHAIbDAUJA8JnAAAKCRDpV4fAYuP2KROgDACCwmd8xC6QKoCju+KJiBX+DIcQ
+certif:             bZLMbkYeiYOgGfL6EpRGU3ut6UAbZK2scmWxeQwvXwaW7RfrS1/H7NY+NFOEwJVs
+certif:             R5bUxQHQDThpqwcye35Jnp0h8jLZJE9R4vbuPVkW6KRvu50Bmt6W21Cr4W30IS1p
+certif:             XUXkvCsQaWXa4UycHQNqQpvxsTxzVepwhtNEPtyLRkGT3en84QWmdvBFZH5Nzzjg
+certif:             AYIy0a80Qs1kZVe6nlwaUy+yg+Ae19Snfh5Ok+St0dpkfGSRlmS7V9IFleNEv3Gf
+certif:             SdGcmninqK1Sto2pMfTwyMNqAxU8pLTOo9DtpdpdwnHfIKT1wParMAAcZsA+8CuV
+certif:             k1RY2sw+PDnifOBXjZNuxqtqKxl5p/UorXROCCndrlTDLdf99pHOHw3MRQ0IqSNZ
+certif:             D1vvFAs7TSNxr9KSgXfVIwqIIhDAQQt7pYX/XtXULJL/d2qLIAIA+k1j+9snnFaZ
+certif:             L9co+dSIZlUV/tu3Y8aL1jgZLH4Eb4xhk810ags=
+certif:             =jM0B
+certif:             -----END PGP PUBLIC KEY BLOCK-----
--- a/data/mntner/NETRAVNEN-MNT
+++ b/data/mntner/NETRAVNEN-MNT
@ -2,7 +2,7 @@ mntner:             NETRAVNEN-MNT
 admin-c:            ORG-NETRAVNEN-DN42
 tech-c:             ORG-NETRAVNEN-DN42
 mnt-by:             NETRAVNEN-MNT
-auth:               PGPKEY-08EBD2E8
+auth:               PGPKEY-62E3F629
 source:             DN42
 auth:               ecdsa-sha2-nistp521 AAAAE2VjZHNhLXNoYTItbmlzdHA1MjEAAAAIbmlzdHA1MjEAAACFBABagVdusHYzzIU1pwPLzd5utY1YEaRUReAraTc8duHi73eSIuTFoRInK7K7gz/YPeSP3Ih/dN8A9Z3eghaGv398nAFXvHGQE/VKzfUs5V1quBkCs5rq9mjpN60Udh/A7kgOw719+QOm6w9Uqe0Vf/kwkTaeEp4gaaQ1vtfODve9yb2gQg== ws-win-00021
 auth:               ecdsa-sha2-nistp521 AAAAE2VjZHNhLXNoYTItbmlzdHA1MjEAAAAIbmlzdHA1MjEAAACFBAH8OAaKbEkZLTAfuWTR/VSq3TKAfC0YVXOKLfnYWamiXB927ISuG19v/5Vxlu29ZWjxCg0lCEeR1c08q3oIA4jKFgBAeHEFm2bgF42JPlrqPp8EDyg9/VzqJmky808aoIlXnfO6K/kENRRMzT3A7vmE5xQFmAmTJ3bP8HgKS15SlrY6NQ== NIA3O9L