Skip to content

Commit

Permalink
Merge pull request #923 from anarcat/no-mode
Browse files Browse the repository at this point in the history 
Do not specify file modes unless relevant
  • Loading branch information
@sanfrancrisko
sanfrancrisko authored Mar 12, 2020
2 parents 718cf4f + 4d8b3e1 commit e69426f
Show file tree
Hide file tree
Showing 5 changed files with 2 additions and 18 deletions.
5 changes: 0 additions & 5 deletions manifests/init.pp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,6 @@
path => $::apt::sources_list,
owner => root,
group => root,
mode => '0644',
notify => Class['apt::update'],
}

Expand All @@ -239,7 +238,6 @@
path => $::apt::sources_list_d,
owner => root,
group => root,
mode => '0644',
purge => $_purge['sources.list.d'],
recurse => $_purge['sources.list.d'],
notify => Class['apt::update'],
Expand All @@ -250,7 +248,6 @@
path => $::apt::preferences,
owner => root,
group => root,
mode => '0644',
notify => Class['apt::update'],
}

Expand All @@ -259,7 +256,6 @@
path => $::apt::preferences_d,
owner => root,
group => root,
mode => '0644',
purge => $_purge['preferences.d'],
recurse => $_purge['preferences.d'],
notify => Class['apt::update'],
Expand All @@ -270,7 +266,6 @@
path => $::apt::apt_conf_d,
owner => root,
group => root,
mode => '0644',
purge => $_purge['apt.conf.d'],
recurse => $_purge['apt.conf.d'],
notify => Class['apt::update'],
Expand Down
1 change: 0 additions & 1 deletion manifests/setting.pp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,6 @@
ensure => $ensure,
owner => 'root',
group => 'root',
mode => '0644',
content => $content,
source => $source,
notify => $_notify,
Expand Down
6 changes: 0 additions & 6 deletions spec/classes/apt_spec.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,12 @@
path: '/etc/apt/sources.list',
owner: 'root',
group: 'root',
mode: '0644',
notify: 'Class[Apt::Update]' }

sources_list_d = { ensure: 'directory',
path: '/etc/apt/sources.list.d',
owner: 'root',
group: 'root',
mode: '0644',
purge: false,
recurse: false,
notify: 'Class[Apt::Update]' }
Expand All @@ -20,14 +18,12 @@
path: '/etc/apt/preferences',
owner: 'root',
group: 'root',
mode: '0644',
notify: 'Class[Apt::Update]' }

preferences_d = { ensure: 'directory',
path: '/etc/apt/preferences.d',
owner: 'root',
group: 'root',
mode: '0644',
purge: false,
recurse: false,
notify: 'Class[Apt::Update]' }
Expand All @@ -36,7 +32,6 @@
path: '/etc/apt/apt.conf.d',
owner: 'root',
group: 'root',
mode: '0644',
purge: false,
recurse: false,
notify: 'Class[Apt::Update]' }
Expand Down Expand Up @@ -76,7 +71,6 @@

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: '0644',
owner: 'root').with_content(
%r{APT::Update::Post-Invoke-Success {"touch /var/lib/apt/periodic/update-success-stamp 2>/dev/null || true";};},
)
Expand Down
6 changes: 2 additions & 4 deletions spec/defines/conf_spec.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,7 @@
is_expected.to contain_file(filename).with('ensure' => 'present',
'content' => %r{Apt::Install-Recommends 0;\nApt::AutoRemove::InstallRecommends 1;},
'owner' => 'root',
'group' => 'root',
'mode' => '0644')
'group' => 'root')
}

context 'with notify_update = true (default)' do
Expand Down Expand Up @@ -82,8 +81,7 @@
it {
is_expected.to contain_file(filename).with('ensure' => 'absent',
'owner' => 'root',
'group' => 'root',
'mode' => '0644')
'group' => 'root')
}
end
end
2 changes: 0 additions & 2 deletions spec/defines/setting_spec.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@
is_expected.to contain_file('/etc/apt/apt.conf.d/50teddybear').that_notifies('Class[Apt::Update]').with(ensure: 'file',
owner: 'root',
group: 'root',
mode: '0644',
source: params[:source].to_s)
}
end
Expand All @@ -62,7 +61,6 @@
is_expected.to contain_file('/etc/apt/apt.conf.d/50teddybear').that_notifies('Class[Apt::Update]').with(ensure: 'file',
owner: 'root',
group: 'root',
mode: '0644',
content: params[:content].to_s)
}
end
Expand Down

0 comments on commit e69426f

Please sign in to comment.