Merge pull request #68 from tobixen/bugfix_client_connection_details

support for socket location in .my.cnf

Author: alvagante

manifests/init.pp

@@ -188,6 +188,10 @@
 # [*pid_file*]
 #   Path of pid file. Used by monitor
 #
+# [*socket*]
+#   Path to the mysql socket file.  If set, will appear in .my.cnf
+#   Remember to duplicate in the server configuration.
+#
 # [*data_dir*]
 #   Path of application data directory. Used by puppi
 #
@@ -261,6 +265,7 @@
   $config_file_group   = params_lookup( 'config_file_group' ),
   $config_file_init    = params_lookup( 'config_file_init' ),
   $pid_file            = params_lookup( 'pid_file' ),
+  $socket              = params_lookup( 'socket' ),
   $data_dir            = params_lookup( 'data_dir' ),
   $log_dir             = params_lookup( 'log_dir' ),
   $log_file            = params_lookup( 'log_file' ),

manifests/params.pp

@@ -113,6 +113,7 @@
   $absent = false
   $disable = false
   $disableboot = false
+  $socket = ''
 
   ### General module variables that can have a site or per module default
   $monitor = false

templates/root.my.cnf.backup.erb

@@ -2,3 +2,4 @@
 
 [client]
 password=
+<% if scope.lookupvar('mysql::socket') != '' %>socket=<%= scope.lookupvar('mysql::socket') %><% end %>

templates/root.my.cnf.erb

@@ -2,3 +2,4 @@
 
 [client]
 password=<%= scope.lookupvar('mysql::real_root_password') %>
+<% if scope.lookupvar('mysql::socket') != '' %>socket=<%= scope.lookupvar('mysql::socket') %><% end %>