From e09b2b593aa8cdfc3b4bde62033f11a2626ce32c Mon Sep 17 00:00:00 2001
From: mh <mh@immerda.ch>
Date: Mon, 22 Jan 2018 19:43:54 +0100
Subject: [PATCH] either use a custom gpg keyserver or if gpg the hidden one
---
manifests/init.pp | 1 +
templates/schleuder.yml.erb | 9 ++++++++-
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/manifests/init.pp b/manifests/init.pp
index 7a38b2e..f73e76a 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -25,6 +25,7 @@ class schleuder(
$web_api_key = undef,
$export_web_api_key = false,
$gpg_use_tor = false,
+ $gpg_keyserver = undef,
) {
case $facts['operatingsystem'] {
'CentOS': { include ::schleuder::centos }
diff --git a/templates/schleuder.yml.erb b/templates/schleuder.yml.erb
index 367789e..dfc52e8 100644
--- a/templates/schleuder.yml.erb
+++ b/templates/schleuder.yml.erb
@@ -17,7 +17,14 @@ log_level: warn
# If you have gnupg 2.1 and TOR running locally, use a onion-keyserver:
#keyserver: hkp://jirk5u4osbsr34t5.onion
# The default works for all supported versions of gnupg:
-keyserver: pool.sks-keyservers.net
+#keyserver: pool.sks-keyservers.net
+keyserver: <%= if scope['schleuder::gpg_keyserver']
+ scope['schleuder::gpg_keyserver']
+ elsif scope['schleuder::gpg_use_tor']
+ 'hkp://jirk5u4osbsr34t5.onion'
+ else
+ 'pool.sks-keyservers.net'
+ end %>
# who receives global schleuder notifications
superadmin: <%= scope['schleuder::superadmin'] %>
--
GitLab