From 1b6054bcd8ac846fbe6df5514b15309e4f5b87e8 Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Sun, 15 Sep 2019 00:31:41 +0200 Subject: [PATCH] keyring -> hiera role --- hieradata/common.yaml | 2 -- hieradata/nodes/kaufmann.debian.org.yaml | 1 + modules/roles/manifests/init.pp | 4 ---- 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/hieradata/common.yaml b/hieradata/common.yaml index b4a64d0bb..033961022 100644 --- a/hieradata/common.yaml +++ b/hieradata/common.yaml @@ -71,8 +71,6 @@ roles: - adayevskaya.debian.org historicalpackages: - hier.debian.org - keyring: - - kaufmann.debian.org lists: - bendel.debian.org mailrelay: diff --git a/hieradata/nodes/kaufmann.debian.org.yaml b/hieradata/nodes/kaufmann.debian.org.yaml index 3ccff770b..6cd1651f1 100644 --- a/hieradata/nodes/kaufmann.debian.org.yaml +++ b/hieradata/nodes/kaufmann.debian.org.yaml @@ -1,2 +1,3 @@ classes: - roles::static_source + - roles::keyring diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp index 09478211c..4d10b92c0 100644 --- a/modules/roles/manifests/init.pp +++ b/modules/roles/manifests/init.pp @@ -100,10 +100,6 @@ class roles { ssl::service { 'cgi.debian.org': notify => Exec['service apache2 reload'], key => true, } } - if has_role('keyring') { - include roles::keyring - } - if has_role('wiki') { include roles::wiki } -- 2.20.1