updated roles

Vagrantfile

@@ -2,9 +2,9 @@
 # vi: set ft=ruby :
 
 Vagrant.configure("2") do |config|
-  config.vm.box = "boxcutter/ubuntu1604-desktop"
+  config.vm.box = "fasmat/ubuntu2004-desktop"
+  config.vm.box_version = "20.0425.1"
   config.vm.provision "ansible" do |ansible|
-    #ansible.verbose = "vv"
     ansible.playbook = "test.yml"
   end
 end

playbook.yml

@@ -5,15 +5,14 @@
     - common
     - samba
     - pam
-    - lightdm
   vars:
-    - kbdlang: "fr"
+    kbdlang: "fr"
-    - kbdmodel: "pc105"
+    kbdmodel: "pc105"
-    - kbdvariant: "latin9"
+    kbdvariant: "latin9"
-    - localelang: "fr_FR"
+    localelang: "fr_FR"
-    - localelanguage: "fr_FR:"
+    localelanguage: "fr_FR:"
-    - timezone: "Europe/Paris"
+    timezone: "Europe/Paris"
-    - languagepacks:
+    languagepacks:
       - language-pack-fr
       - language-pack-fr-base
   vars_prompt:
@@ -21,16 +20,16 @@
       prompt: "Timezone "
       default: "Europe/Paris"
     - name: "ad_dns_domain"
-      prompt: "Active Directory DNS domain name "
+      prompt: "Active Directory DNS domain name : "
       private: no
       default: "organization.int"
     - name: "ad_nt_domain"
-      prompt: "NT domain name "
+      prompt: "NT domain name : "
       private: no
       default: "ORGANIZATION"
     - name: "ad_admin_username"
-      prompt: "Admin username "
+      prompt: "Admin username : "
       private: no
       default: "Administrator"
     - name: "ad_admin_password"
-      prompt: "Admin password "
+      prompt: "Admin password : "

roles/common/defaults/main.yml

@@ -0,0 +1,17 @@
+---
+apt_pkgs:
+  - htop
+  - ntp
+  - ntpdate
+  - ncdu
+  - tmux
+
+kbdlang: "fr"
+kbdmodel: "pc105"
+kbdvariant: "latin9"
+localelang: "fr_FR"
+localelanguage: "fr_FR:"
+timezone: "Europe/Paris"
+languagepacks:
+  - language-pack-fr
+  - language-pack-fr-base

roles/common/tasks/apt.yml

@@ -1,26 +1,18 @@
 ---
 - name: Update apt sources
   apt:
-    update_cache=yes
+    update_cache: yes
-    upgrade=yes
   tags:
-    - prereqs
+    - apt_prereqs
-    - apt
 
 - name: Install utils main utils
-  apt: name={{ item }}
+  apt:
-  with_items:
+    name: "{{ apt_pkgs }}"
-    - "{{ apt_pkgs }}"
   tags:
-    - prereqs
+    - apt_prereqs
-    - apt
 
 - name: Install needed language packs
-  apt: name={{ item }}
+  apt:
-  with_items:
+    name: "{{ languagepacks }}"
-    - language-pack-fr
-    - language-pack-fr-base
   tags:
-    - prereqs
+    - apt_prereqs
-    - apt
-

roles/common/tasks/hostname.yml

@@ -1,26 +1,25 @@
 ---
 - name: Set hostname
-  shell: hostname {{ ansible_hostname }}.{{ ad_dns_domain }}
+  shell: "hostname {{ ansible_hostname }}.{{ ad_dns_domain }}"
 
 - name: Set hostname file
   template:
-    src=hostname.j2
+    src: hostname.j2
-    dest=/etc/hostname
+    dest: /etc/hostname
-    mode=0644
+    mode: 0644
-    owner=root
+    owner: root
-    group=root
+    group: root
   tags:
     - prereqs
     - hostname
 
 - name: Set hosts file
   template:
-    src=hosts.j2
+    src: hosts.j2
-    dest=/etc/hosts
+    dest: /etc/hosts
-    mode=0644
+    mode: 0644
-    owner=root
+    owner: root
-    group=root
+    group: root
   tags:
     - prereqs
     - hostname
-

roles/common/tasks/keyboard.yml

@@ -1,12 +1,11 @@
 ---
 - name: Set keyboard layouts
   template:
-    src=keyboard.j2
+    src: keyboard.j2
-    dest=/etc/default/keyboard
+    dest: /etc/default/keyboard
-    mode=0644
+    mode: 0644
-    owner=root
+    owner: root
-    group=root
+    group: root
   tags:
     - prereqs
     - keyboard
-

roles/common/tasks/main.yml

@@ -1,7 +1,4 @@
 ---
-- name: Install aptitude
-  command: apt-get install -y aptitude
-
 - name: Update lists, upgrade and install needed packages
   include: apt.yml
 
@@ -13,4 +10,3 @@
 
 - name: Include time configuration
   include: time.yml
-

roles/common/tasks/time.yml

@@ -1,10 +1,10 @@
 ---
 - name: Set Timezone
   file:
-    src=/usr/share/zoneinfo/{{ timezone }}
+    src: "/usr/share/zoneinfo/{{ timezone }}"
-    dest=/etc/localtime
+    dest: "/etc/localtime"
-    force=yes
+    force: yes
-    state=link
+    state: link
   tags:
     - prereqs
     - timezone

roles/common/templates/keyboard.j2

@@ -8,4 +8,3 @@ XKBVARIANT="{{ kbdvariant }}"
 XKBOPTIONS=""
 
 BACKSPACE="guess"
-

roles/common/vars/main.yml

@@ -1,7 +1 @@
 ---
-apt_pkgs:
-  - htop
-  - ntp
-  - ntpdate
-  - ncdu
-  - tmux

roles/gdm/tasks/main.yml

@@ -1 +0,0 @@
----

roles/gdm/templates/lightdm.conf.j2

@@ -1,6 +0,0 @@
-[SeatDefaults]
-allow-guest=false
-greeter-hide-users=true
-greeter-show-manual-login=true
-autologin-user=
-

roles/gdm/templates/users.conf.j2

@@ -1,15 +0,0 @@
-#
-# User accounts configuration
-#
-# NOTE: If you have AccountsService installed on your system, then LightDM will
-# use this instead and these settings will be ignored
-#
-# minimum-uid = Minimum UID required to be shown in greeter
-# hidden-users = Users that are not shown to the user
-# hidden-shells = Shells that indicate a user cannot login
-#
-[UserList]
-minimum-uid=500
-hidden-users=nobody nobody4 noaccess
-hidden-shells=/bin/false /usr/sbin/nologin
-

roles/lightdm/defaults/main.yml

@@ -0,0 +1 @@
+---

roles/lightdm/tasks/main.yml

@@ -1,18 +1,24 @@
 ---
+- name: Create lightdm config dir
+  file:
+    path: /etc/lightdm
+    state: directory
+  tags: lightdm
+
 - name: Set lightdm main configuration file
   template:
-    src=lightdm.conf.j2
+    src: lightdm.conf.j2
-    dest=/etc/lightdm/lightdm.conf
+    dest: /etc/lightdm/lightdm.conf
-    mode=0644
+    mode: 0644
-    owner=root
+    owner: root
-    group=root
+    group: root
   tags: lightdm
 
 - name: Set lightdm users.conf file
   template:
-    src=users.conf.j2
+    src: users.conf.j2
-    dest=/etc/lightdm/users.conf
+    dest: /etc/lightdm/users.conf
-    mode=0644
+    mode: 0644
-    owner=root
+    owner: root
-    group=root
+    group: root
   tags: lightdm

roles/lightdm/templates/lightdm.conf.j2

@@ -3,4 +3,3 @@ allow-guest=false
 greeter-hide-users=true
 greeter-show-manual-login=true
 autologin-user=
-

roles/lightdm/templates/users.conf.j2

@@ -12,4 +12,3 @@
 minimum-uid=500
 hidden-users=nobody nobody4 noaccess
 hidden-shells=/bin/false /usr/sbin/nologin
-

roles/lightdm/vars/main.yml

@@ -0,0 +1 @@
+---

roles/pam/defaults/main.yml

@@ -0,0 +1 @@
+---

roles/pam/tasks/main.yml

@@ -1,46 +1,45 @@
 ---
 - name: Install common-account
   template:
-    src=common-account.j2
+    src: common-account.j2
-    dest=/etc/pam.d/common-account
+    dest: /etc/pam.d/common-account
-    mode=0644
+    mode: 0644
-    owner=root
+    owner: root
-    group=root
+    group: root
   tags: pam
 
 - name: Install common-auth
   template:
-    src=common-auth.j2
+    src: common-auth.j2
-    dest=/etc/pam.d/common-auth
+    dest: /etc/pam.d/common-auth
-    mode=0644
+    mode: 0644
-    owner=root
+    owner: root
-    group=root
+    group: root
   tags: pam
 
 - name: Install common-password
   template:
-    src=common-password.j2
+    src: common-password.j2
-    dest=/etc/pam.d/common-password
+    dest: /etc/pam.d/common-password
-    mode=0644
+    mode: 0644
-    owner=root
+    owner: root
-    group=root
+    group: root
   tags: pam
 
 - name: Install common-session
   template:
-    src=common-session.j2
+    src: common-session.j2
-    dest=/etc/pam.d/common-session
+    dest: /etc/pam.d/common-session
-    mode=0644
+    mode: 0644
-    owner=root
+    owner: root
-    group=root
+    group: root
   tags: pam
 
 - name: Install common-session-noninteractive
   template:
-    src=common-session-noninteractive.j2
+    src: common-session-noninteractive.j2
-    dest=/etc/pam.d/common-session-noninteractive
+    dest: /etc/pam.d/common-session-noninteractive
-    mode=0644
+    mode: 0644
-    owner=root
+    owner: root
-    group=root
+    group: root
   tags: pam
-

roles/pam/vars/main.yml

@@ -0,0 +1 @@
+---

roles/samba/defaults/main.yml

@@ -0,0 +1,14 @@
+---
+samba_packages:
+  - heimdal-clients
+  - libnss-winbind
+  - libpam-winbind
+  - ntp
+  - ntpdate
+  - samba
+  - winbind
+
+samba_daemons:
+  - smbd
+  - nmbd
+  - winbind

roles/samba/handlers/main.yml

@@ -1,8 +1,6 @@
-- name: restart samba
+---
+- name: Restart samba
   service:
-    name={{ item }}
+    name: "{{ item }}"
-    state=restarted
+    state: restarted
-  with_items:
+  loop: "{{ samba_daemons }}"
-    - smbd
-    - nmbd
-    - winbind

roles/samba/tasks/main.yml

@@ -1,75 +1,62 @@
 ---
 - name: Install samba and required tools
   apt:
-    name={{ item }}
+    name: "{{ item }}"
-    state=present
+    state: present
-  with_items:
+  loop: "{{ samba_packages }}"
-    - heimdal-clients
+  tags: samba
-    - libnss-winbind
-    - libpam-winbind
-    - ntp
-    - ntpdate
-    - samba
-    - winbind
-  tags:
-    - samba
 
 - name: Install nsswitch passwd config
   lineinfile:
-    dest=/etc/nsswitch.conf
+    dest: /etc/nsswitch.conf
-    regexp="^passwd:"
+    regexp: "^passwd:"
-    line="passwd{{ ':' }}   files winbind"
+    line: "passwd{{ ':' }}   files winbind"
-  notify: restart samba
+  notify: Restart samba
   tags:
     - samba
     - nsswitch
 
 - name: Install nsswitch group config
   lineinfile:
-    dest=/etc/nsswitch.conf
+    dest: /etc/nsswitch.conf
-    regexp="^group:"
+    regexp: "^group:"
-    line="group{{ ':' }}    files winbind"
+    line: "group{{ ':' }}    files winbind"
-  notify: restart samba
+  notify: Restart samba
   tags:
     - samba
     - nsswitch
 
 - name: Install nsswitch shadow config
   lineinfile:
-    dest=/etc/nsswitch.conf
+    dest: /etc/nsswitch.conf
-    regexp="^shadow:"
+    regexp: "^shadow:"
-    line="shadow{{ ':' }}   files winbind"
+    line: "shadow{{ ':' }}   files winbind"
-  notify: restart samba
+  notify: Restart samba
   tags:
     - samba
     - nsswitch
 
 - name: Install samba configuration
   template:
-    src=smb.conf.j2
+    src: smb.conf.j2
-    dest=/etc/samba/smb.conf
+    dest: /etc/samba/smb.conf
-    mode=0644
+    mode: 0644
-    owner=root
+    owner: root
-    group=root
+    group: root
-  notify: restart samba
+  notify: Restart samba
   tags:
     - samba
     - smbconf
 
 - name: Enable samba services
   service:
-    name={{ item }}
+    name: "{{ item }}"
-    enabled=yes
+    enabled: yes
-  with_items:
+  loop: "{{ samba_daemons }}"
-    - smbd
-    - nmbd
-    - winbind
-  tags:
-    - samba
-
-- name: Join domain
-  shell: net ads join -U {{ ad_admin_username }}%{{ ad_admin_password }}
-  notify: restart samba
-  register: join_domain
   tags: samba
 
+- name: Join domain
+  shell: "net ads join -U {{ ad_admin_username }}%{{ ad_admin_password }}"
+  notify: Restart samba
+  register: join_domain
+  tags: samba

roles/samba/vars/main.yml

@@ -0,0 +1 @@
+---