From e6db3ccc06f71cc6a600abea9de6456ade749e5a Mon Sep 17 00:00:00 2001
From: Jannik Beyerstedt <code@jannikbeyerstedt.de>
Date: Tue, 12 Nov 2019 21:34:35 +0100
Subject: [PATCH] [TIDY] yaml auto-format

---
 README.md               |  4 ++++
 handlers/main.yml       |  2 --
 meta/main.yml           | 12 +++++++-----
 tasks/borgbackup.yml    |  1 -
 tasks/caddy-install.yml |  1 -
 tasks/caddy-setup.yml   |  1 -
 tasks/cronmails.yml     |  8 +++++---
 tasks/docker.yml        |  1 -
 tasks/setup.yml         |  2 +-
 tasks/telegraf.yml      |  5 +----
 vars/main.yml           |  2 --
 11 files changed, 18 insertions(+), 21 deletions(-)
 delete mode 100644 vars/main.yml

diff --git a/README.md b/README.md
index 1b29fed..3a9d173 100644
--- a/README.md
+++ b/README.md
@@ -37,6 +37,10 @@ Mandatory variable:
 Mandatory variable:
 - `cron_email`: Sender email address used by cron
 
+### Docker
+Optional variable:
+- `dockercompose_use_pip`: boolean to use pip instead of manual download (default: false)
+
 ### DynDNS
 This task and it's configuration files might be quite specific for the [davd/docker-ddns](https://github.com/dprandzioch/docker-ddns) docker container.
 
diff --git a/handlers/main.yml b/handlers/main.yml
index 1d6689e..4ce74e6 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -6,7 +6,6 @@
     name: ssh
     state: restarted
 
-
 - name: Enable telegraf
   service:
     name: telegraf
@@ -23,7 +22,6 @@
     state: restarted
     enabled: yes
 
-
 - name: Enable caddy
   service:
     name: caddy
diff --git a/meta/main.yml b/meta/main.yml
index e382dbe..75ede6f 100644
--- a/meta/main.yml
+++ b/meta/main.yml
@@ -7,14 +7,16 @@ galaxy_info:
   min_ansible_version: 2.4
 
   platforms:
-  - name: Debian
-    versions:
-    - all
+    - name: Debian
+      versions:
+        - all
 
-  galaxy_tags: []
+  galaxy_tags:
+    []
     # List tags for your role here, one per line.
     # Be sure to remove the '[]' above, if you add tags to this list.
 
-dependencies: []
+dependencies:
+  []
   # List your role dependencies here, one per line.
   # Be sure to remove the '[]' above, if you add tags to this list.
diff --git a/tasks/borgbackup.yml b/tasks/borgbackup.yml
index a695e0f..ec2ff70 100644
--- a/tasks/borgbackup.yml
+++ b/tasks/borgbackup.yml
@@ -12,7 +12,6 @@
     - "borgbackup-{{ ansible_distribution }}.yml"
     - "borgbackup-{{ ansible_os_family }}.yml"
 
-
 # copy backup script and enable cronjob
 - name: borgbackup - Copy Borgbackup script
   become: yes
diff --git a/tasks/caddy-install.yml b/tasks/caddy-install.yml
index b6638fa..1176b32 100644
--- a/tasks/caddy-install.yml
+++ b/tasks/caddy-install.yml
@@ -6,7 +6,6 @@
   shell: lsb_release -is
   register: lsb_id
 
-
 - name: caddyserver - Stop caddy
   become: yes
   service:
diff --git a/tasks/caddy-setup.yml b/tasks/caddy-setup.yml
index 448716c..93f4ced 100644
--- a/tasks/caddy-setup.yml
+++ b/tasks/caddy-setup.yml
@@ -37,7 +37,6 @@
     group: root
     mode: 0644
 
-
 - name: caddyserver - Add standard user to www-data group
   become: yes
   user:
diff --git a/tasks/cronmails.yml b/tasks/cronmails.yml
index b701a4f..e78484f 100644
--- a/tasks/cronmails.yml
+++ b/tasks/cronmails.yml
@@ -9,11 +9,13 @@
     state: present
   vars:
     packages:
-    - exim4
-    - mailutils
+      - exim4
+      - mailutils
 - name: cronmails - Create exim4 config folder
   become: yes
-  file: path=/etc/exim4 state=directory
+  file:
+    path: /etc/exim4
+    state: directory
 - name: cronmails - Copy exim4 config template
   become: yes
   copy:
diff --git a/tasks/docker.yml b/tasks/docker.yml
index 6424885..c067921 100644
--- a/tasks/docker.yml
+++ b/tasks/docker.yml
@@ -10,7 +10,6 @@
     - "docker-{{ ansible_distribution }}.yml"
     - "docker-{{ ansible_os_family }}.yml"
 
-
 # Other setup tasks
 - name: docker - Add standard user to docker group
   become: yes
diff --git a/tasks/setup.yml b/tasks/setup.yml
index 6dbeb75..63170e5 100644
--- a/tasks/setup.yml
+++ b/tasks/setup.yml
@@ -9,4 +9,4 @@
     dest: "/etc/ssh/sshd_config"
     backup: yes
   notify:
-  - Restart sshd
+    - Restart sshd
diff --git a/tasks/telegraf.yml b/tasks/telegraf.yml
index b89356e..d122e2d 100644
--- a/tasks/telegraf.yml
+++ b/tasks/telegraf.yml
@@ -1,8 +1,5 @@
 ---
 # Server/Telegraf: Install and Setup Telegraf Monitoring
-# Variables:
-# - telegraf_snmp: boolean, enable SNMP monitoring for the fra80 network
-# - telegraf_docker: boolean, enable docker monitoring
 
 - name: telegraf - Install apt-transport-https
   become: yes
@@ -33,4 +30,4 @@
     src: "{{ role_path }}/templates/telegraf.conf"
     dest: /etc/telegraf/telegraf.conf
   notify:
-  - Enable and restart telegraf
+    - Enable and restart telegraf
diff --git a/vars/main.yml b/vars/main.yml
deleted file mode 100644
index 7fe0879..0000000
--- a/vars/main.yml
+++ /dev/null
@@ -1,2 +0,0 @@
----
-# vars file for server
\ No newline at end of file