From 9dd83a8146703dd3ba32fc1dd2a9590eb32cc92c Mon Sep 17 00:00:00 2001
From: Timo Makinen <tmakinen@foo.sh>
Date: Mon, 31 Aug 2020 00:20:22 +0000
Subject: [PATCH] Lint fixes

---
 roles/ansible-host/meta/main.yml |  4 ++--
 roles/collab/tasks/main.yml      | 28 +++++++++++++++-------------
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/roles/ansible-host/meta/main.yml b/roles/ansible-host/meta/main.yml
index 4db02d4..cd75ce5 100644
--- a/roles/ansible-host/meta/main.yml
+++ b/roles/ansible-host/meta/main.yml
@@ -1,4 +1,4 @@
 ---
 dependencies:
-  - { role: epel-repo }
-  - { role: nginx/server }
+  - {role: epel-repo}
+  - {role: nginx/server}
diff --git a/roles/collab/tasks/main.yml b/roles/collab/tasks/main.yml
index 2d021d1..01ee2f5 100644
--- a/roles/collab/tasks/main.yml
+++ b/roles/collab/tasks/main.yml
@@ -15,21 +15,21 @@
 - name: download moin package
   get_url:
     url: "https://static.moinmo.in/files/moin-{{ moin_version }}.tar.gz"
-    dest: /usr/local/src
+    dest: "{{ srcdir }}"
     checksum: sha1:bead31f53152395aa93c31dc3e0a8a417be39ccd
 
 - name: extract moin package
   unarchive:
-    src: "/usr/local/src/moin-{{ moin_version }}.tar.gz"
-    dest: /usr/local/src
+    src: "{{ srcdir }}/moin-{{ moin_version }}.tar.gz"
+    dest: "{{ srcdir }}"
     owner: root
     group: "{{ ansible_wheel }}"
-    creates: "/usr/local/src/moin-{{ moin_version }}"
+    creates: "{{ srcdir }}/moin-{{ moin_version }}"
     remote_src: true
 
 - name: copy graphingwiki packages
   git:
-    dest: "/usr/local/src/{{ item }}"
+    dest: "{{ srcdir }}/{{ item }}"
     repo: "https://github.com/graphingwiki/{{ item }}.git"
   with_items:
     - graphingwiki
@@ -38,22 +38,24 @@
 - name: patch moin source
   patch:
     src: "moin-{{ moin_version }}.patch"
-    basedir: "/usr/local/src/moin-{{ moin_version }}"
+    basedir: "{{ srcdir }}/moin-{{ moin_version }}"
 
 - name: copy moin htdocs
-  command: "cp -a /usr/local/src/moin-{{ moin_version }}/MoinMoin/web/static/htdocs /usr/local/src/moin-{{ moin_version }}/wiki"
+  command: >
+    cp -a {{ srcdir }}/moin-{{ moin_version }}/MoinMoin/web/static/htdocs \
+    {{ srcdir }}/moin-{{ moin_version }}/wiki
   args:
-    creates: "/usr/local/src/moin-{{ moin_version }}/wiki/htdocs"
+    creates: "{{ srcdir }}/moin-{{ moin_version }}/wiki/htdocs"
 
 - name: install graphigwiki packages
   pip:
-    name: [/usr/local/src/graphingwiki, /usr/local/src/collabbackend]
+    name: ["{{ srcdir }}/graphingwiki", "{{ srcdir }}/collabbackend"]
     umask: "0022"
     extra_args: --egg --no-index
 
 - name: install moin
   pip:
-    name: "/usr/local/src/moin-{{ moin_version }}"
+    name: "{{ srcdir }}/moin-{{ moin_version }}"
     umask: "0022"
     extra_args: --no-index
 
@@ -155,7 +157,7 @@
 
 - name: copy configs from collabbackend archive
   copy:
-    src: "/usr/local/src/collabbackend/config/{{ item }}"
+    src: "{{ srcdir }}/collabbackend/config/{{ item }}"
     dest: /srv/wikis/collab/config/{{ item }}
     mode: 0660
     owner: collab
@@ -168,7 +170,7 @@
 
 - name: extract CollabBase.zip from collabbackend archive
   copy:
-    src: /usr/local/src/collabbackend/packages/CollabBase.zip
+    src: "{{ srcdir }}/collabbackend/packages/CollabBase.zip"
     dest: /var/lib/collab/CollabBase.zip
     mode: 0660
     owner: collab
@@ -208,7 +210,7 @@
   user:
     name: apache
     groups: collab
-    append: yes
+    append: true
   notify: restart apache
 
 - name: create apache config