+jlogin, group, defaults, more pkgs

roles/pubnix/tasks/main.yaml

@@ -24,6 +24,11 @@
     src: sshd_config
     dest: "/usr/local/bastille/templates/services/{{ role_name }}/etc/ssh/"
 
+- name: copy motd file
+  copy:
+    src: motd
+    dest: "/usr/local/bastille/templates/services/{{ role_name }}/etc/motd.template"
+
 - name: copy skel files
   copy:
     src: "skel/{{ item }}"
@@ -54,7 +59,6 @@
 - name: template jail
   shell: "bastille template {{ role_name }} services/{{ role_name }}"
 
-
 # FIXME: loop over files and check size somehow, or always copy? use file module?
 - name: copy skel files into jail template
   shell: cp -r /usr/local/bastille/templates/services/{{ role_name }}/usr/share/skel /usr/local/bastille/jails/{{ role_name }}/root/etc/
@@ -65,7 +69,14 @@
   copy:
     src: keys
     dest: "/usr/local/bastille/"
-    
+
+
+- name: create user group
+  shell: |
+    pw -R {{ defaults.jailbase }}/{{ role_name }}/root group show {{ defaults.group }} ||\
+    pw -R {{ defaults.jailbase }}/{{ role_name }}/root group add {{ defaults.group }}
+
+
 # The normal  ansible user  module can't be  used here,  because we're
 # talking  about jail  users  here. I  tried to  patch  the module  to
 # support the  -R flag (https://github.com/ansible/ansible/pull/84371)
@@ -76,5 +87,5 @@
 # well.
 - name: Manage users
   loop: "{{ users }}"
-  ansible.builtin.script: "bin/user.sh -u {{ item.name }} -g '{{ item.groups }}' -c {{ role_name }}-user -a {{ item.state }} -d /usr/local/bastille/jails/{{ role_name }}/root"
+  ansible.builtin.script: "bin/user.sh -u {{ item.name }} -g '{{ item.groups | default(defaults.group) }}' -c {{ role_name }}-user -a {{ item.state }} -d {{ defaults.jailbase }}/{{ role_name }}/root"