From 9fb6dc2dd4fabe0ed316be86ea2b865d7a063c70 Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Sun, 3 Sep 2017 15:53:38 +0200 Subject: [PATCH] Make insecure_ssl a role --- hieradata/common.yaml | 2 ++ modules/ssl/manifests/init.pp | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/hieradata/common.yaml b/hieradata/common.yaml index 050ee29e7..0d9b9c859 100644 --- a/hieradata/common.yaml +++ b/hieradata/common.yaml @@ -312,3 +312,5 @@ roles: - vittoria.debian.org salsa.debian.org: - godard.debian.org + insecure_ssl: + - godard.debian.org diff --git a/modules/ssl/manifests/init.pp b/modules/ssl/manifests/init.pp index 4a629fbd4..6aa194894 100644 --- a/modules/ssl/manifests/init.pp +++ b/modules/ssl/manifests/init.pp @@ -11,7 +11,7 @@ class ssl { ensure => installed, } - if $::hostname == 'godard' { + if has_role('insecure_ssl') { $extra_ssl_certs_flags = ' --default' $ssl_certs_config = 'puppet:///modules/ssl/ca-certificates-global.conf' } else { -- 2.20.1