fix Debian and Ubuntu package names

markt-de · Jul 23, 2024 · 0b2f950 · 0b2f950
1 parent f68479a
commit 0b2f950
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 12 deletions.
diff --git a/data/Debian-8.yaml b/data/Debian-8.yaml
diff --git a/data/Debian-9.yaml b/data/Debian-9.yaml
diff --git a/data/Debian.yaml b/data/Debian.yaml
@@ -1,3 +1,6 @@
 ---
+proftpd::config: '/etc/proftpd/proftpd.conf'
+proftpd::group: 'nogroup'
+proftpd::user: 'proftpd'
 proftpd::packages:
-  - 'proftpd-core'
+  - 'proftpd-basic'
diff --git a/data/Debian-10.yaml → data/Ubuntu-20.04.yaml b/data/Debian-10.yaml → data/Ubuntu-20.04.yaml
diff --git a/data/Debian-family.yaml → data/Ubuntu.yaml b/data/Debian-family.yaml → data/Ubuntu.yaml
@@ -1,6 +1,6 @@
 ---
 proftpd::config: '/etc/proftpd/proftpd.conf'
 proftpd::group: 'nogroup'
-proftpd::packages:
-  - 'proftpd-basic'
 proftpd::user: 'proftpd'
+proftpd::packages:
+  - 'proftpd-core'
diff --git a/spec/classes/init_spec.rb b/spec/classes/init_spec.rb
@@ -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'