Streamline tag usage, make sure "apt" is set on every apt task

[AnsibleRoles.git] / roles / piwik / tasks / main.yml

diff --git a/roles/piwik/tasks/main.yml b/roles/piwik/tasks/main.yml
index 6442168ca9305da17dab28230595b8b532db98d4..bdf84d5ab0277d38e88d8ee2a28abbd5fe3209f7 100644 (file)
--- a/roles/piwik/tasks/main.yml
+++ b/roles/piwik/tasks/main.yml
@@ -5,12 +5,12 @@
   tags:
     - docker
     - packages
-  apt: >
-    name={{ item }}
-    state=installed
-  with_items:
-    - apt-transport-https
-    - ca-certificates
+  apt:
+    name: [
+      'apt-transport-https',
+      'ca-certificates',
+    ]
+    state: present
   when: piwik_apt_repository.startswith("https://")
 
 - name: install Piwik repository GnuPG key
@@ -41,16 +41,16 @@
 
 - meta: flush_handlers
   tags:
-    - piwik
-    - packages
+    - apt
 
 - name: install "piwik"
   tags:
+    - apt
     - piwik
     - packages
   apt: >
     name=piwik
-    state=installed
+    state=present
 
 - name: install Piwik configuration
   tags:
@@ -83,6 +83,13 @@
     owner=root
     path=/usr/share/piwik/piwik.js
 
+- name: remove README.md.gz, to make self-check happy
+  tags:
+    - piwik
+  file: >
+    state=absent
+    path=/usr/share/doc/piwik/README.md.gz
+
 - name: install Apache VHost configuration for Piwik
   tags:
     - piwik
@@ -94,7 +101,7 @@
     owner=root
     src=apache2_piwik_vhost.conf.j2
   notify:
-    - restart "apache2"
+    - reload "apache2" (graceful)
 
 - name: enable Apache VHost configuration for Piwik
   tags:
@@ -107,7 +114,7 @@
     src=/etc/apache2/sites-available/piwik.conf
     state=link
   notify:
-    - restart "apache2"
+    - reload "apache2" (graceful)
 
 - name: install Piwik PHP configuration
   tags: