Mercurial > repos > other > Puppet

diff manifests/templates.pp @ 393:a948419a23b1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix MySQL package names on Ubuntu CentOS packages separate `mysqlnd` packages but Ubuntu doesn't
author IBBoard <dev@ibboard.co.uk>
date Sat, 09 Apr 2022 18:49:43 +0100
parents df5ad1612af7
children e93588ec1ce3
line wrap: on
line diff
--- a/manifests/templates.pp	Mon Feb 14 20:43:50 2022 +0000
+++ b/manifests/templates.pp	Sat Apr 09 18:49:43 2022 +0100
@@ -505,10 +505,12 @@
 			$mysqlpackage = 'mysql'
 			$mysqlsuffix = '55w'
 		}
+		$phpmysqlsuffix = 'nd'
 	}
 	elsif $operatingsystem == 'Ubuntu' {
 		$mysqlpackage = 'mariadb'
 		$mysqlsuffix = ''
+		$phpmysqlsuffix = ''
 	}
 	else {
 		fail("No MySQL support for ${operatingsystem}")
@@ -519,7 +521,7 @@
 		mysqlprefix => $mysqlpackage,
 		mysqlsuffix => $mysqlsuffix,
 		phpsuffix => $php_suffix,
-		phpmysqlsuffix => 'nd'
+		phpmysqlsuffix => $phpmysqlsuffix
 	}
 
 	# Additional supporting directories that aren't served as sites