commit cce0a4f1da0abbe0919734b69900a95837e04e6a Author: Tom Ritter tom@ritter.vg Date: Wed Dec 28 18:35:11 2016 -0600

Add a microdesc consensus link and close 20917

Also fix a tab/space thing and add a line to gitignore --- .gitignore | 1 + website.py | 9 +++++---- write_website.py | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore index 037b253..043a907 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,7 @@ *.p *.swp stem +stem-git

out/index.html out/graphs.html diff --git a/website.py b/website.py index 059fb7b..232c046 100755 --- a/website.py +++ b/website.py @@ -158,8 +158,8 @@ class WebsiteWriter: + "<table border="0" cellpadding="4" cellspacing="0" summary="">\n" + " <colgroup>\n" + " <col width="160">\n" - + " <col width="160">\n" - + " <col width="480">\n" + + " <col width="230">\n" + + " <col width="410">\n" + " </colgroup>\n")

# XXX Should also write if the displayed consensus is out of date @@ -175,8 +175,9 @@ class WebsiteWriter: if authority: authority = authority[0] self.site.write(" <td><a href="http://" + authority.address + ":" + str(authority.dir_port) - + "/tor/status-vote/current/consensus">consensus</a> <a href="http://" - + authority.address + ":" + str(authority.dir_port) + + "/tor/status-vote/current/consensus">consensus</a> (<a href="http://" + authority.address + + ":" + str(authority.dir_port) + "/tor/status-vote/current/consensus-microdesc">microdesc</a>)" + + " <a href="http://" + authority.address + ":" + str(authority.dir_port) + "/tor/status-vote/current/authority">vote</a></td>\n") else: self.site.write(" <td colspan="2" class="oiv">Missing entirely from consensus</td>\n") diff --git a/write_website.py b/write_website.py index 7803ba6..53ce72b 100755 --- a/write_website.py +++ b/write_website.py @@ -211,7 +211,7 @@ def main(): #subprocess.call(["gzip", "-9", archived]) #subprocess.call(["ln", "-s", archived + ".gz", archived])

- subprocess.call(["cp", os.path.join('data', 'historical.db'), os.path.join('out', 'historical.db')]) + subprocess.call(["cp", os.path.join('data', 'historical.db'), os.path.join('out', 'historical.db')])

# remove old files weeks_to_keep = 3