Merge pulls #918 & #924

- 918: About-Us: History, Staff Updates, & Signed Commits
- 924: Add Wladimir's Releases Key

_build/update_site.sh

@@ -7,6 +7,7 @@ PATH=/usr/sbin:/usr/bin:/sbin:/bin:/usr/local/bin
 
 source /etc/profile.d/rvm.sh
 
+AUTHORIZED_SIGNERS_DIR='/bitcoin.org/auto-build-committers.gnupg'
 REPO='https://github.com/bitcoin-dot-org/bitcoin.org.git'
 SITEDIR='/bitcoin.org/site'
 DESTDIR='build@bitcoinorgsite:/var/www/site'
@@ -39,6 +40,32 @@ fi
 git reset --hard origin/master
 git clean -x -f -d
 
+## Whether to auto-build or force-build
+case "${1:-nil}" in
+  auto)
+    ## From git-log(1):
+    ## %G?: show "G" for a Good signature, "B" for a Bad signature, "U"
+    ## for a good, untrusted signature and "N" for no signature
+    if ! GNUPGHOME=$AUTHORIZED_SIGNERS_DIR git log --format='%G?' -1 | egrep -q '^(G|U)$'
+    then
+      echo "Commit tree tip not signed by an authorized signer.  Terminating build."
+      exit 1
+    fi
+  ;;
+
+  force)
+    true
+  ;;
+
+  *)
+    echo "$0 <auto|force>"
+    echo
+    echo "auto: only builds if the latest commit is GPG signed by an authorized key"
+    echo "force: builds latest commit no matter what"
+    exit 1
+  ;;
+esac
+
 # Copy files to temporary directory
 rsync -rt --delete "$SITEDIR/" "$WORKDIR/"
 
@@ -70,14 +97,13 @@ do
 	fi
 
 	# Cancel script if a concurrent script has touched _buildlock
-	time=0
 	if [ -e "$SITEDIR/_buildlock" ]; then
 		time=`stat -c %Y "$SITEDIR/_buildlock" | cut -d ' ' -f1`
-	fi
 		if [ $time != $lasttime ]; then
 			echo "Build cancelled"
 			exit
 		fi
+	fi
 	sleep 1
 
 done

_less/screen.less

@@ -1846,10 +1846,22 @@ h2 .rssicon{
 .downloadbox p{
 	margin:0;
 }
-.downloadbox p a{
+.downloadbox p.downloadmore a{
 	font-size:90%;
 }
-.downloadbox a{
+.downloadbox p.downloadkeys{
+	font-size:80%;
+	margin-top:15px;
+}
+.downloadbox p.downloadkeys span{
+	display:block;
+}
+.downloadbox p.downloadkeys a{
+	display:inline-block;
+	padding: 5px 10px 0 20px;
+	background:url(/img/icons/mini_ico_key.svg) left 8px no-repeat;
+}
+.downloadbox div a{
 	display:inline-block;
 }
 .downloadbox div{

_templates/about-us.html

@@ -11,6 +11,13 @@ id: about-us
 
 <h2 id="own">{% translate own %}</h2>
 <p>{% translate owntxt %}</p>
+{% case page.lang %}
+{% when 'id' or 'da' or 'de' or 'es' or 'fr' or 'it' or 'hu' or 'nl' or 'pl' or 'pt_BR' or 'ro' or 'sl' or 'sv' or 'tr' or 'el' or 'bg' or 'ru' or 'uk' or 'ar' or 'fa' or 'hi' or 'ko' or 'ja' or 'zh_CN' or 'zh_TW' %}
+{% else %}
+  <p>{% translate owntxt2 %}</p>
+  <p>{% translate owntxt3 %}</p>
+  <p>{% translate owntxt4 %}</p>
+{% endcase %}
 
 <h2 id="control">{% translate control %}</h2>
 <p>{% translate controltxt %}</p>
@@ -32,14 +39,15 @@ id: about-us
 <h3 id="maintenance">{% translate maintenance %}</h3>
 
 <div class="credit">
-  <p><a href="https://github.com/saivann/">Saïvann Carignan</a><span>Website maintenance<br>Translation coordination</span></p>
+  <p><a href="https://github.com/saivann/">Saïvann Carignan</a><span>Website maintainer</span></p>
-  <p><a href="https://github.com/harding">David A. Harding</a><span>Website maintenance<br>Volunteer coordination<br>Documentation writing</span></p>
+  <p><a href="https://github.com/harding">David A. Harding</a><span>Documentation maintainer</span></p>
-  <p><a href="https://github.com/crwatkins">Craig Watkins</a><span>Wallet reviews</span></p>
+  <p><a href="https://github.com/crwatkins">Craig Watkins</a><span>Wallet maintainer</span></p>
 </div>
 
 <h3 id="translation">{% translate translation %}</h3>
 
 <div class="credit">
+  <p><a href="https://github.com/coderwill">Will Binns</a><span>Translation coordination</span></p>
   <p>Ar Vicco<span>Russian</span></p>
   <p>Simon Alexander Hinterreiter<span>German</span></p>
   <p>Jacob Burenstam<span>Swedish</span></p>
@@ -54,10 +62,16 @@ id: about-us
 <h3 id="inactive-contributors">{% translate inactive_contributors %}</h3>
 
 <div class="credit">
-  <p>Garland William Binns III<span>Translation maintenance</span></p>
   <p>Greg Sanders<span>Documentation Writing</span></p>
 </div>
 
+<h3 id="owners">{% translate owners %} — {% translate partial_list %}</h3>
+
+<div class="credit">
+  <p>Martti Malmi<span>(AKA Sirius)<br>Inactive</span></p>
+  <p><a href="https://github.com/theymos">Michael Marquardt</a><span>(AKA Theymos)</span></p>
+</div>
+
 <h3 id="github">{% translate github %}</h3>
 
 <div class="contributors">

_templates/download.html

@@ -76,13 +76,20 @@ lin64: "linux64.tar.gz"
         </span>
       </div>
     </div>
-    <p>
+    <p class="downloadmore">
       <a href="{{ PATH_PREFIX }}/SHA256SUMS.asc" class="dl">{% translate downloadsig %}</a><br>
       <a href="{{ PATH_PREFIX }}/{{ FILE_PREFIX }}.torrent" class="dl">{% translate downloadtorrent %}</a>
         {% if site.DOWNLOAD_MAGNETLINK %} <a href="{{ site.DOWNLOAD_MAGNETLINK | replace: '&', '\&amp;'}}" class="magnetlink" data-proofer-ignore></a>{% endif %}<br>
       <a href="/en/version-history">{% translate versionhistory %}</a>
     </p>
+    <p class="downloadkeys">
+      <span>{% translate releasekeys %}</span>
+      <a href="/gavinandresen.asc">v0.8.6 - 0.9.2.1</a>
+      <a href="/laanwj.asc">v0.9.3 - 0.10.2</a>
+      <a href="/laanwj-releases.asc">v0.11.0+</a>
+    </p>
   </div>
+
   <h2><img src="/img/icons/note.svg" class="warningicon" alt="note">{% translate patient %}</h2>
   <p>{% translate notesync %} {% translate full_node_guide %}</p>
   <p>{% translate notelicense %}</p>

_translations/en.yml

@@ -4,7 +4,10 @@ en:
     pagetitle: "About bitcoin.org"
     pagedesc: "Bitcoin.org is dedicated to help Bitcoin to develop in a sustainable way."
     own: "Who owns bitcoin.org?"
-    owntxt: "Bitcoin.org is the original domain name used with the first Bitcoin website. It was registered and is still managed by <a href=\"#development#\">Bitcoin core developers</a> and by additional community members, with the input of <a href=\"#community#\">Bitcoin communities</a>. Bitcoin.org is not an official website. Just like nobody owns the email technology, nobody owns the Bitcoin network. As such, nobody can speak with authority in the name of Bitcoin."
+    owntxt: "Bitcoin.org was originally registered and owned by Bitcoin's first two developers, <a href=\"https://en.bitcoin.it/wiki/Satoshi_Nakamoto\">Satoshi Nakamoto</a> and <a href=\"https://en.bitcoin.it/wiki/Sirius\">Martti Malmi</a>.  When Nakamoto left the project, he gave ownership of the domain to additional people, separate from the Bitcoin developers, to spread responsibility and prevent any one person or group from easily gaining control over the Bitcoin project."
+    owntxt2: "From 2011 to 2013, the site was primarily used for releasing new versions of the software now called Bitcoin Core. In 2013, the site was redesigned into its current form, adding numerous pages, listing additional Bitcoin software, and creating the translation system.  Developer documentation was added in 2014."
+    owntxt3: "Today the site is an independent open source project with contributors from around the world. Final publication authority is held by the co-owners, but all regular activity is organized through the public <a href=\"https://github.com/bitcoin/bitcoin.org#working-with-github\">pull request process</a> and managed by the site co-maintainers."
+    owntxt4: "Bitcoin.org is not Bitcoin's official website. Just like nobody owns the email technology, nobody owns the Bitcoin network. As such, nobody can speak with authority in the name of Bitcoin."
     control: "Then... who controls Bitcoin?"
     controltxt: "Bitcoin is controlled by all Bitcoin users around the world. Developers are improving the software but they can't force a change in the rules of the Bitcoin protocol because all users are free to choose what software they use. In order to stay compatible with each other, all users need to use software complying with the same rules. Bitcoin can only work decently with a complete consensus between all users. Therefore, all users and developers have strong incentives to adopt and protect this consensus."
     mission: "Mission"
@@ -21,6 +24,8 @@ en:
     documentation: "Documentation"
     translation: "Translation"
     inactive_contributors: "Inactive Contributors"
+    owners: "Domain Owners"
+    partial_list: "Partial List"
     github: "Contributors on GitHub"
   bitcoin-for-businesses:
     title: "Bitcoin for Businesses - Bitcoin"
@@ -251,6 +256,7 @@ en:
     notesync: "Bitcoin Core initial synchronization will take time and download a lot of data. You should make sure that you have enough bandwidth and storage for the full block chain size (over 20GB). If you have a good Internet connection, you can help strengthen the network by keeping your PC running with Bitcoin Core and port 8333 open."
     full_node_guide: "Read the <a href=\"/en/full-node\">full node guide</a> for details."
     patient: "Check your bandwidth and space"
+    releasekeys: "Bitcoin Core Release Signing Keys"
   events:
     title: "Conferences and events - Bitcoin"
     pagetitle: "Conferences and events"

en/full-node.md

@@ -24,12 +24,17 @@ Configuration](#network-configuration) section for details.
 
 If you know how to use PGP, you should also click the *Verify Release
 Signatures* link on the download page to download a signed list of SHA256
-file hashes. The file is currently signed by [Wladimir J. van der Laan's
+file hashes. The 0.11 and later releases are signed by [Wladimir J. van
-key](/laanwj.asc). His primary key's fingerprint is:
+der Laan's releases key](/laanwj-releases.asc) with the fingerprint:
+
+    01EA 5486 DE18 A882 D4C2  6845 90C8 019E 36C2 E964
+
+Earlier releases were signed by [Wladimir J. van der Laan's regular
+key](/laanwj.asc). That key's fingerprint is:
 
     71A3 B167 3540 5025 D447  E8F2 7481 0B01 2346 C9A6
 
-Many previous releases were signed by [Gavin Andresen's
+Even earlier releases were signed by [Gavin Andresen's
 key](/gavinandresen.asc). His primary key's fingerprint is:
 
     2664 6D99 CBAE C9B8 1982  EF60 29D9 EE6B 1FC7 30C1

img/icons/mini_ico_key.svg

@@ -0,0 +1,17 @@
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="16" height="16" id="svg2" version="1.1" inkscape:version="0.91 r13725" inkscape:export-filename="/media/X/bitcoin.org/current/img/icons/mini_ico_key.png" inkscape:export-xdpi="90" inkscape:export-ydpi="90">
+  <metadata id="metadata16">
+    <rdf:RDF>
+      <cc:Work rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+        <dc:title/>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs id="defs14"/>
+  <g id="g4">
+    <path d="M13.76 5.435c0 1.985-1.624 3.595-3.628 3.595s-3.628-1.609-3.628-3.595c0-1.985 1.624-3.595 3.628-3.595s3.628 1.6 3.6 3.595z" opacity=".99" fill="#329239" stroke="#329239" stroke-width="1.72" stroke-linecap="round" stroke-linejoin="round" id="path6" style="fill:#8b8b8b;fill-opacity:1;stroke:#8b8b8b;stroke-opacity:1"/>
+    <path d="M6.916 6.15l-5.565 6.75v1.815l1.099.011 1.375-.987.477-1.042 1.609-.05.311-1.523 1.403-.385 3.294-3.162z" fill="#329239" id="path8" style="fill:#8b8b8b;fill-opacity:1"/>
+    <path d="M11.764 4.37c0 .299-.242.541-.541.541-.299 0-.541-.242-.541-.541 0-.299.242-.541.541-.541.299 0 .541.242.541.541z" opacity=".99" fill="#fff" stroke="#fff" stroke-width="1.353" stroke-linecap="round" stroke-linejoin="round" id="path10"/>
+  </g>
+</svg>

laanwj-releases.asc

@@ -0,0 +1,36 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1
+
+mQINBFWKlBcBEACgZJd/6LrSgNSVxiyq5N9h0E7zgSHG/ahuWAnWeFtxaxHeukH+
+Q2Zq6F8FLbq40PphyroRylMBpzPBcyxjee7mDj1DpJ9ayv6GGPTyQzOImhChEV8p
+bA42dvXnB5ju0rPh2GxctbiZZD1kiPH4jlmDIgomvupAj9OFntA5jfkuSFBekZrw
+QyZowz/paMBIe24YH2LyaZjC2DqLy8Znh78OfAZxZsWSdZxK5LsbkCE9l8Li3gQa
+rxm4aEMBHhvns+s8Ufa47sdJAYAfVnAWb5Dfe4oVFh70PvB8GSGFS9qeib0eEQBD
+71c9MN+REDTSOYO2VnUSFbu7IrKsPsClqwfT9KzI/uz5fpHSKdCp5AO7oDZiU36s
+LsSOBbukTmFQfVrAniFEZxHLCBufXCsAwp07xtUH9ytbW0Y/eHYlZojoWJJPT//1
+cQ/A2Ix/nxbSkSPq8wpCUhBxvTQoU9BXeQIbSy0yUmj5nS+3DR7IK2Q7ACyVClr7
+LVQOGxgZhHr9Kq87RDqc1wlvbCxb+KTJQhJySpOVoiaME6jLBzgE7G+5N6IXTK5u
+OriOsQwcLdeBu7TPgft79uBYnmYeaNVdovlBB//7H7UvY0kAxAg4NPgK6eYRdzn+
+8ZtbntNXi/23RJvzeZJVBqQ7bYt4fjmHmRYrbM4jWKJEoJOE6wzpmELUowARAQAB
+tFVXbGFkaW1pciBKLiB2YW4gZGVyIExhYW4gKEJpdGNvaW4gQ29yZSBiaW5hcnkg
+cmVsZWFzZSBzaWduaW5nIGtleSkgPGxhYW53akBnbWFpbC5jb20+iQI+BBMBAgAo
+BQJVipQXAhsDBQkDFwQABgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAKCRCQyAGe
+NsLpZOBRD/wLfujEC4ZYMFwPXnhvOGEWAPeuOg06iXhEqJ1biOvxhFfwwjPoXGMQ
+i/pdfGck5xZVFcxObpdHBp0p9ardos1aRXAS8JTnTQXTX0qs0QNxnLTBz+5DrIc4
+l7r5DAlr/FapUKNSbjobOrbv+F371b7XhLJ7oob5XXo+IS7kEY+Si5BXb0uVy8ms
+SaKDooO2RfByrFI3LTHW3VESuuNnXgH6309yeGORgBazKtnxZPPlD2raTNXe9q7U
+dF2Xv6Rr53iCGGN5xncL5A6nF3fou0tGvqLFBkrs4BqeNNwC6/jQLfpOfqiQ+XGR
+q1KmT9E5E1qRXOb1Fc2koIUt/mSzRzxfxaEjI1UR0I4QtPsF2aP11sOJ1MJXyrEi
+Kx1Nb0eUAYw0ZLTfm+uToUUTXzaB5gZqxmyY/eRFddCuGn+UwZnCiUImCWuk5yLq
+ivyNbPfD1nwiZqNd879DkwFovNQfbOes4gfZyS28FXuYD/3mNN2WqGeJHZBGpglR
+8EbiuJcgo7wPVC7aiIG0deSe6Flw04f2JE75zBKbzWccydtk16GzUBorbhJ4+Q7V
+ikss1m4O/hDCU32t9V02+666l0ewM3H7AlTGxmWPWcaeADkywDHGb3frZU8Wh7to
+e8I7ST0ap2vf11stL4Ejeyymcy2Xx1S7C57GuBSBCMJv962YIalk+4kBHAQQAQoA
+BgUCVYqVFgAKCRB0gQsBI0bJpmthB/9tHtBEUuR9Ce1HBWin8AG18FDhw+019GvK
+uMysu004imrPQRnH+I780W3htFBFhiZ+yhSllb4sJrW5awitIQxxe3V+xcDjyidh
+32GjKDXvb4GHHuDC6uK2Hj0PB8XfqT1O1eCN3E/tn00al6qx/SvLnhW0BlqWwvVh
+cJpQE5pa7E97Gw+arD1/XPy0WRX8SuEphdZ+sN1tP8yZZK8Bvi0rz+p0n5aop6Z6
+6Fj2buJnVQK6xDfXwt6/F5s7lyx1QKC4wF0MiMA8jv2KkbFEuiuiteNynrsGV7UZ
+0VNvCdXe1cDKPnC64HP7nPluFRMLZbWq4DESbfGCCrmzz7f7eAEn
+=mufP
+-----END PGP PUBLIC KEY BLOCK-----