Merge pull request #920 from carabasdaniel/rollback_permissions

(MODULES-10583) Revert "MODULES-10548: make files readonly"

diff --git a/manifests/init.pp b/manifests/init.pp
index 18e53cbf3304e7a8517fbc619675086334c337e8..39955344007233af8a1117b89fb54621fdfd7752 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -230,7 +230,7 @@ class apt (
     path   => $::apt::sources_list,
     owner  => root,
     group  => root,
-    mode   => '0444',
+    mode   => '0644',
     notify => Class['apt::update'],
   }
 
@@ -239,7 +239,7 @@ class apt (
     path    => $::apt::sources_list_d,
     owner   => root,
     group   => root,
-    mode    => '0555',
+    mode    => '0644',
     purge   => $_purge['sources.list.d'],
     recurse => $_purge['sources.list.d'],
     notify  => Class['apt::update'],
@@ -250,7 +250,7 @@ class apt (
     path   => $::apt::preferences,
     owner  => root,
     group  => root,
-    mode   => '0444',
+    mode   => '0644',
     notify => Class['apt::update'],
   }
 
@@ -259,7 +259,7 @@ class apt (
     path    => $::apt::preferences_d,
     owner   => root,
     group   => root,
-    mode    => '0555',
+    mode    => '0644',
     purge   => $_purge['preferences.d'],
     recurse => $_purge['preferences.d'],
     notify  => Class['apt::update'],
@@ -308,7 +308,7 @@ class apt (
       ensure  => $auth_conf_ensure,
       owner   => $auth_conf_owner,
       group   => 'root',
-      mode    => '0400',
+      mode    => '0600',
       content => "${confheadertmp}${auth_conf_tmp}",
       notify  => Class['apt::update'],
     }

diff --git a/manifests/setting.pp b/manifests/setting.pp
index e976c7644b2276c74fee010e4eff6fd521c2e835..4729295d0d3e4fe84bef7667d1caa2bbf3c0108b 100644 (file)
--- a/manifests/setting.pp
+++ b/manifests/setting.pp
@@ -69,7 +69,7 @@ define apt::setting (
     ensure  => $ensure,
     owner   => 'root',
     group   => 'root',
-    mode    => '0444',
+    mode    => '0644',
     content => $content,
     source  => $source,
     notify  => $_notify,

diff --git a/spec/classes/apt_spec.rb b/spec/classes/apt_spec.rb
index 8529af1d5ca99ef478c11b4f72ce19cc34c31e48..4421180ba459998f725b01ffa008efb18572125f 100644 (file)
--- a/spec/classes/apt_spec.rb
+++ b/spec/classes/apt_spec.rb
@@ -4,14 +4,14 @@ sources_list = {  ensure: 'file',
                   path: '/etc/apt/sources.list',
                   owner: 'root',
                   group: 'root',
-                  mode: '0444',
+                  mode: '0644',
                   notify: 'Class[Apt::Update]' }
 
 sources_list_d = { ensure: 'directory',
                    path: '/etc/apt/sources.list.d',
                    owner: 'root',
                    group: 'root',
-                   mode: '0555',
+                   mode: '0644',
                    purge: false,
                    recurse: false,
                    notify: 'Class[Apt::Update]' }
@@ -20,14 +20,14 @@ preferences = { ensure: 'file',
                 path: '/etc/apt/preferences',
                 owner: 'root',
                 group: 'root',
-                mode: '0444',
+                mode: '0644',
                 notify: 'Class[Apt::Update]' }
 
 preferences_d = { ensure: 'directory',
                   path: '/etc/apt/preferences.d',
                   owner: 'root',
                   group: 'root',
-                  mode: '0555',
+                  mode: '0644',
                   purge: false,
                   recurse: false,
                   notify: 'Class[Apt::Update]' }
@@ -76,7 +76,7 @@ describe 'apt' do
 
     it 'lays down /etc/apt/apt.conf.d/15update-stamp' do
       is_expected.to contain_file('/etc/apt/apt.conf.d/15update-stamp').with(group: 'root',
-                                                                             mode: '0444',
+                                                                             mode: '0644',
                                                                              owner: 'root').with_content(
                                                                                %r{APT::Update::Post-Invoke-Success {"touch /var/lib/apt/periodic/update-success-stamp 2>/dev/null || true";};},
                                                                              )
@@ -301,7 +301,7 @@ machine apt.example.com login aptlogin password supersecret
             is_expected.to contain_file('/etc/apt/auth.conf').with(ensure: 'present',
                                                                    owner: auth_conf_owner,
                                                                    group: 'root',
-                                                                   mode: '0400',
+                                                                   mode: '0600',
                                                                    notify: 'Class[Apt::Update]',
                                                                    content: auth_conf_content)
           }

diff --git a/spec/defines/conf_spec.rb b/spec/defines/conf_spec.rb
index 3089f0c85392ab8d4d865780b4a6448bf2757e55..1c0ee162531d59077598b1bc64daea5d9a51d49e 100644 (file)
--- a/spec/defines/conf_spec.rb
+++ b/spec/defines/conf_spec.rb
@@ -35,7 +35,7 @@ describe 'apt::conf', type: :define do
                                                  'content'   => %r{Apt::Install-Recommends 0;\nApt::AutoRemove::InstallRecommends 1;},
                                                  'owner'     => 'root',
                                                  'group'     => 'root',
-                                                 'mode'      => '0444')
+                                                 'mode'      => '0644')
     }
 
     context 'with notify_update = true (default)' do
@@ -83,7 +83,7 @@ describe 'apt::conf', type: :define do
       is_expected.to contain_file(filename).with('ensure' => 'absent',
                                                  'owner'     => 'root',
                                                  'group'     => 'root',
-                                                 'mode'      => '0444')
+                                                 'mode'      => '0644')
     }
   end
 end

diff --git a/spec/defines/setting_spec.rb b/spec/defines/setting_spec.rb
index bf559923f69d77e2b095e66811252ebb5c51d62a..7e2a9087aa9d1528462402a51fc37722793c0027 100644 (file)
--- a/spec/defines/setting_spec.rb
+++ b/spec/defines/setting_spec.rb
@@ -50,7 +50,7 @@ describe 'apt::setting' do
         is_expected.to contain_file('/etc/apt/apt.conf.d/50teddybear').that_notifies('Class[Apt::Update]').with(ensure: 'file',
                                                                                                                 owner: 'root',
                                                                                                                 group: 'root',
-                                                                                                                mode: '0444',
+                                                                                                                mode: '0644',
                                                                                                                 source: params[:source].to_s)
       }
     end
@@ -62,7 +62,7 @@ describe 'apt::setting' do
         is_expected.to contain_file('/etc/apt/apt.conf.d/50teddybear').that_notifies('Class[Apt::Update]').with(ensure: 'file',
                                                                                                                 owner: 'root',
                                                                                                                 group: 'root',
-                                                                                                                mode: '0444',
+                                                                                                                mode: '0644',
                                                                                                                 content: params[:content].to_s)
       }
     end