From: Paul Wise <pabs@debian.org>
Date: Sun, 3 Sep 2017 12:30:46 +0000 (+0800)
Subject: Disable the usual SSL setup for godard
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=0e375233af569acc80ddd55b3e0b4d522eabb04c;p=mirror%2Fdsa-puppet.git

Disable the usual SSL setup for godard
---

diff --git a/modules/ssl/manifests/init.pp b/modules/ssl/manifests/init.pp
index 636d2b567..756661e06 100644
--- a/modules/ssl/manifests/init.pp
+++ b/modules/ssl/manifests/init.pp
@@ -156,13 +156,19 @@ class ssl {
 		refreshonly => true,
 		require     => Package['openssl'],
 	}
+	if $::hostname == 'godard' {
+		$extra_ssl_certs_flags = ' --default'
+	} else {
+		$extra_ssl_certs_flags = ''
+	}
+
 	exec { 'refresh_normal_hashes':
 		# NOTE 1: always use update-ca-certificates to manage hashes in
 		#         /etc/ssl/certs otherwise /etc/ssl/ca-certificates.crt will
 		#         get a hash overriding the hash that would have been generated
 		#         for another certificate ... which is problem, comrade
 		# NOTE 2: always ask update-ca-certificates to freshen (-f) the links
-		command     => '/usr/sbin/update-ca-certificates -f',
+		command     => "/usr/sbin/update-ca-certificates --fresh${extra_ssl_certs_flags}",
 		refreshonly => true,
 		require     => Package['ca-certificates'],
 	}