[tor-commits] [tor-browser-build/master] Bug 32750: Sign nightly sha256sums files with gpg

[gk at torproject.org]

commit 32ce9d2bf8bbd09017533175ffebf0b3599eb617
Author: Nicolas Vigier <boklm at torproject.org>
Date:   Fri Dec 13 17:52:17 2019 +0100

    Bug 32750: Sign nightly sha256sums files with gpg
---
 tools/ansible/group_vars/boklm-tbb-nightly/tbb-nightly-build.yml | 1 +
 tools/ansible/roles/tbb-nightly-build/templates/rbm.local.conf   | 8 +++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/tools/ansible/group_vars/boklm-tbb-nightly/tbb-nightly-build.yml b/tools/ansible/group_vars/boklm-tbb-nightly/tbb-nightly-build.yml
index 0d19cff..8e4bc05 100644
--- a/tools/ansible/group_vars/boklm-tbb-nightly/tbb-nightly-build.yml
+++ b/tools/ansible/group_vars/boklm-tbb-nightly/tbb-nightly-build.yml
@@ -3,3 +3,4 @@ nightly_build_hostname: f4amtbsowhix7rrf.onion
 nightly_build_url: 'http://{{ nightly_build_hostname }}'
 nightly_build_email_from: "'Tor Browser Nightly Builds (boklm) <boklm-tbb-nightly at riseup.net>',"
 nightly_build_email_to: "[ 'boklm at torproject.org', 'sysrqb at torproject.org', ],"
+nightly_build_sign_build: 1
diff --git a/tools/ansible/roles/tbb-nightly-build/templates/rbm.local.conf b/tools/ansible/roles/tbb-nightly-build/templates/rbm.local.conf
index f83d8f3..4380480 100644
--- a/tools/ansible/roles/tbb-nightly-build/templates/rbm.local.conf
+++ b/tools/ansible/roles/tbb-nightly-build/templates/rbm.local.conf
@@ -45,12 +45,14 @@ var:
   local_conf: 1
 
   ### The var/sign_build option defines if you want to sign the
-  ### sha256sums-unsigned-build.txt file with gpg.
-  #sign_build: 1
+  ### sha256sums-unsigned-build.txt and
+  ### sha256sums-unsigned-build.incrementals.txt files with gpg.
+  {% if nightly_build_sign_build is defined %}sign_build: {{ nightly_build_sign_build }}{% endif %}
+
 
   ### The var/sign_build_gpg_opts option can be used to define some gpg
   ### options to select the key to use to sign the sha256sums-unsigned-build.txt
-  ### file.
+  ### and sha256sums-unsigned-build.incrementals.txt files.
   #sign_build_gpg_opts: '--local-user XXXXXXXX'
 
   ### The clean configuration is used by the cleaning script to find the