Skip to content

Commit 84df787

Browse files
sazsaz
authored
Merge pull request saz#314 from jay7x/cleanup
Cleanup old OSes leftovers
2 parents 61c615c + d431690 commit 84df787

9 files changed

+12
-722
lines changed

‎manifests/conf.pp

-6
Original file line numberDiff line numberDiff line change
@@ -88,12 +88,6 @@
8888
# replace whitespace in file name
8989
$cur_file_real = regsubst($cur_file, '\s+', '_', 'G')
9090

91-
if $facts['os']['family'] == 'RedHat' {
92-
if (versioncmp($facts['sudoversion'], '1.7.2p1') < 0) {
93-
warning("Found sudo with version ${facts['sudoversion']}, but at least version 1.7.2p1 is required!")
94-
}
95-
}
96-
9791
if $content != undef {
9892
if $content =~ Array {
9993
$lines = join($content, "\n")

‎manifests/params.pp

+12-77
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,8 @@
1515
$secure_path = '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/puppetlabs/bin:/snap/bin'
1616
}
1717
default: {
18-
if (versioncmp($facts['os']['release']['major'], '7') >= 0) or
19-
($facts['os']['release']['major'] =~ /\/sid/) or
20-
($facts['os']['release']['major'] =~ /Kali/) {
21-
$content_template = "${content_base}sudoers.debian.erb"
22-
$secure_path = '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/puppetlabs/bin'
23-
} else {
24-
$content_template = "${content_base}sudoers.olddebian.erb"
25-
$secure_path = undef
26-
}
18+
$content_template = "${content_base}sudoers.debian.erb"
19+
$secure_path = '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/puppetlabs/bin'
2720
}
2821
}
2922
$package = 'sudo'
@@ -47,49 +40,23 @@
4740
# in redhat sudo package is already compiled for ldap support
4841
$package_ldap = $package
4942

50-
# rhel 5.0 to 5.4 use sudo 1.6.9 which does not support
51-
# includedir, so we have to make sure sudo 1.7 (comes with rhel
52-
# 5.5) is installed.
53-
$package_ensure = $facts['os']['release']['full'] ? {
54-
/^5.[01234]$/ => 'latest',
55-
default => 'present',
56-
}
43+
$package_ensure = 'present'
5744
$package_source = undef
5845
$package_admin_file = undef
5946
$config_file = '/etc/sudoers'
6047
$config_dir = '/etc/sudoers.d'
61-
case $facts['os']['release']['full'] {
62-
/^5/: {
63-
$content_template = "${content_base}sudoers.rhel5.erb"
64-
$secure_path = undef
65-
$wheel_config = 'absent'
66-
}
67-
/^6/: {
68-
$content_template = "${content_base}sudoers.rhel6.erb"
69-
$secure_path = '/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin'
70-
$wheel_config = 'absent'
71-
}
72-
/^7/: {
73-
$content_template = "${content_base}sudoers.rhel7.erb"
74-
$secure_path = '/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin:/opt/puppetlabs/bin'
75-
$wheel_config = 'password'
76-
}
77-
/^8/: {
78-
$content_template = "${content_base}sudoers.rhel8.erb"
79-
$secure_path = '/sbin:/bin:/usr/sbin:/usr/bin:/opt/puppetlabs/bin'
80-
$wheel_config = 'password'
81-
}
82-
/^9/: {
83-
$content_template = "${content_base}sudoers.rhel9.erb"
84-
$secure_path = '/sbin:/bin:/usr/sbin:/usr/bin:/opt/puppetlabs/bin'
85-
$wheel_config = 'password'
48+
$content_template = "${content_base}sudoers.rhel.erb"
49+
50+
case [$facts['os']['name'], $facts['os']['release']['major']] {
51+
['Amazon', '2023']: {
52+
$secure_path = '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/puppetlabs/bin:/var/lib/snapd/snap/bin'
8653
}
8754
default: {
88-
$content_template = "${content_base}sudoers.rhel9.erb"
89-
$secure_path = '/sbin:/bin:/usr/sbin:/usr/bin:/opt/puppetlabs/bin'
90-
$wheel_config = 'password'
55+
$secure_path = '/sbin:/bin:/usr/sbin:/usr/bin:/opt/puppetlabs/bin'
9156
}
9257
}
58+
59+
$wheel_config = 'password'
9360
$config_file_group = 'root'
9461
$config_dir_keepme = false
9562
$package_provider = undef
@@ -204,11 +171,7 @@
204171
$defaults = {}
205172
}
206173
'OpenBSD': {
207-
if (versioncmp($facts['kernelversion'], '5.8') < 0) {
208-
$package = undef
209-
} else {
210-
$package = 'sudo'
211-
}
174+
$package = 'sudo'
212175
$package_ldap = undef
213176
$package_ensure = 'present'
214177
$package_source = undef
@@ -290,34 +253,6 @@
290253
$wheel_config = 'absent'
291254
$defaults = {}
292255
}
293-
'Amazon': {
294-
$package = 'sudo'
295-
$package_ldap = $package
296-
$package_ensure = 'present'
297-
$package_source = undef
298-
$package_admin_file = undef
299-
$config_file = '/etc/sudoers'
300-
$config_dir = '/etc/sudoers.d'
301-
case $facts['os']['release']['full'] {
302-
/^5/: {
303-
$content_template = "${content_base}sudoers.rhel5.erb"
304-
$secure_path = undef
305-
}
306-
/^6/: {
307-
$content_template = "${content_base}sudoers.rhel6.erb"
308-
$secure_path = '/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin'
309-
}
310-
default: {
311-
$content_template = "${content_base}sudoers.rhel6.erb"
312-
$secure_path = '/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin'
313-
}
314-
}
315-
$config_file_group = 'root'
316-
$config_dir_keepme = false
317-
$package_provider = undef
318-
$wheel_config = 'absent'
319-
$defaults = {}
320-
}
321256
default: {
322257
fail("Unsupported platform: ${facts['os']['family']}/${facts['os']['name']}")
323258
}

‎spec/classes/sudo_spec.rb

-30
Original file line numberDiff line numberDiff line change
@@ -247,36 +247,6 @@
247247
end
248248
end
249249

250-
describe 'on RedHat 5.4' do
251-
let :facts do
252-
{
253-
os: {
254-
'family' => 'RedHat',
255-
'name' => 'RedHat',
256-
'release' => {
257-
'full' => '5.4',
258-
'major' => '5',
259-
},
260-
},
261-
puppetversion: '3.7.0'
262-
}
263-
end
264-
265-
it do
266-
if params == {}
267-
is_expected.to contain_class('sudo::package').with(
268-
'package' => 'sudo',
269-
'package_ensure' => 'latest'
270-
)
271-
else
272-
is_expected.to contain_class('sudo::package').with(
273-
'package' => 'sudo',
274-
'package_ensure' => param_hash[:package_ensure]
275-
)
276-
end
277-
end
278-
end
279-
280250
describe 'on supported osfamily: AIX' do
281251
let :facts do
282252
{

‎templates/sudoers.olddebian.erb

-109
This file was deleted.

‎templates/sudoers.rhel8.erb ‎templates/sudoers.rhel.erb

File renamed without changes.

‎templates/sudoers.rhel5.erb

-100
This file was deleted.

0 commit comments

Comments
 (0)