From 706d7b64905e5d8a250e3b9ca04558ef0852a38c Mon Sep 17 00:00:00 2001
From: Anton Vakhrushev <anwinged@ya.ru>
Date: Thu, 11 Aug 2022 20:39:25 +0300
Subject: [PATCH] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8=D0=BB=20?=
 =?UTF-8?q?=D0=B7=D0=B0=D0=B2=D0=B8=D1=81=D0=B8=D0=BC=D0=BE=D1=81=D1=82?=
 =?UTF-8?q?=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ansible/configuration.yml            | 25 +++++++++++++------------
 ansible/requirements.yml             |  6 +++---
 ansible/roles/owner/templates/env.j2 |  2 +-
 3 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/ansible/configuration.yml b/ansible/configuration.yml
index 7350afe..2df6b32 100644
--- a/ansible/configuration.yml
+++ b/ansible/configuration.yml
@@ -26,8 +26,8 @@
         name: geerlingguy.security
       vars:
         security_ssh_permit_root_login: "yes"
-        security_autoupdate_enabled: false
-        security_fail2ban_enabled: false
+        security_autoupdate_enabled: "no"
+        security_fail2ban_enabled: "no"
 
     - name: 'Install python docker lib.'
       pip:
@@ -36,16 +36,17 @@
     - import_role:
         name: geerlingguy.docker
 
-    - import_role:
-        name: caddy_ansible.caddy_ansible
-      vars:
-        caddy_config: '{{ lookup("template", "templates/Caddyfile.j2") }}'
-        caddy_update: False
-        caddy_setcap: True
-        caddy_systemd_capabilities_enabled: True
-        caddy_systemd_capabilities: "CAP_NET_BIND_SERVICE"
-      tags:
-        - webserver
+# Temporary disable
+#    - import_role:
+#        name: caddy_ansible.caddy_ansible
+#      vars:
+#        caddy_config: '{{ lookup("template", "templates/Caddyfile.j2") }}'
+#        caddy_update: False
+#        caddy_setcap: True
+#        caddy_systemd_capabilities_enabled: True
+#        caddy_systemd_capabilities: "CAP_NET_BIND_SERVICE"
+#      tags:
+#        - webserver
 
     - import_role:
         name: netdata
diff --git a/ansible/requirements.yml b/ansible/requirements.yml
index e7a38c1..a75ade4 100644
--- a/ansible/requirements.yml
+++ b/ansible/requirements.yml
@@ -1,12 +1,12 @@
 ---
 - src: yatesr.timezone
-  version: 1.1.0
+  version: 1.2.0
 
 - src: geerlingguy.security
-  version: 1.9.0
+  version: 2.2.0
 
 - src: geerlingguy.docker
-  version: 2.6.2
+  version: 5.0.0
 
 - src: caddy_ansible.caddy_ansible
   version: v2.1.1
diff --git a/ansible/roles/owner/templates/env.j2 b/ansible/roles/owner/templates/env.j2
index 4749688..ff0a495 100644
--- a/ansible/roles/owner/templates/env.j2
+++ b/ansible/roles/owner/templates/env.j2
@@ -1,3 +1,3 @@
-{% for name in env_dict.iterkeys() | sort %}
+{% for name in env_dict.keys() | sort %}
 {{ name }}={{ env_dict[name] }}
 {% endfor %}