From f9a5a773e0605ed9e0f370fc70da8512d896b57c Mon Sep 17 00:00:00 2001 From: Nemanja Delic Date: Fri, 6 May 2016 17:10:23 +0200 Subject: [PATCH] moving mysqld.log resource to installdb.pp --- manifests/server/installdb.pp | 10 ++++++++++ manifests/server/service.pp | 8 -------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/manifests/server/installdb.pp b/manifests/server/installdb.pp index 31a254699..41a0d5b9c 100644 --- a/manifests/server/installdb.pp +++ b/manifests/server/installdb.pp @@ -1,5 +1,6 @@ # class mysql::server::installdb { + $options = $mysql::server::options if $mysql::server::package_manage { @@ -16,6 +17,15 @@ $_config_file=undef } + if $options['mysqld']['log-error'] { + file { $options['mysqld']['log-error']: + ensure => present, + owner => $mysqluser, + group => $::mysql::server::mysql_group, + before => Mysql_datadir[ $datadir ], + } + } + mysql_datadir { $datadir: ensure => 'present', datadir => $datadir, diff --git a/manifests/server/service.pp b/manifests/server/service.pp index 9aa60f1b2..3617b4b9f 100644 --- a/manifests/server/service.pp +++ b/manifests/server/service.pp @@ -18,14 +18,6 @@ $mysqluser = $options['mysqld']['user'] } - if $options['mysqld']['log-error'] { - file { $options['mysqld']['log-error']: - ensure => present, - owner => $mysqluser, - group => $::mysql::server::mysql_group, - } - } - if $mysql::server::real_service_manage { service { 'mysqld': ensure => $service_ensure,