Compare commits
2 Commits
9fb0100cde
...
e84ed0623e
Author | SHA1 | Date |
---|---|---|
netravnen | e84ed0623e | |
netravnen | 7ea5a50cfc |
24
rfc8416.php
24
rfc8416.php
|
@ -217,13 +217,13 @@ foreach ($raw_array as $sub_array)
|
|||
}
|
||||
}
|
||||
|
||||
$roas["metadata"]["human"]["commit"] = shell_exec ("/usr/bin/git -C ../registry/ log -n 1 --date=iso8601 --merges --pretty='format:%H'");
|
||||
$roas["metadata"]["human"]["merge"] = shell_exec ("/usr/bin/git -C ../registry/ log -n 1 --date=iso8601 --merges --pretty='format:%p'");
|
||||
$roas["metadata"]["human"]["author"] = shell_exec ("/usr/bin/git -C ../registry/ log -n 1 --date=iso8601 --merges --pretty='format:%an'");
|
||||
$roas["metadata"]["human"]["date"] = shell_exec ("/usr/bin/git -C ../registry/ log -n 1 --date=iso8601 --merges --pretty='format:%aD'");
|
||||
$roas["metadata"]["human"]["subject"] = shell_exec ("/usr/bin/git -C ../registry/ log -n 1 --date=iso8601 --merges --pretty='format:%s'");
|
||||
$roas["metadata"]["human"]["url"] = "https://git.dn42.us/dn42/registry/commit/";
|
||||
$roas["metadata"]["human"]["url"] .= $roas["metadata"]["human"]["commit"];
|
||||
//$roas["metadata"]["human"]["commit"] = shell_exec ("/usr/bin/git -C ../registry/ log -n 1 --date=iso8601 --merges --pretty='format:%H'");
|
||||
//$roas["metadata"]["human"]["merge"] = shell_exec ("/usr/bin/git -C ../registry/ log -n 1 --date=iso8601 --merges --pretty='format:%p'");
|
||||
//$roas["metadata"]["human"]["author"] = shell_exec ("/usr/bin/git -C ../registry/ log -n 1 --date=iso8601 --merges --pretty='format:%an'");
|
||||
//$roas["metadata"]["human"]["date"] = shell_exec ("/usr/bin/git -C ../registry/ log -n 1 --date=iso8601 --merges --pretty='format:%aD'");
|
||||
//$roas["metadata"]["human"]["subject"] = shell_exec ("/usr/bin/git -C ../registry/ log -n 1 --date=iso8601 --merges --pretty='format:%s'");
|
||||
//$roas["metadata"]["human"]["url"] = "https://git.dn42.us/dn42/registry/commit/";
|
||||
//$roas["metadata"]["human"]["url"] .= $roas["metadata"]["human"]["commit"];
|
||||
|
||||
/*
|
||||
* Function: Add metadata
|
||||
|
@ -236,15 +236,15 @@ $roas["metadata"]["human"]["url"] .= $roas["metadata"]["human"]["commit"];
|
|||
* Numbers must be unquoted integers, and timeformat must
|
||||
* be epoch format. TImezone is set to Etc/UTC.
|
||||
*/
|
||||
$roas["metadata"]["counts"] = (int)count($roas["locallyAddedAssertions"]["prefixAssertions"]);
|
||||
$roas["metadata"]["generated"] = (int)(date_format(new \DateTime("now",new \DateTimeZone("UTC")),"U"));
|
||||
$roas["metadata"]["valid"] = (int)(date_format(date_modify(new \DateTime("now",new \DateTimeZone("UTC")),"+3day"),"U"));
|
||||
//$roas["metadata"]["counts"] = (int)count($roas["locallyAddedAssertions"]["prefixAssertions"]);
|
||||
//$roas["metadata"]["generated"] = (int)(date_format(new \DateTime("now",new \DateTimeZone("UTC")),"U"));
|
||||
//$roas["metadata"]["valid"] = (int)(date_format(date_modify(new \DateTime("now",new \DateTimeZone("UTC")),"+3day"),"U"));
|
||||
//$roas["metadata"]["signature"] = "";
|
||||
//$roas["metadata"]["signatureData"] = "";
|
||||
|
||||
// Additional human read-able DateTime format, example: 2013-04-12T15:52:01+00:00
|
||||
$roas["metadata"]["human"]["generated"] = date_format(new \DateTime("now",new \DateTimeZone("UTC")),"c");
|
||||
$roas["metadata"]["human"]["valid"] = date_format(date_modify(new \DateTime("now",new \DateTimeZone("UTC")),"+3day"),"c");
|
||||
//$roas["metadata"]["human"]["generated"] = date_format(new \DateTime("now",new \DateTimeZone("UTC")),"c");
|
||||
//$roas["metadata"]["human"]["valid"] = date_format(date_modify(new \DateTime("now",new \DateTimeZone("UTC")),"+3day"),"c");
|
||||
|
||||
writeRoutinatorExceptionFile($roas);
|
||||
|
||||
|
|
10
update.sh
10
update.sh
|
@ -50,13 +50,14 @@ echo "## Notes
|
|||
- [bird_route_dn42.conf](bird_route_dn42.conf)
|
||||
- [bird4_route_dn42.conf](bird4_route_dn42.conf)
|
||||
- [bird6_route_dn42.conf](bird6_route_dn42.conf)
|
||||
- These files are [Routinator][2] compatible:
|
||||
- These files are [Routinator][2] and [gortr][3] ([src][6]) compatible:
|
||||
- [export_rfc8416_dn42.json](export_rfc8416_dn42.json) _(SLURM standard, format specified in [RFC 8416][4])_
|
||||
- These files are [gortr][3] compatible:
|
||||
- [export_dn42.json](export_dn42.json)
|
||||
|
||||
Note the gortr file is DateTime stamped only, it is not signed with any certificaty. So you will need to add
|
||||
\`-verify=false\` as a runtime parameter when loading the cache file.
|
||||
Note the gortr source file is DateTime stamped only, it is not signed with any certificaty. So you will need to add
|
||||
\`-verify=false\` as a runtime parameter when loading the cache file. Alternatively, use gortr with a slurm file
|
||||
instead (e.g. `-slurm export_rfc8416_dn42.json`) as a command-line parameter.
|
||||
|
||||
## [Last merge commit][0] at [dn42 registry][1]
|
||||
|
||||
|
@ -72,7 +73,7 @@ $(git -C ../registry/ log -n 1 --date=iso8601 --merges |
|
|||
You can setup a [cronjob][5] to check in with updates to the ROA files listed
|
||||
above on regular intervals.
|
||||
|
||||
Currently the ROA files published here is refreshed every 6th hour if
|
||||
Currently the ROA files published here is refreshed every 10th hour if
|
||||
updates has been made to the [DN42 registry][1].
|
||||
|
||||
## Misc statistics
|
||||
|
@ -87,6 +88,7 @@ updates has been made to the [DN42 registry][1].
|
|||
[3]: https://github.com/cloudflare/gortr
|
||||
[4]: https://tools.ietf.org/html/rfc8416
|
||||
[5]: doc/crontab.md
|
||||
[6]: https://github.com/cloudflare/gortr/#configure-filters-and-overrides-slurm
|
||||
" > roa/README.md
|
||||
|
||||
# computer checksums
|
||||
|
|
Loading…
Reference in New Issue