From 1e136e37362a66490e42ee9003e1adb51838018f Mon Sep 17 00:00:00 2001 From: Otthorn Date: Sun, 7 Feb 2021 17:31:21 +0100 Subject: [PATCH 1/5] Remove rules from warn list when it is not needed --- .ansible-lint | 2 -- roles/{debian-backports => debian_backports}/tasks/main.yml | 0 .../templates/backports.list.j2 | 0 3 files changed, 2 deletions(-) rename roles/{debian-backports => debian_backports}/tasks/main.yml (100%) rename roles/{debian-backports => debian_backports}/templates/backports.list.j2 (100%) diff --git a/.ansible-lint b/.ansible-lint index a85e701..3f851df 100644 --- a/.ansible-lint +++ b/.ansible-lint @@ -2,6 +2,4 @@ skip_list: - '301' warn_list: - - '305' # Use shell only when shell functionality is required - - '503' # Tasks that run when changed should likely be handlers - experimental # all rules tagged as experimental diff --git a/roles/debian-backports/tasks/main.yml b/roles/debian_backports/tasks/main.yml similarity index 100% rename from roles/debian-backports/tasks/main.yml rename to roles/debian_backports/tasks/main.yml diff --git a/roles/debian-backports/templates/backports.list.j2 b/roles/debian_backports/templates/backports.list.j2 similarity index 100% rename from roles/debian-backports/templates/backports.list.j2 rename to roles/debian_backports/templates/backports.list.j2 From 83cdd60e27f0f39d8e2292b7b0ebac318a06155d Mon Sep 17 00:00:00 2001 From: Otthorn Date: Sun, 7 Feb 2021 17:32:02 +0100 Subject: [PATCH 2/5] Ansible-lint every file, not just playbooks --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 416e400..58679a2 100644 --- a/.drone.yml +++ b/.drone.yml @@ -15,5 +15,5 @@ steps: commands: - apk add --no-cache gcc libc-dev libffi-dev openssl-dev - pip install ansible-lint==4.3.7 - - ansible-lint *.yml + - ansible-lint ... From 679daa633ff33e3cb7c6eb5be5be9032d603d219 Mon Sep 17 00:00:00 2001 From: Otthorn Date: Sun, 7 Feb 2021 17:32:44 +0100 Subject: [PATCH 3/5] Fix ansible lint --- roles/isc_dhcp_server/handlers/main.yml | 2 +- roles/isc_dhcp_server/tasks/main.yml | 2 +- roles/radius/tasks/main.yml | 7 +++---- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/roles/isc_dhcp_server/handlers/main.yml b/roles/isc_dhcp_server/handlers/main.yml index 05b48c6..fd4dd48 100644 --- a/roles/isc_dhcp_server/handlers/main.yml +++ b/roles/isc_dhcp_server/handlers/main.yml @@ -1,6 +1,6 @@ --- - name: force run dhcp re2o-service - shell: /var/local/re2o-services/dhcp/main.py --force + command: /var/local/re2o-services/dhcp/main.py --force become_user: re2o-services - name: restart dhcpd diff --git a/roles/isc_dhcp_server/tasks/main.yml b/roles/isc_dhcp_server/tasks/main.yml index 57d2d25..02fdb75 100644 --- a/roles/isc_dhcp_server/tasks/main.yml +++ b/roles/isc_dhcp_server/tasks/main.yml @@ -18,7 +18,7 @@ owner: re2o-services group: nogroup recurse: true - mode: 755 + mode: 0755 - name: Install isc-dhcp-server apt: diff --git a/roles/radius/tasks/main.yml b/roles/radius/tasks/main.yml index 941f7c9..303a86f 100644 --- a/roles/radius/tasks/main.yml +++ b/roles/radius/tasks/main.yml @@ -106,12 +106,11 @@ - name: Install radius requirements (except freeradius-python3) shell: - cmd: "{{ item }}" + cmd: "cat apt_requirements_radius.txt | grep -v freeradius-python3 | xargs apt-get -y install" chdir: /var/www/re2o/ - loop: - - "cat apt_requirements_radius.txt | grep -v freeradius-python3 | xargs apt-get -y install" - - "pip3 install -r pip_requirements.txt" +- name: Install PyPi requirements for radius + command: "pip3 install -r /var/www/re2o/pip_requirements.txt" # End of hideousness (hopefully). From e6b853a552051a43c739ed8a0e78d332ba5e79ec Mon Sep 17 00:00:00 2001 From: Otthorn Date: Sun, 7 Feb 2021 17:33:29 +0100 Subject: [PATCH 4/5] fix role name --- roles/{re2o-service => re2o_service}/defaults/main.yml | 0 roles/{re2o-service => re2o_service}/tasks/main.yml | 0 roles/{re2o-service => re2o_service}/tasks/service_user.yml | 0 .../templates/update-motd.d/05-service.j2 | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename roles/{re2o-service => re2o_service}/defaults/main.yml (100%) rename roles/{re2o-service => re2o_service}/tasks/main.yml (100%) rename roles/{re2o-service => re2o_service}/tasks/service_user.yml (100%) rename roles/{re2o-service => re2o_service}/templates/update-motd.d/05-service.j2 (100%) diff --git a/roles/re2o-service/defaults/main.yml b/roles/re2o_service/defaults/main.yml similarity index 100% rename from roles/re2o-service/defaults/main.yml rename to roles/re2o_service/defaults/main.yml diff --git a/roles/re2o-service/tasks/main.yml b/roles/re2o_service/tasks/main.yml similarity index 100% rename from roles/re2o-service/tasks/main.yml rename to roles/re2o_service/tasks/main.yml diff --git a/roles/re2o-service/tasks/service_user.yml b/roles/re2o_service/tasks/service_user.yml similarity index 100% rename from roles/re2o-service/tasks/service_user.yml rename to roles/re2o_service/tasks/service_user.yml diff --git a/roles/re2o-service/templates/update-motd.d/05-service.j2 b/roles/re2o_service/templates/update-motd.d/05-service.j2 similarity index 100% rename from roles/re2o-service/templates/update-motd.d/05-service.j2 rename to roles/re2o_service/templates/update-motd.d/05-service.j2 From faf5fc736297b524440457f0fbfa8dff4b59f19e Mon Sep 17 00:00:00 2001 From: Otthorn Date: Sun, 7 Feb 2021 17:39:04 +0100 Subject: [PATCH 5/5] fix re2o-service -> re2o_service role name --- network.yml | 4 ++-- roles/isc_dhcp_server/tasks/main.yml | 2 +- roles/router/tasks/main.yml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/network.yml b/network.yml index e64d8ff..50fde19 100755 --- a/network.yml +++ b/network.yml @@ -43,7 +43,7 @@ # username: service-user # password: "{{ vault_serviceuser_passwd }}" # roles: -# - re2o-service +# - re2o_service # Deploy Unifi Controller @@ -62,4 +62,4 @@ # username: service-user # password: "{{ vault_serviceuser_passwd }}" # roles: -# - re2o-service +# - re2o_service diff --git a/roles/isc_dhcp_server/tasks/main.yml b/roles/isc_dhcp_server/tasks/main.yml index 02fdb75..9d69d63 100644 --- a/roles/isc_dhcp_server/tasks/main.yml +++ b/roles/isc_dhcp_server/tasks/main.yml @@ -1,7 +1,7 @@ --- - name: Install dhcp (re2o-service) import_role: - name: re2o-service + name: re2o_service vars: service_repo: https://gitlab.federez.net/re2o/dhcp.git service_name: dhcp diff --git a/roles/router/tasks/main.yml b/roles/router/tasks/main.yml index cfbf28e..87b0086 100644 --- a/roles/router/tasks/main.yml +++ b/roles/router/tasks/main.yml @@ -40,7 +40,7 @@ - name: Install aurore-firewall (re2o-service) import_role: - name: re2o-service + name: re2o_service vars: service_repo: https://gitea.auro.re/Aurore/aurore-firewall.git service_name: aurore-firewall