From 5a050c4c6513ab41074de67ce3314a94b9ea97c5 Mon Sep 17 00:00:00 2001
From: jurgenhaas <juergen@paragon-es.de>
Date: Tue, 11 Jun 2019 18:36:15 +0200
Subject: [PATCH] ansible-playbooks/general#85 Linting
---
defaults/main.yml | 10 ++++++----
tasks/main.yml | 36 ++++++++++++++++++------------------
2 files changed, 24 insertions(+), 22 deletions(-)
diff --git a/defaults/main.yml b/defaults/main.yml
index 8e064c3..59c1616 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -1,11 +1,13 @@
-default_proxy:
-proxy_debug: false
-proxy_default_backend:
+---
+
+default_proxy: ''
+proxy_debug: no
+proxy_default_backend: ''
proxy_certificates: []
proxy_timeout_connect: 5s
proxy_timeout_client: 20s
proxy_timeout_server: 45s
-proxy_redirect_aliase: false
+proxy_redirect_aliase: no
proxy_maxconn: 100
proxy_varnish_maxconn: 1000
proxy_redirect_maps:
diff --git a/tasks/main.yml b/tasks/main.yml
index 338fd7a..5dfc00e 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -9,31 +9,31 @@
- block:
- - import_tasks: install.yml
- - import_tasks: configure.yml
- tags:
- - Config
- - import_tasks: blacklists.yml
- tags:
- - Config
- - Blacklists
+ - import_tasks: install.yml
+ - import_tasks: configure.yml
+ tags:
+ - Config
+ - import_tasks: blacklists.yml
+ tags:
+ - Config
+ - Blacklists
when: not excluded_roles or "haproxy" not in excluded_roles
- block:
- - name: Install Certs
- include_tasks: ../../letsencrypt/tasks/cert.yml
- with_items: '{{ proxy_certificates|default([]) }}'
- loop_control:
- loop_var: domain
- when: domain.letsencrypt|default(false) and domain.active|default(true)
+ - name: Install Certs
+ include_tasks: ../../letsencrypt/tasks/cert.yml
+ with_items: '{{ proxy_certificates|default([]) }}'
+ loop_control:
+ loop_var: domain
+ when: domain.letsencrypt|default(false) and domain.active|default(true)
- - name: Renew Existing Cert
- import_tasks: ../../letsencrypt/tasks/renew.yml
+ - name: Renew Existing Cert
+ import_tasks: ../../letsencrypt/tasks/renew.yml
- - name: Build HaProxy Certs
- import_tasks: buildcerts.yml
+ - name: Build HaProxy Certs
+ import_tasks: buildcerts.yml
tags:
- Certs
--
GitLab