Skip to content

Commit

Permalink
fix Debian and Ubuntu package names
Browse files Browse the repository at this point in the history
  • Loading branch information
Lightning- committed Jul 23, 2024
1 parent f68479a commit 0b2f950
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 12 deletions.
3 changes: 0 additions & 3 deletions data/Debian-8.yaml

This file was deleted.

3 changes: 0 additions & 3 deletions data/Debian-9.yaml

This file was deleted.

5 changes: 4 additions & 1 deletion data/Debian.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
---
proftpd::config: '/etc/proftpd/proftpd.conf'
proftpd::group: 'nogroup'
proftpd::user: 'proftpd'
proftpd::packages:
- 'proftpd-core'
- 'proftpd-basic'
File renamed without changes.
4 changes: 2 additions & 2 deletions data/Debian-family.yaml → data/Ubuntu.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
proftpd::config: '/etc/proftpd/proftpd.conf'
proftpd::group: 'nogroup'
proftpd::packages:
- 'proftpd-basic'
proftpd::user: 'proftpd'
proftpd::packages:
- 'proftpd-core'
10 changes: 7 additions & 3 deletions spec/classes/init_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,14 @@
expected_base_dir = '/etc/proftpd'
expected_log_dir = '/var/log/proftpd'
expected_run_dir = '/var/run/proftpd'
expected_packages = if facts[:os]['distro']['codename'] == 'bullseye'
['proftpd-core']
else
expected_packages = if facts[:os]['name'] == 'Debian'
['proftpd-basic']
elsif facts[:os]['name'] == 'Ubuntu'
if facts[:os]['release']['full'] == '20.04'
['proftpd-basic']
else
['proftpd-core']
end
end
expected_service_name = 'proftpd'
when 'RedHat'
Expand Down

0 comments on commit 0b2f950

Please sign in to comment.