Merge pull request #1057 from bastelfreak/archlinux

fix archlinux compatibility

Author: hunner

manifests/params.pp

@@ -221,27 +221,30 @@
     }
 
     'Archlinux': {
-      $client_package_name = 'mariadb-clients'
-      $server_package_name = 'mariadb'
-      $basedir             = '/usr'
-      $config_file         = '/etc/mysql/my.cnf'
-      $datadir             = '/var/lib/mysql'
-      $log_error           = '/var/log/mysqld.log'
-      $pidfile             = '/var/run/mysqld/mysqld.pid'
-      $root_group          = 'root'
-      $mysql_group         = 'mysql'
-      $server_service_name = 'mysqld'
-      $socket              = '/var/lib/mysql/mysql.sock'
-      $ssl_ca              = '/etc/mysql/cacert.pem'
-      $ssl_cert            = '/etc/mysql/server-cert.pem'
-      $ssl_key             = '/etc/mysql/server-key.pem'
-      $tmpdir              = '/tmp'
+      $daemon_dev_package_name = undef
+      $client_dev_package_name = undef
+      $includedir              = undef
+      $client_package_name     = 'mariadb-clients'
+      $server_package_name     = 'mariadb'
+      $basedir                 = '/usr'
+      $config_file             = '/etc/mysql/my.cnf'
+      $datadir                 = '/var/lib/mysql'
+      $log_error               = '/var/log/mysqld.log'
+      $pidfile                 = '/var/run/mysqld/mysqld.pid'
+      $root_group              = 'root'
+      $mysql_group             = 'mysql'
+      $server_service_name     = 'mysqld'
+      $socket                  = '/var/lib/mysql/mysql.sock'
+      $ssl_ca                  = '/etc/mysql/cacert.pem'
+      $ssl_cert                = '/etc/mysql/server-cert.pem'
+      $ssl_key                 = '/etc/mysql/server-key.pem'
+      $tmpdir                  = '/tmp'
       # mysql::bindings
-      $java_package_name   = 'mysql-connector-java'
-      $perl_package_name   = 'perl-dbd-mysql'
-      $php_package_name    = undef
-      $python_package_name = 'mysql-python'
-      $ruby_package_name   = 'mysql-ruby'
+      $java_package_name       = 'mysql-connector-java'
+      $perl_package_name       = 'perl-dbd-mysql'
+      $php_package_name        = undef
+      $python_package_name     = 'mysql-python'
+      $ruby_package_name       = 'mysql-ruby'
     }
 
     'Gentoo': {

spec/acceptance/mysql_server_spec.rb

@@ -1,7 +1,6 @@
 require 'spec_helper_acceptance'
 
 describe 'mysql class' do
-  # rubocop:disable RSpec/InstanceVariable
   describe 'advanced config' do
     let(:pp) do
       <<-MANIFEST

spec/classes/mysql_bindings_spec.rb

@@ -2,6 +2,7 @@
 
 describe 'mysql::bindings' do
   on_supported_os.each do |os, facts|
+    next if facts[:osfamily] == 'Archlinux'
     context "on #{os}" do
       let(:facts) do
         facts.merge(root_home: '/root')

spec/classes/mysql_client_spec.rb

@@ -2,6 +2,7 @@
 
 describe 'mysql::client' do
   on_supported_os.each do |os, facts|
+    next if facts[:osfamily] == 'Archlinux'
     context "on #{os}" do
       let(:facts) do
         facts.merge(root_home: '/root')