Merge pull request #200 from hunner/tmpconfigure

make tmpdir configurable

Author: hunner

manifests/config.pp

@@ -4,6 +4,7 @@
 #   [*bind_address*]       - address to bind service.
 #   [*config_file*]        - my.cnf configuration file path.
 #   [*datadir*]            - path to datadir.
+#   [*tmpdir*]             - path to tmpdir.
 #   [*default_engine]      - configure a default table engine
 #   [*etc_root_password*]  - whether to save /etc/my.cnf.
 #   [*log_error]           - path to mysql error log
@@ -38,6 +39,7 @@
   $bind_address       = $mysql::bind_address,
   $config_file        = $mysql::config_file,
   $datadir            = $mysql::datadir,
+  $tmpdir             = $mysql::tmpdir,
   $default_engine     = $mysql::default_engine,
   $etc_root_password  = $mysql::etc_root_password,
   $max_allowed_packet = $mysql::max_allowed_packet,

manifests/init.pp

@@ -16,6 +16,8 @@
 #
 # [*datadir*]               - The directory MySQL's datafiles are stored
 #
+# [*tmpdir*]                - The directory MySQL's tmpfiles are stored
+#
 # [*default_engine*]        - The default engine to use for tables
 #
 # [*etc_root_password*]     - Whether or not to add the mysql root password to /etc/my.cnf
@@ -86,6 +88,7 @@
   $config_file           = $mysql::params::config_file,
   $config_template       = $mysql::params::config_template,
   $datadir               = $mysql::params::datadir,
+  $tmpdir                = $mysql::params::tmpdir,
   $default_engine        = $mysql::params::default_engine,
   $etc_root_password     = $mysql::params::etc_root_password,
   $java_package_name     = $mysql::params::java_package_name,

manifests/params.pp

@@ -41,6 +41,7 @@
       $client_package_name   = 'mysql'
       $config_file           = '/etc/my.cnf'
       $datadir               = '/var/lib/mysql'
+      $tmpdir                = '/tmp'
       $java_package_name     = 'mysql-connector-java'
       $log_error             = '/var/log/mysqld.log'
       $php_package_name      = 'php-mysql'
@@ -60,6 +61,7 @@
     'Suse': {
       $basedir               = '/usr'
       $datadir               = '/var/lib/mysql'
+      $tmpdir                = '/tmp'
       $service_name          = 'mysql'
       $client_package_name   = $::operatingsystem ? {
         /OpenSuSE/           => 'mysql-community-server-client',
@@ -94,6 +96,7 @@
     'Debian': {
       $basedir              = '/usr'
       $datadir              = '/var/lib/mysql'
+      $tmpdir                = '/tmp'
       $service_name         = 'mysql'
       $client_package_name  = 'mysql-client'
       $server_package_name  = 'mysql-server'
@@ -114,6 +117,7 @@
     'FreeBSD': {
       $basedir               = '/usr/local'
       $datadir               = '/var/db/mysql'
+      $tmpdir                = '/tmp'
       $service_name          = 'mysql-server'
       $client_package_name   = 'databases/mysql55-client'
       $server_package_name   = 'databases/mysql55-server'
@@ -137,6 +141,7 @@
         'Amazon': {
           $basedir               = '/usr'
           $datadir               = '/var/lib/mysql'
+          $tmpdir                = '/tmp'
           $service_name          = 'mysqld'
           $client_package_name   = 'mysql'
           $server_package_name   = 'mysql-server'

templates/my.cnf.erb

@@ -14,7 +14,7 @@ socket    = <%= @socket %>
 port      = <%= @port %>
 basedir   = <%= @basedir %>
 datadir   = <%= @datadir %>
-tmpdir    = /tmp
+tmpdir    = <%= @tmpdir %>
 skip-external-locking
 
 <% if @bind_address %>