From 640f8296d388d4d24d22766028e9dfdfa1d0255e Mon Sep 17 00:00:00 2001 From: Stefan Haun Date: Sat, 12 Dec 2020 23:09:41 +0100 Subject: [PATCH 1/6] Fix linter warnings in main playbook --- main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.yml b/main.yml index 45a5f1e..d78ecf6 100644 --- a/main.yml +++ b/main.yml @@ -18,7 +18,7 @@ - name: Ensure unattended-upgrades is installed and up to date apt: name: unattended-upgrades - state: latest + state: present - name: Setup unattended-upgrades include_role: From ba9f9d0019f208d36d4a469595255ce7303b2849 Mon Sep 17 00:00:00 2001 From: Stefan Haun Date: Sat, 12 Dec 2020 23:09:54 +0100 Subject: [PATCH 2/6] Fix linter warnings in apache role --- roles/apache/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/apache/tasks/main.yml b/roles/apache/tasks/main.yml index 14930b3..b4e280c 100644 --- a/roles/apache/tasks/main.yml +++ b/roles/apache/tasks/main.yml @@ -3,7 +3,7 @@ apt: name: - apache2 - state: latest + state: present - name: Ensure necessary modules are enabled apache2_module: From 892ecb7290c9b6d302ebeec2e3a0a38d090bd13d Mon Sep 17 00:00:00 2001 From: Stefan Haun Date: Sat, 12 Dec 2020 23:10:04 +0100 Subject: [PATCH 3/6] Fix linter warnings in docker_setup --- roles/docker_setup/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/docker_setup/tasks/main.yml b/roles/docker_setup/tasks/main.yml index c61471a..fe3edec 100644 --- a/roles/docker_setup/tasks/main.yml +++ b/roles/docker_setup/tasks/main.yml @@ -75,5 +75,5 @@ name: "{{ item.logname }}" groups: docker append: yes - when: item.docker == true + when: item.docker with_items: "{{ users }}" From bebe3c2e847a86210e6c0188f39288dc9a724eb5 Mon Sep 17 00:00:00 2001 From: Stefan Haun Date: Sat, 12 Dec 2020 23:10:18 +0100 Subject: [PATCH 4/6] Fix linter warnings in users role --- roles/users/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/users/tasks/main.yml b/roles/users/tasks/main.yml index bc29637..ad93bc1 100644 --- a/roles/users/tasks/main.yml +++ b/roles/users/tasks/main.yml @@ -37,7 +37,7 @@ name: "{{ item.logname }}" groups: sudo append: yes - when: item.sudo == true + when: item.sudo with_items: "{{ users }}" - name: Check if /etc/aliases exists From 2e64723ad5a5131c7340d26a47dd2969f002c65d Mon Sep 17 00:00:00 2001 From: Stefan Haun Date: Sat, 12 Dec 2020 23:10:29 +0100 Subject: [PATCH 5/6] Fix linter warningsin setup-http-site-forward role --- roles/setup-http-site-forward/tasks/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/setup-http-site-forward/tasks/main.yml b/roles/setup-http-site-forward/tasks/main.yml index 8d0228d..cac1779 100644 --- a/roles/setup-http-site-forward/tasks/main.yml +++ b/roles/setup-http-site-forward/tasks/main.yml @@ -2,11 +2,11 @@ - name: Add or update Apache2 site template: src: templates/apache-docker-forward-site.j2 - dest: /etc/apache2/sites-available/{{site_name}}.conf + dest: /etc/apache2/sites-available/{{ site_name }}.conf notify: restart apache2 - name: Activate Apache2 site - command: a2ensite {{ site_name}} + command: a2ensite {{ site_name }} args: creates: /etc/apache2/sites-enabled/{{ site_name }}.conf notify: restart apache2 From ffdc1d6c565e045a925fb0cb4788188d608601d4 Mon Sep 17 00:00:00 2001 From: Stefan Haun Date: Sat, 12 Dec 2020 23:10:42 +0100 Subject: [PATCH 6/6] Fix linter warnings in setup-http-site-proxy role --- roles/setup-http-site-proxy/tasks/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/setup-http-site-proxy/tasks/main.yml b/roles/setup-http-site-proxy/tasks/main.yml index 70f5f5c..6aeff36 100644 --- a/roles/setup-http-site-proxy/tasks/main.yml +++ b/roles/setup-http-site-proxy/tasks/main.yml @@ -2,11 +2,11 @@ - name: Add or update Apache2 site template: src: templates/apache-docker-proxy-site.j2 - dest: /etc/apache2/sites-available/{{site_name}}.conf + dest: /etc/apache2/sites-available/{{ site_name }}.conf notify: restart apache2 - name: Activate Apache2 site - command: a2ensite {{ site_name}} + command: a2ensite {{ site_name }} args: creates: /etc/apache2/sites-enabled/{{ site_name }}.conf notify: restart apache2