From ab5459ba3ac96524cf68afbe6ebe767620850828 Mon Sep 17 00:00:00 2001 From: Lightning Date: Tue, 23 Jul 2024 15:01:02 +0200 Subject: [PATCH] fix Debian package name --- data/Debian-10.yaml | 3 --- data/Debian-8.yaml | 3 --- data/Debian-9.yaml | 3 --- data/Debian-family.yaml | 2 +- data/Debian.yaml | 2 +- spec/classes/init_spec.rb | 6 +----- 6 files changed, 3 insertions(+), 16 deletions(-) delete mode 100644 data/Debian-10.yaml delete mode 100644 data/Debian-8.yaml delete mode 100644 data/Debian-9.yaml diff --git a/data/Debian-10.yaml b/data/Debian-10.yaml deleted file mode 100644 index 8cffc61..0000000 --- a/data/Debian-10.yaml +++ /dev/null @@ -1,3 +0,0 @@ ---- -proftpd::packages: - - 'proftpd-basic' diff --git a/data/Debian-8.yaml b/data/Debian-8.yaml deleted file mode 100644 index 8cffc61..0000000 --- a/data/Debian-8.yaml +++ /dev/null @@ -1,3 +0,0 @@ ---- -proftpd::packages: - - 'proftpd-basic' diff --git a/data/Debian-9.yaml b/data/Debian-9.yaml deleted file mode 100644 index 8cffc61..0000000 --- a/data/Debian-9.yaml +++ /dev/null @@ -1,3 +0,0 @@ ---- -proftpd::packages: - - 'proftpd-basic' diff --git a/data/Debian-family.yaml b/data/Debian-family.yaml index 69c5328..17598ab 100644 --- a/data/Debian-family.yaml +++ b/data/Debian-family.yaml @@ -1,6 +1,6 @@ --- proftpd::config: '/etc/proftpd/proftpd.conf' proftpd::group: 'nogroup' +proftpd::user: 'proftpd' proftpd::packages: - 'proftpd-basic' -proftpd::user: 'proftpd' diff --git a/data/Debian.yaml b/data/Debian.yaml index 196da02..8cffc61 100644 --- a/data/Debian.yaml +++ b/data/Debian.yaml @@ -1,3 +1,3 @@ --- proftpd::packages: - - 'proftpd-core' + - 'proftpd-basic' diff --git a/spec/classes/init_spec.rb b/spec/classes/init_spec.rb index 4a12b8d..1a1dbfb 100644 --- a/spec/classes/init_spec.rb +++ b/spec/classes/init_spec.rb @@ -9,11 +9,7 @@ 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 - ['proftpd-basic'] - end + expected_packages = ['proftpd-basic'] expected_service_name = 'proftpd' when 'RedHat' expected_config = '/etc/proftpd.conf'