[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[dak/master] config/debian: update buildd admin keys from Debian keyring



---
 config/debian/buildd-keyrings.conf | 10 ++++++++++
 config/debian/daily.functions      | 10 ++++++++++
 config/debian/daily.tasks          |  1 +
 3 files changed, 21 insertions(+)
 create mode 100644 config/debian/buildd-keyrings.conf

diff --git a/config/debian/buildd-keyrings.conf b/config/debian/buildd-keyrings.conf
new file mode 100644
index 00000000..be8cc2dd
--- /dev/null
+++ b/config/debian/buildd-keyrings.conf
@@ -0,0 +1,10 @@
+# `buildd_admin_keys` can use buildd-add-keys, buildd-remove-keys.
+# Must be fingerprints of keys in the Debian keyring.
+buildd_admin_keys=(
+  309911BEA966D0613053045711B4E5FF15B0FD82 # mhy
+  F75FBFCD771DEB5E9C86050550C3634D3A291CF9 # pkern
+  E5E52560DD91C556DDBDA5D02064C53641C25E5D # kroeckx
+  80E976F14A508A48E9CA3FE9BC372252CA1CF964 # ansgar
+  FBFABDB541B5DC955BD9BA6EDB16CF5BB12525C4 # joerg
+  77462642A9EF94FD0F77196DBA9C78061DDD8C9B # aurel32
+)
diff --git a/config/debian/daily.functions b/config/debian/daily.functions
index b3104a0e..b8a9140b 100644
--- a/config/debian/daily.functions
+++ b/config/debian/daily.functions
@@ -57,3 +57,13 @@ function cleanurgencylog() {
     log "Cleaning up urgency log"
     find /srv/ftp.debian.org/web/britney/urgencies -type f -mtime +15 -delete
 }
+
+# Update keyring for buildd-add-keys, buildd-remove-keys:
+function update-buildd-admin-keyring() {
+    log "Updateing buildd admin keyring"
+    . ${configdir}/buildd-keyrings.conf
+    cd ${scriptdir}/builddkeyrings
+    gpg --no-default-keyring --keyring /srv/keyring.debian.org/keyrings/debian-keyring.gpg --export "${buildd_admin_keys[@]}" |
+        gpg --no-default-keyring --keyring ./adminkeys.gpg.new
+    mv adminkeys.gpg.new adminkeys.gpg
+}
diff --git a/config/debian/daily.tasks b/config/debian/daily.tasks
index 7b962fe1..9dd72adc 100644
--- a/config/debian/daily.tasks
+++ b/config/debian/daily.tasks
@@ -7,3 +7,4 @@ clean_debbugs          none                       none                       fal
 newstats               none                       none                       false   false
 contributor            none                       none                       false   false
 cleanurgencylog        none                       none                       false   false
+update-buildd-admin-keyring none                       none                       false   false
-- 
2.11.0



Reply to: