Merge pull request #448 from puppetlabs/daenney/kill-file-perms

apt::setting: Remove file_perms.

diff --git a/manifests/setting.pp b/manifests/setting.pp
index c288b35d7ec00ce545af777de09bfe977026738c..bc0e15a8d52099d969c52257afb19aae2f819781 100644 (file)
--- a/manifests/setting.pp
+++ b/manifests/setting.pp
@@ -3,12 +3,9 @@ define apt::setting (
   $ensure        = file,
   $source        = undef,
   $content       = undef,
-  $file_perms    = {},
   $notify_update = true,
 ) {
 
-  $_file = merge($::apt::file_defaults, $file_perms)
-
   if $content and $source {
     fail('apt::setting cannot have both content and source')
   }
@@ -56,9 +53,9 @@ define apt::setting (
 
   file { "${_path}/${_priority}${base_name}${_ext}":
     ensure  => $ensure,
-    owner   => $_file['owner'],
-    group   => $_file['group'],
-    mode    => $_file['mode'],
+    owner   => 'root',
+    group   => 'root',
+    mode    => '0644',
     content => $content,
     source  => $source,
     notify  => $_notify,

diff --git a/spec/defines/setting_spec.rb b/spec/defines/setting_spec.rb
index e01fdbfe44e7c605152133ac7a6e4adc9d7ca575..19794115dd64991c4e3e27f458300d556551ac21 100644 (file)
--- a/spec/defines/setting_spec.rb
+++ b/spec/defines/setting_spec.rb
@@ -97,40 +97,4 @@ describe 'apt::setting' do
       :ensure => 'absent',
     })}
   end
-
-  describe 'with file_perms' do
-    context "{'owner' => 'roosevelt'}" do
-      let(:params) { default_params.merge({ :file_perms => {'owner' => 'roosevelt'} }) }
-      it { is_expected.to contain_file('/etc/apt/apt.conf.d/50teddybear').that_notifies('Exec[apt_update]').with({
-        :owner => 'roosevelt',
-        :group => 'root',
-        :mode  => '0644',
-      })}
-    end
-
-    context "'group' => 'roosevelt'}" do
-      let(:params) { default_params.merge({ :file_perms => {'group' => 'roosevelt'} }) }
-      it { is_expected.to contain_file('/etc/apt/apt.conf.d/50teddybear').that_notifies('Exec[apt_update]').with({
-        :owner => 'root',
-        :group => 'roosevelt',
-        :mode  => '0644',
-      })}
-    end
-
-    context "'owner' => 'roosevelt'}" do
-      let(:params) { default_params.merge({ :file_perms => {'mode' => '0600'} }) }
-      it { is_expected.to contain_file('/etc/apt/apt.conf.d/50teddybear').that_notifies('Exec[apt_update]').with({
-        :owner => 'root',
-        :group => 'root',
-        :mode  => '0600',
-      })}
-    end
-
-    context "'notify_update' => false}" do
-      let(:params) { default_params.merge({ :notify_update => false }) }
-      it { is_expected.to contain_file('/etc/apt/apt.conf.d/50teddybear') }
-      it { is_expected.not_to contain_file('/etc/apt/apt.conf.d/50teddybear').that_notifies('Exec[apt_update]') }
-    end
-
-  end
 end