Merge pull request #1273 from holta/ansible-output

Ansible output that educates en route (building on PRs #1271, #1272)

roles/2-common/tasks/packages.yml

@@ -1,4 +1,4 @@
-- name: Install 10 yum/dnf packages {avahi, avahi-tools, createrepo, linux-firmware, nss-mdns, openssl, syslog, wpa_supplicant, xml-common, yum-utils} (redhat)
+- name: "Install 10 yum/dnf packages: avahi, avahi-tools, createrepo, linux-firmware, nss-mdns, openssl, syslog, wpa_supplicant, xml-common, yum-utils (redhat)"
   package:
     name:
       - avahi
@@ -20,7 +20,7 @@
     #timeout: "{{ download_timeout }}"    # Ansible's apt module doesn't support timeout parameter; that's ok as usbmount_0.0.14.1_all.deb is only 10KB
   when: internet_available and is_debian_9
 
-- name: Install 7 packages {avahi-daemon, avahi-discover, exfat-fuse, exfat-utils, inetutils-syslogd, libnss-mdns, wpasupplicant} (debuntu)
+- name: "Install 7 deb/apt packages: avahi-daemon, avahi-discover, exfat-fuse, exfat-utils, inetutils-syslogd, libnss-mdns, wpasupplicant (debuntu)"
   package:
     name:
       - avahi-daemon
@@ -33,7 +33,7 @@
     state: present
   when: is_debuntu
 
-- name: Install 23 common packages {acpid, bridge-utils, bzip2, curl, gawk, hostapd, htop, i2c-tools, logrotate, make, mlocate, netmask, net-tools, ntfs-3g, openssh-server, pandoc, rsync, sudo, tar, unzip, usbmount, usbutils, wget}
+- name: "Install 23 common packages: acpid, bridge-utils, bzip2, curl, gawk, hostapd, htop, i2c-tools, logrotate, make, mlocate, netmask, net-tools, ntfs-3g, openssh-server, pandoc, rsync, sudo, tar, unzip, usbmount, usbutils, wget"
   package:
     name:
       - acpid
@@ -63,7 +63,7 @@
       - wget
     state: present
 
-- name: Install 4 common Python packages {python-passlib, python-pip, python-setuptools, python-virtualenv}
+- name: "Install 4 common Python packages: python-passlib, python-pip, python-setuptools, python-virtualenv"
   package:
     name:
       - python-passlib

roles/iiab-admin/tasks/access.yml

@@ -1,4 +1,4 @@
-- name: Install textmode remote access packages {screen, lynx}
+- name: "Install textmode remote access packages: screen, lynx"
   package:
     name:
     - screen

roles/network/tasks/named.yml

@@ -1,4 +1,4 @@
-- name: Install named packages {bind9, bind9utils} (if debuntu)
+- name: "Install named packages: bind9, bind9utils (debuntu)"
   package:
     name:
       - bind9
@@ -8,7 +8,7 @@
   tags:
     - download
 
-- name: Install named packages {bind, bind-utils} (if not debuntu)
+- name: "Install named packages: bind, bind-utils (OS's other than debuntu)"
   package:
     name:
       - bind
@@ -25,7 +25,7 @@
     state: stopped
   when: first_run and is_debuntu
 
-- name: Set folder permission
+- name: "Set 3 folders' ownership to {{ dns_user }}:root and permission to 0755"
   file:
     path: "{{ item }}"
     owner: "{{ dns_user }}"
@@ -37,7 +37,7 @@
     - /var/named-iiab/data
     - /etc/sysconfig/olpc-scripts/domain_config.d
 
-- name: Configure named
+- name: Install 21 configuration files for named, from templates
   template:
     src: "{{ item.src }}"
     dest: "{{ item.dest }}"
@@ -68,39 +68,39 @@
     - { src: 'roles/network/templates/named/dummy', dest: '/var/named-iiab/data/dummy', owner: "{{ dns_user }}", mode: '0644' }
     - { src: 'roles/network/templates/named/named.blackhole', dest: '/var/named-iiab/named.blackhole', owner: "{{ dns_user }}", mode: '0644' }
 
-- name: Substitute our unit file which uses $OPTIONS from sysconfig
+- name: Install named unit file /etc/systemd/system/{{ dns_service }}.service, which uses $OPTIONS from sysconfig
   template:
     src: "roles/network/templates/named/{{ dns_service }}.service"
     dest: "/etc/systemd/system/{{ dns_service }}.service"
     mode: 0644
 
-- name: The dns-jail redirect requires the named.blackhole, disabling recursion (if dns_jail_enabled)
+- name: "Install /etc/{{ apache_config_dir }}/dns-jail.conf from template: dns-jail redirect requires the named.blackhole, disabling recursion (if dns_jail_enabled)"
 #        in named-iiab.conf, and the redirection of 404 error documents to /
   template:
     src: roles/network/templates/named/dns-jail.conf
     dest: "/etc/{{ apache_config_dir }}/"
   when: dns_jail_enabled
 
-- name: Separate enabling required (if debuntu and dns_jail_enabled)
+- name: Create symlink dns-jail.conf from sites-enabled to sites-available (if debuntu and dns_jail_enabled)
   file:
     src: "/etc/{{ apache_config_dir }}/dns-jail.conf"
     path: "/etc/{{ apache_service }}/sites-enabled/dns-jail.conf"
     state: link
   when: is_debuntu and dns_jail_enabled
 
-- name: Separate disabling required (if debuntu and not dns_jail_enabled)
+- name: Remove symlink /etc/{{ apache_service }}/sites-enabled/dns-jail.conf (if debuntu and not dns_jail_enabled)
   file: 
     path: "/etc/{{ apache_service }}/sites-enabled/dns-jail.conf"
     state: absent
   when: is_debuntu and not dns_jail_enabled
 
-- name: Separate enabling/disabling required (if not debuntu and not dns_jail_enabled)
+- name: Remove symlink /etc/{{ apache_config_dir }}/dns-jail.conf (if not debuntu and not dns_jail_enabled)
   file:
     path: "/etc/{{ apache_config_dir }}/dns-jail.conf"
     state: absent
   when: not is_debuntu and not dns_jail_enabled
 
-- name: Start named after copying files
+- name: Start named systemd service
-  service:
+  systemd:
     name: "{{ dns_service }}"
     state: started

roles/network/tasks/squid.yml

@@ -1,4 +1,4 @@
-- name: 'Install packages: {{ proxy }} and cadaver'
+- name: "Install 2 packages: {{ proxy }}, cadaver"
   package:
     name:
       - "{{ proxy }}"
@@ -7,7 +7,7 @@
   tags:
     - download
 
-- name: 'Bigger hammer for Ubuntu, run: /etc/init.d/squid stop'
+- name: "Bigger hammer for Ubuntu, run: /etc/init.d/squid stop"
   command: /etc/init.d/squid stop
   when: is_ubuntu
 
@@ -17,13 +17,13 @@
     state: stopped
   when: not installing
 
-- name: 'Create the Squid user: {{ proxy_user }}'
+- name: "Create the Squid user: {{ proxy_user }}"
   user:
     name: "{{ proxy_user }}"
     createhome: False
     shell: /bin/false
 
-- name: 'Install from template: /usr/bin/iiab-httpcache, /etc/sysconfig/squid, /etc/{{ proxy }}/sites.whitelist.txt and 3 .rules files'
+- name: "Install from template: /usr/bin/iiab-httpcache, /etc/sysconfig/squid, /etc/{{ proxy }}/sites.whitelist.txt and 3 .rules files"
   template:
     src: "{{ item.src }}"
     dest: "{{ item.dest }}"

roles/nextcloud/tasks/main.yml

@@ -83,7 +83,7 @@
     state: present
   when: is_redhat
 
-- name: Unarchive {{ nextcloud_src_file }} to permanent location {{ nextcloud_prefix }}    # e.g. unpack nextcloud_latest-14.tar.bz2 to /opt/nextcloud
+- name: Unarchive {{ nextcloud_src_file }} to permanent location {{ nextcloud_prefix }}/nextcloud    # e.g. unpack nextcloud_latest-14.tar.bz2 to /opt/nextcloud
   unarchive:
     src: "{{ downloads_dir }}/{{ nextcloud_src_file }}"
     dest: "{{ nextcloud_prefix }}"

roles/samba/tasks/main.yml

@@ -1,10 +1,10 @@
-- name: 'Create smb user: {{ smbuser }}'
+- name: "Create smb user: {{ smbuser }}"
   user:
     name: "{{ smbuser }}"
     shell: /sbin/nologin
     password: "{{ smbpassword }}"
 
-- name: 'Create public folder: {{ shared_dir }}'
+- name: "Create public folder: {{ shared_dir }}"
   file:
     path: "{{ shared_dir }}"
     owner: "{{ smbuser }}"
@@ -13,7 +13,7 @@
     state: directory
 
 # Install and configure samba server (requires ports 137, 138, 139, 445 open).
-- name: Install 4 packages {samba, samba-client, samba-common, cifs-client}
+- name: "Install 4 packages: samba, samba-client, samba-common, cifs-client"
   package:
     name:
       - samba