Skip to content

Commit 3e49f2a

Browse files
committed
(maint) puppet-lint file_ensure check
1 parent 89fc614 commit 3e49f2a

File tree

5 files changed

+12
-11
lines changed

5 files changed

+12
-11
lines changed

manifests/osfamily/debian.pp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@
8383
}
8484

8585
file { $legacy_gpg_path:
86-
ensure => present,
86+
ensure => file,
8787
owner => 0,
8888
group => 0,
8989
mode => '0644',
@@ -96,7 +96,7 @@
9696
}
9797

9898
file { $gpg_path:
99-
ensure => present,
99+
ensure => file,
100100
owner => 0,
101101
group => 0,
102102
mode => '0644',

manifests/osfamily/redhat.pp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -104,23 +104,24 @@
104104
rpm --import "${GPG_KEY_PATH}"
105105
fi
106106
| SCRIPT
107+
# lint:endignore
107108

108-
if $::puppet_agent::manage_pki_dir == true {
109+
if $puppet_agent::manage_pki_dir == true {
109110
file { ['/etc/pki', '/etc/pki/rpm-gpg']:
110111
ensure => directory,
111112
}
112113
}
113114

114115
file { $legacy_gpg_path:
115-
ensure => present,
116+
ensure => file,
116117
owner => 0,
117118
group => 0,
118119
mode => '0644',
119120
source => "puppet:///modules/puppet_agent/${legacy_keyname}",
120121
}
121122

122123
file { $gpg_path:
123-
ensure => present,
124+
ensure => file,
124125
owner => 0,
125126
group => 0,
126127
mode => '0644',

manifests/osfamily/solaris.pp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
}
5050

5151
file { '/opt/puppetlabs/packages/solaris-noask':
52-
ensure => present,
52+
ensure => file,
5353
owner => 0,
5454
group => 0,
5555
mode => '0644',

manifests/osfamily/suse.pp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,15 +93,15 @@
9393
}
9494

9595
file { $gpg_path:
96-
ensure => present,
96+
ensure => file,
9797
owner => 0,
9898
group => 0,
9999
mode => '0644',
100100
source => "puppet:///modules/puppet_agent/${keyname}",
101101
}
102102

103103
file { $legacy_gpg_path:
104-
ensure => present,
104+
ensure => file,
105105
owner => 0,
106106
group => 0,
107107
mode => '0644',

manifests/prepare/package.pp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@
2727
}
2828

2929
file { $local_package_file_path:
30-
ensure => present,
31-
owner => $::puppet_agent::params::user,
32-
group => $::puppet_agent::params::group,
30+
ensure => file,
31+
owner => $puppet_agent::params::user,
32+
group => $puppet_agent::params::group,
3333
mode => $mode,
3434
source => $source,
3535
require => File[$puppet_agent::params::local_packages_dir],

0 commit comments

Comments
 (0)