Merge branch 'master' into file-module-fixes

roles/iiab-admin/README.rst

@@ -1,5 +1,5 @@
 =================
-XSCE Admin README
+IIAB Admin README
 =================
 
 This role is home to a number of administrative playbooks.  Those implemented are:
@@ -22,4 +22,4 @@ Add Packages for Remote Access
 Admin Console
 -------------
 
-Has been moved to a separate git repo
+Has been moved to separate git repo: https://github.com/iiab/iiab-admin-console

roles/iiab-admin/tasks/admin-user.yml

@@ -32,26 +32,26 @@
 
 #        backup=yes
 
-- name: edit the sudoers file--first make it editable
+- name: Edit the sudoers file -- first make it editable
   file: path=/etc/sudoers
         mode=0640
 
-- name: have sudo log all commands it handles
+- name: Have sudo log all commands it handles
   lineinfile: regexp=logfile
               line='Defaults     logfile = /var/log/sudo.log'
               state=present
               dest=/etc/sudoers
 
-- name: lets wheel sudo without password
+- name: Lets wheel sudo without password
   lineinfile:
      line: "%wheel ALL= NOPASSWD: ALL"
      dest: /etc/sudoers
 
-- name: remove the line which requires tty
+- name: Remove the line which requires tty
   lineinfile: regexp=requiretty
               state=absent
               dest=/etc/sudoers
 
-- name: end editing the sudoers file-- protect it again
+- name: End editing the sudoers file -- protect it again
   file: path=/etc/sudoers
         mode=0440

roles/iiab-admin/tasks/main.yml

@@ -1,9 +1,9 @@
-- include: admin-user.yml
+- include_tasks: admin-user.yml
   tags:
     - base
   when: not no_admin is defined
 
-- include: access.yml
+- include_tasks: access.yml
   tags:
     - base
 
@@ -28,12 +28,12 @@
   stat: path=/home/pi/.config/lxsession
   register: lx
 
-- name: Do the same if running on raspbian
+- name: Do the same if running on Raspbian
   template: src=lxde_ssh_warn.sh
             dest=/home/pi/.config/lxsession/LXDE-pi/
   when: lx.stat.isdir is defined and lx.stat.isdir and is_rpi and is_debuntu
 
-- name: put a autostart line to check for default password in LXDE
+- name: Put an autostart line to check for default password in LXDE
   lineinfile: line=@/home/pi/.config/lxsession/LXDE-pi/lxde_ssh_warn.sh
               dest=/home/pi/.config/lxsession/LXDE-pi/autostart
   when: lx.stat.isdir is defined and lx.stat.isdir and is_rpi and is_debuntu