# HG changeset patch
# User IBBoard <dev@ibboard.co.uk>
# Date 1577043989 18000
# Node ID b173842cabbf0c9dde469d8984f1ecae0cfcbb0e
# Parent  675c1cc61eaf376f420070b9cbe358708d97902d
Update repo handling

* Make sure that repo keys are installed before repos using tags
* Re-add IBBoard repo for CentOS 8 - we now build mod_xsendfile

diff -r 675c1cc61eaf -r b173842cabbf manifests/templates.pp
--- a/manifests/templates.pp	Sun Dec 22 14:43:29 2019 -0500
+++ b/manifests/templates.pp	Sun Dec 22 14:46:29 2019 -0500
@@ -1,5 +1,5 @@
 # Make sure packages come after their repos
-YumRepo<| |> -> Package<| |>
+File<| tag == 'repo-config' |> -> YumRepo<| |> -> Package<| |>
 
 # Make sure all files are in  place before starting services
 File<| tag != 'post-service' |> -> Service<| |>
@@ -209,21 +209,20 @@
 	}
 	file { "/etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$osver":
 		ensure => present,
-		source => "puppet:///common/RPM-GPG-KEY-EPEL-$osver"
+		source => "puppet:///common/RPM-GPG-KEY-EPEL-$osver",
+		tag => 'repo-config',
 	}
-	if $operatingsystem == 'CentOS' and versioncmp($operatingsystemrelease, '7') >= 0 and versioncmp($operatingsystemrelease, '8') < 0 {
-		# We only have extra packages for CentOS 7
-		yumrepo { 'ibboard':
-			baseurl => 'https://download.opensuse.org/repositories/home:/IBBoard:/server/CentOS_$releasever/',
-			descr => 'Extra packages from IBBoard',
-			enabled => 1,
-			gpgcheck => 1,
-			gpgkey => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-ibboard',
-		}
-		file { '/etc/pki/rpm-gpg/RPM-GPG-KEY-ibboard':
-			ensure => present,
-			source => 'puppet:///common/RPM-GPG-KEY-ibboard'
-		}
+	yumrepo { 'ibboard':
+		baseurl => 'https://download.opensuse.org/repositories/home:/IBBoard:/server/CentOS_$releasever/',
+		descr => 'Extra packages from IBBoard',
+		enabled => 1,
+		gpgcheck => 1,
+		gpgkey => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-ibboard',
+	}
+	file { '/etc/pki/rpm-gpg/RPM-GPG-KEY-ibboard':
+		ensure => present,
+		source => 'puppet:///common/RPM-GPG-KEY-ibboard',
+		tag => 'repo-config',
 	}
 	yumrepo { 'webtatic':
 		ensure => absent,