From 6e67ade0e843ff1567f99b9cba423fe88373016c Mon Sep 17 00:00:00 2001 From: Silvio Rhatto Date: Thu, 12 Apr 2018 16:06:57 -0300 Subject: Fix section variable --- manifests/config.pp | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/manifests/config.pp b/manifests/config.pp index f931a45..887a7f4 100644 --- a/manifests/config.pp +++ b/manifests/config.pp @@ -5,15 +5,18 @@ define database::config( ) { # Guess section based on operating system and implementation $implementation = $::mysql::server::implementation - $section = $implementation ? { - 'mysql-server' => $::lsbdistid ? { - 'Ubuntu' => 'mysql.conf.d', - 'Debian' => 'mariadb.conf.d', - }, - 'mariadb-server' => 'mariadb.conf.d', - } + $real_section = $section ? { + '' => $implementation ? { + 'mysql-server' => $::lsbdistid ? { + 'Ubuntu' => 'mysql.conf.d', + 'Debian' => 'mariadb.conf.d', + }, + 'mariadb-server' => 'mariadb.conf.d', + }, + default => $section, + } - file { "/etc/mysql/${section}/${name}.cnf": + file { "/etc/mysql/${real_section}/${name}.cnf": ensure => $ensure, owner => root, group => root, -- cgit v1.2.3