modifications of the monotone related pages.

I think this addresses most of zab's concerns, but monotone.html still needs more work.
2012-10-05 22:45:27 +00:00
parent 42971812f2
commit bd43e09afd
5 changed files with 242 additions and 52 deletions
--- a/www.i2p2/pages/_monotonerc.html
+++ b/www.i2p2/pages/_monotonerc.html
@@ -0,0 +1,26 @@
+
+<code>
+<pre>
+function intersection(a,b)
+      local s={}
+      local t={}
+      for k,v in pairs(a) do s[v.name] = 1 end
+      for k,v in pairs(b) do if s[v] ~= nil then table.insert(t,v) end end
+      return t
+    end
+
+function get_revision_cert_trust(signers, id, name, val)
+   local trusted_signers = { "complication@mail.i2p", "zzz@mail.i2p", "dev@welterde.de",
+          "Oldaris@mail.i2p", "sponge@mail.i2p", "dream@mail.i2p", "mathiasdm@mail.i2p",
+          "mkvore-commit@mail.i2p", "z3d@mail.i2p", "cervantes@mail.i2p", "BlubMail@mail.i2p",
+          "walking@mail.i2p", "neutron@mail.i2p", "HungryHobo@mail.i2p", "russiansponsor@mail.i2p",
+          "echelon@mail.i2p", "forget@mail.i2p", "privateer@mail.i2p", "duck@mail.i2p",
+          "m1xxy@mail.i2p", "hiddenz@mail.i2p", "dev@robertfoss.se", "hamada@mail.i2p",
+          "magma@mail.i2p", "kytv@mail.i2p", "str4d@mail.i2p", "meeh@mail.i2p" }
+   local t = intersection(signers, trusted_signers)
+   if t == nil then return false end
+   if table.getn(t) >= 1 then return true end
+   return false
+end
+</pre>
+</code>
--- a/www.i2p2/pages/developerskeys.html
+++ b/www.i2p2/pages/developerskeys.html
@@ -0,0 +1,202 @@
+{% extends "_layout.html" %}
+{% block title %}I2P Developer's MTN Keys{% endblock %}
+{% block content %}
+<h1 id="commit">Developer Commit keys</h1>
+<pre>
+[pubkey jrandom@i2p.net]
+MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDOLw05kZbux5KLdp
+rcGHeCTlyt+GjhGXh7Aups+QMD/FEbIVEFPGIBG2ju3069TKIHpXr5
+HEe5maBgtIJBM9NPVvMNFCgOSregmnVIpxSgHd+Wiu1Iyzhd0SxC5p
+CHdnwSjv051fctYcp1rs5OcUojUdvF7tq91zAAY+kLxpX6zQIDAQAB
+[end]
+
+[pubkey complication@mail.i2p]
+MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCx1F6nwBUCIiCPVs
+ogy/h/+2d8X3uMcEdnRIN+gxO+0pK+yrGZiFwi7TG/K3PjDfJWuxsP
+RKLeb9Q4NmfxrAePelGig9llalrDnRkIcRFucnNUOJo9C0MjvzYR9D
+6bIS3+udPdl6ou94JX+ueo2jLXI1lGgtdWDWTetJx9I++EvwIDAQAB
+[end]
+
+[pubkey zzz@mail.i2p]
+MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCtgaWY0Wc1c8pFGI
+xASZx78pHpHZKQV8z6IRQkgy65gQMjpLquaQpy3Xk8rkpnfA+6h3TS
+6bjplsEhlaQoxvpGxacRYOt+y1HC/n20O3RIE1A/e3sGKHGDEQW+3I
+tF4WSNfeQ18DzLeun32vFknq2k9im6Ts4tiYfKs8CZ5KW0/QIDAQAB
+[end]
+
+[pubkey dev@welterde.de]
+MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDRnJUBY0d4310UpZ
+YGUlsWgxWHoD8bsKtTvGw83vwUQRtM2xPKxCHvEntg9Dgiqr5RurOK
+HK7Eak6WgxCXQFfC9ALr4SoC5abI4ZFvM/CAWRb547UIPTchSnuDUn
+/TSgDGqtGvMFS9t6OUp9Z/7QzIjLQhhBCqj4/hZhxUJ61XBwIDAQAB
+[end]
+
+[pubkey Oldaris@mail.i2p]
+MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC/wN6IERnEJzL6X7
+UXpGwkf8DII5pFiGmpLyAphMK3zVUwJCFqEJWdOBpUa8hq6wmXCGVP
+aDZZ1K+M/6XNxNSR2JX/4+18EjOt8OWnMy1agpZo6dlRbBQyFUjlwz
+GbulGSo/pP/bY8S4KeTi6bzkkiUvvIKWKX8/53tZesgUg3KwIDAQAB
+[end]
+
+[pubkey sponge@mail.i2p]
+MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDmKJfJ2KFI8BLYa0
+38oc2LNRCr44ardR6VIeEVY/RTKj62KbFKttU5nmTwBDEnKTkzjq+c
+M8jNKGDB2HbGF9em+FQFvf1tLYgtfV8ArkODdKrjhBpAoizbb0Gc5W
+5NDrV87X8mB352RBiJ/6Chy4pe3Bi5qRA3sBge2sVaD2uEPQIDAQAB
+[end]
+
+[pubkey dream@mail.i2p]
+MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDTuU8WYdNydjKucb
+0E4Y+JD60AgHDU/9L0Tga1YA/JT1T2BDWLdYIh5uzf6XgzxFvFEx1F
+c2ZYRu+XwjMlM9NDHgkTUQwMT6NeGOUhB0e+ypxVxIp3iyNbAAGQsq
+iJR7/EDKN1AhfFMCXQSnl3OLSU9J2gfgqOIeeSabPOiVXpcwIDAQAB
+[end]
+
+[pubkey mathiasdm@mail.i2p]
+MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCo5hy9RZ9yQJ7jze
+u9IBTZ8kQA+APiUpsTBTHXYT1CGkeDddoll5sD97Vk4yWxLMu5BE/C
+rJKnZqrueblpgQ1xBsA04wzQlXKRJIv3W/woElRX23SFImlRo4/1Yl
+ckUet7YnG0ryielCxvg3aQE5mbVi/igFx11vkhnJ8ajDgZwIDAQAB
+[end]
+
+[pubkey mkvore-commit@mail.i2p]
+MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC5Q8Wz2Ag0RTpus1
+QKYHZwf1/MxxTV+jANXBUyKUFnIA+jgw7ltUEZ+nw9NTfEUrNGcgJn
+PtBwDqTtbbYYiRG2D2YXlIqTpdZl5tC+lbPeHV1tRjyGpvdlbPBepp
+xAdrROmt0MnXG8JZiDGLrsD4+CPnzClFdhwK/MMIv75iMpiwIDAQAB
+[end]
+
+[pubkey z3d@mail.i2p]
+MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDYGyxsmalo1CNHnS
+Tx0e3TyAWcGw9zFuGj/scRg72/b3JRsY5rxedp5S+8EE2GrkUNGFBz
+K+OHhxuGqJVVBe+IqRNHKVHhibTG+PlMZ9llqxevhXAbXD3ZLES3//
+5u5UCZp0UDJNGp6WvykHSLg4YeF3SN0aBedHM46rGu/rCycQIDAQAB
+[end]
+
+[pubkey cervantes@mail.i2p]
+MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCryEmQRgq/fp1v17
+thtVmr6PQq7MS7TDNaklZTGbcDwh/29eCwajiWjPfjAAG6uXgi5rz7
+8U4M6GXHGZbwZ3uECXDn3XO+0lqMair/hs9Z2iPT3bk4kO7MvELKk8
+Cje3FvhpFxGrPkiipsFrm3vxK9wu1nsgIt4RefmvzE4GGO5wIDAQAB
+[end]
+
+[pubkey BlubMail@mail.i2p]
+MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCxrz9mlNzwyQ8Jgq
+dhUZWZ0ZNOAcPS0aAsewR93jj4Sizq0L623cE5FNavoGa0FyC5Pei5
+rXOutgZ/q6tfj3ty8WVv67+zacPCLKnLiMHM5ZqnzdlTiUrvq95rE4
+z35zaeNaXL2HWK0AjJccG2+VMjaGpYWsqOBC4JXBlC+b37sQIDAQAB
+[end]
+
+[pubkey walking@mail.i2p]
+MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC6p3gEkln5OtrXhn
+NgqNrUMMWm9qgIeYPceoasOWVbDYdaLVRcr6Zm/C89fYyCgC94Fyhe
+TTkmFx2p5AkUBR9uQP73YYVG6yBQZzcE3QLWqarxvISIkLIG9Y+a+Y
+jO8KPv9nZLOI0cPR9PzIO6KdhNQHOYF6cdGY/KQTW/qPVPcwIDAQAB
+[end]
+
+[pubkey neutron@mail.i2p]
+MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCWkZsO+JevhpRyUJ
+mFc//7LDkXwUOyaN5Iy58Q6LlxL77OSe9xv6T6re/+GwTK29GobBlx
+nE891iMZrrz36RbVnmQhLELv2H+268nx4sgL8P+OLvTtQRiffabPlO
+0zYmVh0rF+JnCuopBzPuioJq7AzqQB1LY/qwY4HnVGnc5ecQIDAQAB
+[end]
+
+[pubkey HungryHobo@mail.i2p]
+MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQClWkCeQRmzUOX4dI
+6Ug7gCFR9iIhKZZCNFsfu+xfPSWzLUuu/+UVxq/wFqQiI4iIsx6NzO
+Ag6QgyvUiIFrutasa8diNITnqxfJkA918W/v4iLLuB1ppy0Jaog0OK
+ttDrf7S/puZUNfi8PKDPEGdbGDZ2rLN3gRslnaKqSHlSO7xQIDAQAB
+[end]
+
+[pubkey russiansponsor@mail.i2p]
+MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDENEaXsL9AnH0lLt
+JzMVfz4u6sck+TLXJjijZr61BJAvIQhaGwnGBkzA9Cn/yUaFUF7L+/
+eFBHRkaYFQ6ITfOXioKq07UAJyKO7X+mTIaBUNy/if7DY+cRmCUBhJ
+XU7EitmCJdu9Pqteo74Icpw7dhYUuhg9R2oD5BIxJGGdzfrwIDAQAB
+[end]
+
+[pubkey echelon@mail.i2p]
+MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC/oVMwyzMaSsH2WF
+gl209ZZn1TMGYo6SDBn3aI7Ohw5iIujBWX6D+p74iTkrlL1JOjmI2+
+nvStbCFbKcm4VxFQFrJ3DydrRGCmmRNhm8tKewei36sdhXzbAzxDTq
+BZOpmNL/TYQtpRgozKHmmix8yDgncva0TWSOjUmHRArXfAiQIDAQAB
+[end]
+
+[pubkey forget@mail.i2p]
+MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDfQR7tQMh4xGCq0R
+9BXQ0HnYbEZYnf+aprSuEfy3ji3x7VFwJ/TkfGDhNgrHh2/uBQ+P7y
+1OFygEPalOkIc2FwJ51yWMac/YnQWPNTo3mtr6V7NfnC7UnForkJyI
+iLNhi0kVfm9719W391byclB/9t7O6ZYynO1qXRuco5e8jI7QIDAQAB
+[end]
+
+[pubkey privateer@mail.i2p]
+MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDrUQmgzVrk0cO85H
+CefU5ZHAOZeauLL4gXjRcEpYqtLA1XxDmqYDupfLc/SWxmN4ElIb8h
+GN048REUGk6umzbGQvUK6z62mHigF2JeqMbgwxzzIPk7K26gncmadT
+6+0B3TBsUW7A6KeoCKdID2IL6CqB3qGyFLkRtY10G23zHOCQIDAQAB
+[end]
+
+[pubkey duck@mail.i2p]
+MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCwmWqF56heG7WQb2
+mrGqv6GuMDXhS/Lu2DZDAIvZGHYNyWBO4x3Lis48A0jHZDSqYzIqyE
+J+BFwg4AjvOiPziEbD8SJ6/pCAfIZpk6E8lExZn6VhypIDIJMmH/bq
+BK31bC++XaWp34v9xc9tZRKJiYmhRb6EVA/IapG8A/t+TQVwIDAQAB
+[end]
+
+[pubkey m1xxy@mail.i2p]
+MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC/aaFUq37RQdJpMC
+8aacqYLdd88wNVjwI+4HY5d7a61HvYIAecg1KJlq/CDFFrygmCcusn
+FaBmmBQFLO+gJXPKi9PMo1vaENiqCTVfY4EUpMMYzpuqKMKjyfuT6e
+oOHCZEKfZosUowyJt61FsTzGu+B9y27d0jxXwXT/fml100EwIDAQAB
+[end]
+
+[pubkey hiddenz@mail.i2p]
+MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCnpEeIignM2UUsJT
+9+hSMcVOUuf0PZTxi9G3zRhDjal8Qdy/NUZQELAc6/gBhnZcSP4BHp
+/0BTTxXthlTjko8nkwx+EgzQO425Vgb1v/7RneCqEDjMP6QyZUOn1H
+i2UBw+jvnbjFk1wDqt9BPdAKITfp3l7bR1xGr4gs1M4MSrcwIDAQAB
+[end]
+
+[pubkey dev@robertfoss.se]
+MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDW/j5vyMJLTI2YoZ
+emcSETQI6FW2kq2CQuA6UU2vjhIlqIITBHCjgTpjIocpKxodHrR20j
+1aGWh3SoGdFa79NLLZvVH8h1cjYmBhDWTvrlefH94v74+TnL+Z9oUN
+oJ4nWsFD66vB76i9e/MsI1CcarQmRrf4HjLYGm+ME4oJMyNQIDAQAB
+[end]
+
+[pubkey hamada@mail.i2p]
+MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCmBYkINIl+HDcdPz
+bID2zmd309oe6XX2EmVdngTn6mgXVh5G47Wx2y6V8XMYFMsTQOUBba
+PAIzAKOlQ7O1lOb8HDXYf42iO4IG0QH0XV8eZUugYumtomtAu8qCUy
+3/ux1+xmFJQ0CbU9178EDqZsz/EaH1xfkkh4XJ3TXtvcEBZQIDAQAB
+[end]
+
+[pubkey magma@mail.i2p]
+MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCkwYsTheWK9/gwS0
+Aoz0PQZD/I428ZAFmdZfZNNSyVgV9EHopHgATIJr6gi+UYhem1hwiQ
+2J8G7/ZCptwT8syFRKuj/CIyeUPEALCNGrWaWrVVBoBS5VNHkS0Nq0
+1pT7I2K+y52vvMMyE1O/4BTkA35mvTL0wA80zRuZ199eOUsQIDAQAB
+[end]
+
+[pubkey kytv@mail.i2p]
+MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDMMTHQs4AQ0KuXjH
+sPRvfeBo2EydIAcGcBH7VCO26AofX2ns3ezTKfvmv6QcFhcxn41I6O
+dG29DdFVRz4D8hIZvOoFYfe87nswgyXW85rEilJP02Z8HCr/dcYJbP
+sWAlMr7/UIDsT/9swd0U6QTf9X2W+VORyhDdYXcG8zikBqXQIDAQAB
+[end]
+
+[pubkey str4d@mail.i2p]
+MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDe4zkWVW8fBXGtnM
+pWbw316qbxWhKdnM86bnPyU3a8C2ERaofESzoZPXm21BR4jEqHLFzV
+zni4MTAJ+J0XjW70Le5DZTm/AG18qXd8UsK2+IreCHqnv5XPL8Lw8o
+Y6zNoT834emGqH2n0T98OHF6zNUStBrvuv9AFPa6FZocF2mwIDAQAB
+[end]
+
+[pubkey meeh@mail.i2p]
+MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDCXk4uuZsnO+JhSd
+8MVUxJh9aSHde0dPxHOgWgcfdrcH1crn5SPhTFQVe2ZY7HuwbQPDb3
+ZAQSLNx4odZpC0U6s6wejJgWwGl3h232aMU/LO3qAXtjOzpt1HNg7x
+Wcw2E10Ag1K6qLpxs3TJy3BEJvPIghUMeWbfE5XbaUgkbuFQIDAQAB
+[end]
+</pre>
+{% endblock %}
--- a/www.i2p2/pages/license-agreements.html
+++ b/www.i2p2/pages/license-agreements.html
@@ -6,29 +6,8 @@
 </p><p>Following is a monotonerc file defining the current trust list.
 Developers must use this file in ~/.monotone/monotonerc or
 _MTN/montonerc in their i2p.i2p workspace.
-<pre>
-function intersection(a,b)
-      local s={}
-      local t={}
-      for k,v in pairs(a) do s[v.name] = 1 end
-      for k,v in pairs(b) do if s[v] ~= nil then table.insert(t,v) end end
-      return t
-    end

-function get_revision_cert_trust(signers, id, name, val)
-   local trusted_signers = { "complication@mail.i2p", "zzz@mail.i2p", "dev@welterde.de",
-          "Oldaris@mail.i2p", "sponge@mail.i2p", "dream@mail.i2p", "mathiasdm@mail.i2p",
-          "mkvore-commit@mail.i2p", "z3d@mail.i2p", "cervantes@mail.i2p", "BlubMail@mail.i2p",
-          "walking@mail.i2p", "neutron@mail.i2p", "HungryHobo@mail.i2p", "russiansponsor@mail.i2p",
-          "echelon@mail.i2p", "forget@mail.i2p", "privateer@mail.i2p", "duck@mail.i2p",
-          "m1xxy@mail.i2p", "hiddenz@mail.i2p", "dev@robertfoss.se", "hamada@mail.i2p",
-          "magma@mail.i2p", "kytv@mail.i2p", "str4d@mail.i2p", "meeh@mail.i2p" }
-   local t = intersection(signers, trusted_signers)
-   if t == nil then return false end
-   if table.getn(t) >= 1 then return true end
-   return false
-end
-</pre>
+{% include "_monotonerc.html" %}

 </p><p>Agreements:
 <pre>
--- a/www.i2p2/pages/monotone.html
+++ b/www.i2p2/pages/monotone.html
@@ -437,29 +437,7 @@
  `monotonerc` with a text editor. Copy and paste two functions into this file:
 <p>

-<code><pre>
-    function intersection(a,b)
-      local s={}
-      local t={}
-      for k,v in pairs(a) do s[v.name] = 1 end
-      for k,v in pairs(b) do if s[v] ~= nil then table.insert(t,v) end end
-      return t
-    end
-
-    function get_revision_cert_trust(signers, id, name, val)
-      local trusted_signers = {
-        "jrandom@i2p.net",
-        "complication@mail.i2p",
-        "zzz@mail.i2p",
-        "dev@welterde.de"
-      }
-      local t = intersection(signers, trusted_signers)
-      if t == nil then return false end
-      if table.getn(t) >= 1 then return true end
-      return false
-    end
-</pre></code>
-
+{% include "_monotonerc.html" %}
 <p>
  Read the functions carefully to understand their purpose, and compare them with
  sample functions and descriptions provided in section 6.1.5 ("Trust evaluation
--- a/www.i2p2/pages/newdevelopers.html
+++ b/www.i2p2/pages/newdevelopers.html
@@ -8,7 +8,7 @@
 </p>
 <p>
  Not quite ready for coding?
-  Try <a href="getinvolved.html">getting involved</a> first.  
+  Try <a href="getinvolved.html">getting involved</a> first.
 </p>

 <div id="TOC">
@@ -60,15 +60,20 @@
    </p>
  </li>
  <li>
-    Pick a directory where you want to put all your I2P files, and create a monotone database: <b>mtn -d i2p.mtn db init</b>
+  Pick a directory where you want to put all your I2P files, and create a monotone database: <code><b>mtn -d i2p.mtn db init</b></code>
  </li>
+  <li>Define the trust list by creating <code>~/.monotone/monotonerc</code> (or <code>_MTN/monotonerc</code> in the i2p.i2p workspace) with the following contents:
+{% include "_monotonerc.html" %}
+</li>
+  <li>Copy and paste the <a href="developerskeys.html">developer's commit keys</a> into a new file (e.g. <code>keys.txt</code>) in the same directory
+    that <code>i2p.mtn</code> is in. Import the keys into your database with <code>mtn -d i2p.mtn read < keys.txt</code>.
  <li>
    Pull the I2P sources to your machine. This may take a long time, especially if you are doing this over I2P!
    <ul>
-      <li>Anonymously: <b>mtn -d i2p.mtn pull 127.0.0.1:8998 i2p.i2p</b></li>
+      <li>Anonymously: <code><b>mtn -d i2p.mtn pull 127.0.0.1:8998 i2p.i2p</b></code></li>
      <li>
        <p>
-          Non-anonymously: <b>mtn -d i2p.mtn pull mtn.i2p2.de i2p.i2p</b>
+           Non-anonymously: <code><b>mtn -d i2p.mtn pull mtn.i2p2.de i2p.i2p</b></code>
        </p>
        <p>
          Alternatively, instead of 'mtn.i2p2.de', you can also download from mtn.i2p-projekt.de.
@@ -77,7 +82,7 @@
  </li>
  <li>
    <p>
-      All the sources are now present on your machine, in the database file. To make them available in a directory, you need to check them out: <b>mtn -d i2p.mtn co --branch=i2p.i2p</b>
+    All the sources are now present on your machine, in the database file. To make them available in a directory, you need to check them out: <code><b>mtn -d i2p.mtn co --branch=i2p.i2p</b></code>
    </p>
    <p>
      The above command creates a directory i2p.i2p, which contains all of the I2P sources.
@@ -165,9 +170,9 @@
 <h2 id="tools">Tools</h2>
 <p>
 I2P is open source software that is mostly developed using open sourced
-toolkits.  The I2P project recently acquired a license for the YourKit Java
+toolkits. The I2P project recently acquired a license for the YourKit Java
 Profiler. Open source projects are eligible to receive a free license provided
-that YourKit is referenced on the project web site.  Please get in touch if you
+that YourKit is referenced on the project web site. Please get in touch if you
 are interested in profiling the I2P codebase.
 </p>