Use MariaDB for Ubuntu 20.04

treydock · treydock · commit 5ee78765d778 · 2022-04-26T15:44:11.000-04:00
diff --git a/manifests/params.pp b/manifests/params.pp
@@ -171,9 +171,10 @@
     }
 
     'Debian': {
-      if $::operatingsystem == 'Debian' {
+      if $::operatingsystem == 'Debian' or
+      ($::operatingsystem == 'Ubuntu' and versioncmp($::operatingsystemrelease, '20.04') >= 0) {
         $provider = 'mariadb'
-      } else { # Ubuntu
+      } else {
         $provider = 'mysql'
       }
       if $provider == 'mariadb' {
diff --git a/manifests/server/config.pp b/manifests/server/config.pp
@@ -34,7 +34,7 @@
   }
 
   #Debian: Creating world readable directories before installing.
-  case $::operatingsystem {
+  case $::osfamily {
     'Debian': {
       if $managed_dirs {
         $managed_dirs.each | $entry | {

Original file line number	Diff line number	Diff line change
`@@ -171,9 +171,10 @@`
`171`	`171`	`}`
`172`	`172`
`173`	`173`	`'Debian': {`
`174`		`- if $::operatingsystem == 'Debian' {`
	`174`	`+ if $::operatingsystem == 'Debian' or`
	`175`	`+ ($::operatingsystem == 'Ubuntu' and versioncmp($::operatingsystemrelease, '20.04') >= 0) {`
`175`	`176`	`$provider = 'mariadb'`
`176`		`- } else { # Ubuntu`
	`177`	`+ } else {`
`177`	`178`	`$provider = 'mysql'`
`178`	`179`	`}`
`179`	`180`	`if $provider == 'mariadb' {`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`#Debian: Creating world readable directories before installing.`
`37`		`- case $::operatingsystem {`
	`37`	`+ case $::osfamily {`
`38`	`38`	`'Debian': {`
`39`	`39`	`if $managed_dirs {`
`40`	`40`	`$managed_dirs.each \| $entry \| {`