Merge pull request #1360 from olevole/main

david22swan · web-flow · commit 300b6776584e · 2021-01-18T10:40:11.000Z
Set default MySQL version for FreeBSD
diff --git a/manifests/params.pp b/manifests/params.pp
@@ -328,8 +328,8 @@
     }
 
     'FreeBSD': {
-      $client_package_name = 'databases/mysql56-client'
-      $server_package_name = 'databases/mysql56-server'
+      $client_package_name = 'databases/mysql57-client'
+      $server_package_name = 'databases/mysql57-server'
       $basedir             = '/usr/local'
       $config_file         = '/usr/local/etc/my.cnf'
       $includedir          = '/usr/local/etc/my.cnf.d'
@@ -497,6 +497,9 @@
     'Alpine': {
       $server_service_provider = 'rc-service'
     }
+    'FreeBSD': {
+      $server_service_provider = 'freebsd'
+    }
     default: {
       $server_service_provider = undef
     }

Original file line number	Diff line number	Diff line change
`@@ -328,8 +328,8 @@`
`328`	`328`	`}`
`329`	`329`
`330`	`330`	`'FreeBSD': {`
`331`		`- $client_package_name = 'databases/mysql56-client'`
`332`		`- $server_package_name = 'databases/mysql56-server'`
	`331`	`+ $client_package_name = 'databases/mysql57-client'`
	`332`	`+ $server_package_name = 'databases/mysql57-server'`
`333`	`333`	`$basedir = '/usr/local'`
`334`	`334`	`$config_file = '/usr/local/etc/my.cnf'`
`335`	`335`	`$includedir = '/usr/local/etc/my.cnf.d'`
`@@ -497,6 +497,9 @@`
`497`	`497`	`'Alpine': {`
`498`	`498`	`$server_service_provider = 'rc-service'`
`499`	`499`	`}`
	`500`	`+ 'FreeBSD': {`
	`501`	`+ $server_service_provider = 'freebsd'`
	`502`	`+ }`
`500`	`503`	`default: {`
`501`	`504`	`$server_service_provider = undef`
`502`	`505`	`}`