Commit b61a0497 authored by Georg Koppen's avatar Georg Koppen
Browse files

Merge remote-tracking branch 'boklm/bug_32750_v4'

parents 38624f87 32ce9d2b
...@@ -3,3 +3,4 @@ nightly_build_hostname: f4amtbsowhix7rrf.onion ...@@ -3,3 +3,4 @@ nightly_build_hostname: f4amtbsowhix7rrf.onion
nightly_build_url: 'http://{{ nightly_build_hostname }}' nightly_build_url: 'http://{{ nightly_build_hostname }}'
nightly_build_email_from: "'Tor Browser Nightly Builds (boklm) <boklm-tbb-nightly@riseup.net>'," nightly_build_email_from: "'Tor Browser Nightly Builds (boklm) <boklm-tbb-nightly@riseup.net>',"
nightly_build_email_to: "[ 'boklm@torproject.org', 'sysrqb@torproject.org', ]," nightly_build_email_to: "[ 'boklm@torproject.org', 'sysrqb@torproject.org', ],"
nightly_build_sign_build: 1
...@@ -45,12 +45,14 @@ var: ...@@ -45,12 +45,14 @@ var:
local_conf: 1 local_conf: 1
### The var/sign_build option defines if you want to sign the ### The var/sign_build option defines if you want to sign the
### sha256sums-unsigned-build.txt file with gpg. ### sha256sums-unsigned-build.txt and
#sign_build: 1 ### 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 ### 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 ### 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' #sign_build_gpg_opts: '--local-user XXXXXXXX'
### The clean configuration is used by the cleaning script to find the ### The clean configuration is used by the cleaning script to find the
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment