Prametrize !includedir

Hardcoded path provided by puppet is now replaced by providing only the final directory as on
most systems includedir is provided by package and it's matter of user to provide it if he
wants to override it. This also allows disabling including at all.

README.md

@@ -104,7 +104,7 @@ replicate-do-db = base2
 ###Custom configuration
 
 To add custom MySQL configuration, drop additional files into
-`/etc/mysql/conf.d/`. Dropping files into conf.d allows you to override settings or add additional ones, which is helpful if you choose not to use `override_options` in `mysql::server`. The conf.d location is hardcoded into the my.cnf template file.
+`includedir`. Dropping files into `includedir` allows you to override settings or add additional ones, which is helpful if you choose not to use `override_options` in `mysql::server`. The `includedir` location is by default set to /etc/mysql/conf.d.
 
 ##Reference
 
@@ -173,9 +173,12 @@ The location of the MySQL configuration file.
 
 Whether the MySQL configuration file should be managed.
 
+#####`includedir`
+The location of !includedir for custom configuration overrides.
+
 #####`purge_conf_dir`
 
-Whether the conf.d directory should be purged.
+Whether the `includedir` directory should be purged.
 
 #####`restart`
 

manifests/params.pp

@@ -54,7 +54,9 @@ class mysql::params {
         $server_package_name = 'mariadb-server'
         $server_service_name = 'mariadb'
         $log_error           = '/var/log/mariadb/mariadb.log'
-        $config_file         = '/etc/my.cnf'
+        $config_file         = '/etc/my.cnf.d/server.cnf'
+        # mariadb package by default has !includedir set in my.cnf to /etc/my.cnf.d
+        $includedir          = undef
         $pidfile             = '/var/run/mariadb/mariadb.pid'
       } else {
         $client_package_name = 'mysql'
@@ -62,6 +64,7 @@ class mysql::params {
         $server_service_name = 'mysqld'
         $log_error           = '/var/log/mysqld.log'
         $config_file         = '/etc/my.cnf'
+        $includedir          = '/etc/my.cnf.d'
         $pidfile             = '/var/run/mysqld/mysqld.pid'
       }
 
@@ -94,6 +97,7 @@ class mysql::params {
       }
       $basedir             = '/usr'
       $config_file         = '/etc/my.cnf'
+      $includedir          = '/etc/my.cnf.d'
       $datadir             = '/var/lib/mysql'
       $log_error           = $::operatingsystem ? {
         /OpenSuSE/         => '/var/log/mysql/mysqld.log',
@@ -132,6 +136,7 @@ class mysql::params {
 
       $basedir                 = '/usr'
       $config_file             = '/etc/mysql/my.cnf'
+      $includedir              = '/etc/mysql/conf.d'
       $datadir                 = '/var/lib/mysql'
       $log_error               = '/var/log/mysql/error.log'
       $pidfile                 = '/var/run/mysqld/mysqld.pid'
@@ -160,6 +165,7 @@ class mysql::params {
       $server_package_name = 'databases/mysql55-server'
       $basedir             = '/usr/local'
       $config_file         = '/var/db/mysql/my.cnf'
+      $includedir          = '/var/db/mysql/my.cnf.d'
       $datadir             = '/var/db/mysql'
       $log_error           = "/var/db/mysql/${::hostname}.err"
       $pidfile             = '/var/db/mysql/mysql.pid'
@@ -188,6 +194,7 @@ class mysql::params {
           $server_package_name = 'mysql-server'
           $basedir             = '/usr'
           $config_file         = '/etc/my.cnf'
+          $includedir          = '/etc/my.cnf.d'
           $datadir             = '/var/lib/mysql'
           $log_error           = '/var/log/mysqld.log'
           $pidfile             = '/var/run/mysqld/mysqld.pid'

manifests/server.pp

@@ -1,6 +1,7 @@
 # Class: mysql::server:  See README.md for documentation.
 class mysql::server (
   $config_file             = $mysql::params::config_file,
+  $includedir              = $mysql::params::includedir,
   $manage_config_file      = $mysql::params::manage_config_file,
   $old_root_password       = $mysql::params::old_root_password,
   $override_options        = {},

manifests/server/config.pp

@@ -2,6 +2,7 @@
 class mysql::server::config {
 
   $options = $mysql::server::options
+  $includedir = $mysql::server::includedir
 
   File {
     owner  => 'root',
@@ -9,16 +10,13 @@ class mysql::server::config {
     mode   => '0400',
   }
 
-  file { '/etc/mysql':
+  if $includedir and $includedir != '' {
-    ensure => directory,
+    file { "$mysql::server::includedir":
-    mode   => '0755',
+      ensure  => directory,
-  }
+      mode    => '0755',
-
+      recurse => $mysql::server::purge_conf_dir,
-  file { '/etc/mysql/conf.d':
+      purge   => $mysql::server::purge_conf_dir,
-    ensure  => directory,
+    }
-    mode    => '0755',
-    recurse => $mysql::server::purge_conf_dir,
-    purge   => $mysql::server::purge_conf_dir,
   }
 
   if $mysql::server::manage_config_file  {

spec/acceptance/mysql_server_config_spec.rb

@@ -36,6 +36,46 @@ describe 'manage_config_file', :unless => UNSUPPORTED_PLATFORMS.include?(fact('o
   end
 end
 
+describe 'includedir location', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
+  it 'creates the file elsewhere' do
+    pp = <<-EOS
+        class { 'mysql::server':
+          includedir => '/etc/my.cnf.d',
+          config_file => '/etc/testmy.cnf',
+        }
+    EOS
+    # Make sure this doesn't exist so we can test if puppet
+    # readded it.  It may not exist in the first place on
+    # some platforms.
+    shell('rmdir /etc/my.cnf.d', :acceptable_exit_codes => [0,1,2])
+    apply_manifest(pp, :catch_failures => true)
+  end
+
+  describe file('/etc/my.cnf.d') do
+    it { should be_directory }
+  end
+
+  describe file('/etc/testmy.cnf') do
+    it { sould contain "!includedir /etc/my.cnf.d" }
+  end
+end
+
+describe 'no includedir location', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
+  it 'creates the file elsewhere' do
+    pp = <<-EOS
+        class { 'mysql::server':
+          includedir => '',
+          config_file => '/etc/testmy.cnf',
+        }
+    EOS
+    apply_manifest(pp, :catch_failures => true)
+  end
+
+  describe file('/etc/testmy.cnf') do
+    it { should_not contain "includedir" }
+  end
+end
+
 describe 'resets', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
   it 'cleans up' do
     pp = <<-EOS

spec/classes/mysql_server_spec.rb

@@ -76,24 +76,44 @@ describe 'mysql::server' do
   end
 
   context 'mysql::server::config' do
-    it do
+    context 'with includedir' do
-      should contain_file('/etc/mysql').with({
+      let(:params) {{ :includedir => '/etc/my.cnf.d' }}
-        :ensure => :directory,
+      it do
-        :mode   => '0755',
+        should contain_file('/etc/my.cnf.d').with({
-      })
+          :ensure => :directory,
+          :mode   => '0755',
+        })
+      end
+
+      it do
+        should contain_file('/etc/my.cnf').with({
+          :mode => '0644',
+        })
+      end
+
+      it do
+         should contain_file('/etc/my.cnf').with_content(/!includedir/)
+      end
     end
 
-    it do
+    context 'without includedir' do
-      should contain_file('/etc/mysql/conf.d').with({
+      let(:params) {{ :includedir => '' }}
-        :ensure => :directory,
+      it do
-        :mode   => '0755',
+        should_not contain_file('/etc/my.cnf.d').with({
-      })
+          :ensure => :directory,
-    end
+          :mode   => '0755',
+        })
+      end
 
-    it do
+      it do
-      should contain_file('/etc/my.cnf').with({
+        should contain_file('/etc/my.cnf').with({
-        :mode => '0644',
+          :mode => '0644',
-      })
+        })
+      end
+
+      it do
+         should contain_file('/etc/my.cnf').without_content(/!includedir/)
+      end
     end
   end
 

templates/my.cnf.erb

@@ -17,4 +17,6 @@
 <%   end %>
 <% end -%>
 
-!includedir /etc/mysql/conf.d/
+<% if @includedir and @includedir != '' %>
+!includedir <%= @includedir %>
+<% end %>