add more keys and sources; include wheezy-helpers by default for l2-jessie

README.txt

@@ -1,3 +1,9 @@
 
 * symlink the files you like into /etc/apt/*
 * create-gpgring.sh can create new files for trusted.gpg.d/ from public keys and should be preferred over apt-key add
+
+Key sources:
+
+* https://jenkins-ci.org/debian/jenkins-ci.org.key
+* https://debian.lighttpd.net/jenkins-lighttpd.net.gpg
+* `osc signkey` for OBS projects

refresh-obs-keys.sh

@@ -0,0 +1,29 @@
+#!/bin/bash
+
+set -e
+
+tmpdir=$(mktemp --tmpdir -d refresh-obs-keys-XXXXXXX)
+trap 'rm -rf "${tmpdir}"' EXIT
+
+self=`readlink -f "$0"`
+basedir=`dirname "${self}"`
+keyringdir="${basedir}/trusted.gpg.d"
+
+cd "${tmpdir}"
+
+obs_get() {
+	local proj="$1"
+	local target="$2"
+
+	echo "Fetching key for ${proj}"
+	osc signkey --notravers "${proj}" > "public.key"
+
+	echo "Converting to keyring"
+	"${basedir}/create-gpgring.sh" -o "keyring.gpg" -- "public.key"
+
+	mv "keyring.gpg" "${target}"
+}
+
+obs_get "home:stbuehler" "${keyringdir}/obs-home-stbuehler.gpg"
+obs_get "server:http" "${keyringdir}/obs-server-http.gpg"
+obs_get "openSUSE:Tools" "${keyringdir}/obs-openSUSE-Tools.gpg"

sources.list.d/jenkins-ci.org.list

@@ -0,0 +1 @@
+deb http://pkg.jenkins-ci.org/debian binary/

sources.list.d/lighttpd2-jessie.list

@@ -3,8 +3,8 @@
 
 deb http://debian.lighttpd.net/lighttpd2 testing main
 
-## no need for nightly helpers
+## there should be no need for nightly helpers
 ## deb http://download.opensuse.org/repositories/home:/stbuehler:/lighttpd2-nightlies/Debian_7.0 ./
 
 # use helpers from wheezy (7.0) repo
-# deb http://download.opensuse.org/repositories/home:/stbuehler:/lighttpd2/Debian_7.0 ./
+deb http://download.opensuse.org/repositories/home:/stbuehler:/lighttpd2/Debian_7.0 ./

sources.list.d/obs-home-stbuehler-wheezy.list

@@ -0,0 +1 @@
+deb http://download.opensuse.org/repositories/home:/stbuehler/Debian_7.0 ./

sources.list.d/obs-openSUSE-Tools-wheezy.list

@@ -0,0 +1 @@
+deb http://download.opensuse.org/repositories/openSUSE:/Tools/Debian_7.0/ ./