Merge pull request #1278 from unki/allow-adapt-config-file-permissions

Allow adapting MySQL configuration file's permissions mode

Author: carabasdaniel

manifests/params.pp

@@ -6,6 +6,7 @@
 class mysql::params {
 
   $manage_config_file     = true
+  $config_file_mode       = '0644'
   $purge_conf_dir         = false
   $restart                = false
   $root_password          = 'UNSET'

manifests/server.pp

@@ -11,6 +11,8 @@
 #
 # @param config_file
 #   The location, as a path, of the MySQL configuration file.
+# @param config_file_mode
+#   The MySQL configuration file's permissions mode.
 # @param includedir
 #   The location, as a path, of !includedir for custom configuration overrides.
 # @param install_options
@@ -68,6 +70,7 @@
 #
 class mysql::server (
                   $config_file             = $mysql::params::config_file,
+                  $config_file_mode        = $mysql::params::config_file_mode,
                   $includedir              = $mysql::params::includedir,
                   $install_options         = undef,
                   $install_secret_file     = $mysql::params::install_secret_file,
@@ -94,11 +97,10 @@
                   $users                   = {},
                   $grants                  = {},
                   $databases               = {},
-
-  # Deprecated parameters
-  $enabled                 = undef,
-  $manage_service          = undef,
-  $old_root_password       = undef
+                  # Deprecated parameters
+                  $enabled                 = undef,
+                  $manage_service          = undef,
+                  $old_root_password       = undef
 ) inherits mysql::params {
 
   # Deprecated parameters.

manifests/server/config.pp

@@ -37,7 +37,7 @@
     file { 'mysql-config-file':
       path                    => $mysql::server::config_file,
       content                 => template('mysql/my.cnf.erb'),
-      mode                    => '0644',
+      mode                    => $mysql::server::config_file_mode,
       selinux_ignore_defaults => true,
     }
 

spec/classes/mycnf_template_spec.rb

@@ -80,6 +80,54 @@
 
         it { is_expected.to contain_file('mysql-config-file').without_content(%r{!includedir}) }
       end
+
+      context 'with file mode 0644' do
+        let(:params) { { 'config_file_mode' => '0644' } }
+
+        it do
+          is_expected.to contain_file('mysql-config-file').with(mode: '0644')
+        end
+      end
+
+      context 'with file mode 0664' do
+        let(:params) { { 'config_file_mode' => '0664' } }
+
+        it do
+          is_expected.to contain_file('mysql-config-file').with(mode: '0664')
+        end
+      end
+
+      context 'with file mode 0660' do
+        let(:params) { { 'config_file_mode' => '0660' } }
+
+        it do
+          is_expected.to contain_file('mysql-config-file').with(mode: '0660')
+        end
+      end
+
+      context 'with file mode 0641' do
+        let(:params) { { 'config_file_mode' => '0641' } }
+
+        it do
+          is_expected.to contain_file('mysql-config-file').with(mode: '0641')
+        end
+      end
+
+      context 'with file mode 0610' do
+        let(:params) { { 'config_file_mode' => '0610' } }
+
+        it do
+          is_expected.to contain_file('mysql-config-file').with(mode: '0610')
+        end
+      end
+
+      context 'with file 0600' do
+        let(:params) { { 'config_file_mode' => '0600' } }
+
+        it do
+          is_expected.to contain_file('mysql-config-file').with(mode: '0600')
+        end
+      end
     end
   end
 end