[feature] support opensmtpd_extra_groups

fixes #19
trombik · Dec 2, 2017 · cbb980a · cbb980a
1 parent a854255
commit cbb980a
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 0 deletions.
diff --git a/defaults/main.yml b/defaults/main.yml
@@ -9,5 +9,6 @@ opensmtpd_extra_packages: []
 opensmtpd_config: ""
 opensmtpd_makemap_bin: "{{ __opensmtpd_makemap_bin }}"
 opensmtpd_virtual_user: None
+opensmtpd_extra_groups: []
 
 opensmtpd_tables: []
diff --git a/tasks/main.yml b/tasks/main.yml
@@ -38,6 +38,12 @@
 
 - include: "install-{{ ansible_os_family }}.yml"
 
+- name: Add opensmtpd user to opensmtpd_extra_groups
+  user:
+    name: "{{ opensmtpd_user }}"
+    append: yes
+    groups: "{{ opensmtpd_extra_groups }}"
+
 - name: Create opensmtpd_conf_dir
   file:
     dest: "{{ opensmtpd_conf_dir }}"

diff --git a/tests/serverspec/default.yml b/tests/serverspec/default.yml
@@ -2,6 +2,8 @@
   roles:
     - ansible-role-opensmtpd
   vars:
+    opensmtpd_extra_groups:
+      - nobody
     opensmtpd_virtual_user:
       name: vmail
       group: vmail

diff --git a/tests/serverspec/default_spec.rb b/tests/serverspec/default_spec.rb
@@ -13,6 +13,7 @@
   group: "vmail",
   home: "/var/vmail"
 }
+extra_group = ["nobody"]
 
 case os[:family]
 when "freebsd"
@@ -101,6 +102,9 @@
 describe user(user) do
   it { should exist }
   it { should belong_to_primary_group group }
+  extra_group.each do |g|
+    it { should belong_to_group g }
+  end
 end
 
 describe group(virtual_user[:group]) do