Mercurial > repos > other > Puppet

diff manifests/templates.pp @ 247:308f69ca988c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add config for new server Includes differences in CentOS 8, new host, and IPv4/6
author IBBoard <dev@ibboard.co.uk>
date Sat, 21 Dec 2019 14:30:50 -0500
parents c3fa3d65aa83
children e9323ff8f451
line wrap: on
line diff
--- a/manifests/templates.pp	Sat Dec 21 14:19:47 2019 -0500
+++ b/manifests/templates.pp	Sat Dec 21 14:30:50 2019 -0500
@@ -166,7 +166,10 @@
 
 	file { '/etc/named.conf':
 		ensure => present,
-		source => 'puppet:///common/named.conf',
+		source => [
+                        "puppet:///common/named.conf-${::hostname}",
+                        "puppet:///common/named.conf",
+                ],
 		group => 'named',
 		require => Package['bind'],
 		notify => Service['named'],
@@ -180,7 +183,10 @@
 
 	file { '/etc/sysconfig/named':
 		ensure => present,
-		content => 'OPTIONS="-4"',
+		source => [
+			"puppet:///common/sysconfig-named-${::hostname}",
+			"puppet:///common/sysconfig-named",
+		],
 		require => Package['bind'],
 	}
 
@@ -205,16 +211,19 @@
 		ensure => present,
 		source => 'puppet:///common/RPM-GPG-KEY-EPEL-6'
 	}
-	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'
+	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 { 'webtatic':
 		ensure => absent,
@@ -416,21 +425,40 @@
 
 	# Use Remi's PHP 7.3 for now - 7.4 is still VERY new
 	$php_suffix = ''
-	yumrepo { 'remirepo-safe':
-		mirrorlist => 'http://cdn.remirepo.net/enterprise/$releasever/safe/mirror',
-		descr => "Extra CentOS packages from Remi",
-		enabled => 1,
-		failovermethod => 'priority',
-		gpgcheck => 1,
-		gpgkey => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi',
-	}
-	yumrepo { 'remirepo-php':
-		mirrorlist => 'http://cdn.remirepo.net/enterprise/$releasever/php73/mirror',
-		descr => "PHP7.3 for CentOS from Remi",
-		enabled => 1,
-		failovermethod => 'priority',
-		gpgcheck => 1,
-		gpgkey => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi',
+	if $operatingsystem == 'CentOS' and versioncmp($operatingsystemrelease, '8') >= 0 {
+		yumrepo { 'remirepo-safe':
+			mirrorlist => 'http://cdn.remirepo.net/enterprise/$releasever/safe/$basearch/mirror',
+			descr => "Extra CentOS packages from Remi",
+			enabled => 1,
+			failovermethod => 'priority',
+			gpgcheck => 1,
+			gpgkey => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi',
+		}
+		yumrepo { 'remirepo-php':
+			mirrorlist => 'http://cdn.remirepo.net/enterprise/$releasever/php73/$basearch/mirror',
+			descr => "PHP7.3 for CentOS from Remi",
+			enabled => 1,
+			failovermethod => 'priority',
+			gpgcheck => 1,
+			gpgkey => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi',
+		}
+	} else {
+		yumrepo { 'remirepo-safe':
+			mirrorlist => 'http://cdn.remirepo.net/enterprise/$releasever/safe/mirror',
+			descr => "Extra CentOS packages from Remi",
+			enabled => 1,
+			failovermethod => 'priority',
+			gpgcheck => 1,
+			gpgkey => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi',
+		}
+		yumrepo { 'remirepo-php':
+			mirrorlist => 'http://cdn.remirepo.net/enterprise/$releasever/php73/mirror',
+			descr => "PHP7.3 for CentOS from Remi",
+			enabled => 1,
+			failovermethod => 'priority',
+			gpgcheck => 1,
+			gpgkey => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi',
+		}
 	}
 	file { '/etc/pki/rpm-gpg/RPM-GPG-KEY-remi':
 		ensure => present,
@@ -477,7 +505,7 @@
 
 class ibboardvpsnode (
 	$primary_ip,
-	$secondary_ip,
+	$secondary_ip = $primary_ip,
 	$mailserver,
 	$imapserver,
 	$firewall_cmd = 'iptables',