diff manifests/templates.pp @ 402:76d18a918e7f

Switch to more parameters Avoids: * Hard-coding values that need to match other modules across OSes * Using templates when we can use param classes with conditional definitions
author IBBoard <dev@ibboard.co.uk>
date Wed, 20 Apr 2022 19:24:53 +0100
parents f0ee7a16125d
children 8d7335014437
line wrap: on
line diff
--- a/manifests/templates.pp	Wed Apr 20 19:13:24 2022 +0100
+++ b/manifests/templates.pp	Wed Apr 20 19:24:53 2022 +0100
@@ -529,9 +529,10 @@
 	else {
 		fail("No MySQL support for ${operatingsystem}")
 	}
+	include ::defaultusers::params
 	class { 'website::mysql':
-		mysqluser => template('defaultusers/mysql-user'),
-		mysqlpassword => template('defaultusers/mysql-password'),
+		mysqluser => $::defaultusers::params::mysql_user,
+		mysqlpassword => $::defaultusers::params::mysql_password,
 		mysqlprefix => $mysqlpackage,
 		mysqlsuffix => $mysqlsuffix,
 		phpsuffix => $php_suffix,
@@ -776,7 +777,7 @@
 	}
 	cron { 'owncloudcron':
 		command => "/usr/local/bin/owncloud-cron",
-		user => $pim_user,
+		user => $apache::params::user,
 		minute => '*/15',
 	}
 }