From 6138bf7328a6ab090f8d9eb9ec97d06d05e58708 Mon Sep 17 00:00:00 2001
From: Thomas Schneider <thomas@fsmpi.rwth-aachen.de>
Date: Tue, 28 Nov 2023 15:28:14 +0100
Subject: [PATCH] *: Fix ansible-lint violations
---
desktop/handlers/main.yml | 11 +++++++----
desktop/tasks/main.yml | 8 ++++----
guest-overlay/tasks/main.yml | 5 ++++-
terminalserver/handlers/main.yml | 7 +++----
terminalserver/tasks/main.yml | 10 +++++++---
terminalserver/tasks/x2go.yml | 8 --------
6 files changed, 25 insertions(+), 24 deletions(-)
diff --git a/desktop/handlers/main.yml b/desktop/handlers/main.yml
index 4db8f48..4b75f19 100644
--- a/desktop/handlers/main.yml
+++ b/desktop/handlers/main.yml
@@ -1,11 +1,14 @@
---
-# file: roles/client/handlers/main.yml
- name: update apt cache
- apt: update_cache=yes
+ apt:
+ update_cache: true
- name: restart sddm
- service: name=sddm state=restarted
+ service:
+ name: sddm
+ state: restarted
- name: reload systemd service files
- systemd: daemon_reload=yes
+ systemd:
+ daemon_reload: true
diff --git a/desktop/tasks/main.yml b/desktop/tasks/main.yml
index b3fc49c..480abb9 100644
--- a/desktop/tasks/main.yml
+++ b/desktop/tasks/main.yml
@@ -1,10 +1,10 @@
---
-- include: kde.yml
+- import_tasks: kde.yml
- meta: flush_handlers
-- include: software.yml
+- import_tasks: software.yml
- meta: flush_handlers
-- include: configuration.yml
+- import_tasks: configuration.yml
- meta: flush_handlers
-- include: network.yml
+- import_tasks: network.yml
- meta: flush_handlers
diff --git a/guest-overlay/tasks/main.yml b/guest-overlay/tasks/main.yml
index 8328442..3eb85cd 100644
--- a/guest-overlay/tasks/main.yml
+++ b/guest-overlay/tasks/main.yml
@@ -33,7 +33,10 @@
- guest-overlay
- mount
-- name: ensure the squasfs is created # noqa 301
+- name: ensure the squashfs is created
+ # noqa no-changed-when
+ # This needs to be recreated unconditionally, as we cannot check if anything
+ # has changed.
command:
argv:
- mksquashfs
diff --git a/terminalserver/handlers/main.yml b/terminalserver/handlers/main.yml
index e5466ea..60cf242 100644
--- a/terminalserver/handlers/main.yml
+++ b/terminalserver/handlers/main.yml
@@ -5,7 +5,6 @@
daemon_reload: true
- name: Restart cron
- systemd: name=cron state=restarted
-
-- name: update apt cache
- apt: update_cache=yes
+ systemd:
+ name: cron
+ state: restarted
diff --git a/terminalserver/tasks/main.yml b/terminalserver/tasks/main.yml
index 83ca758..e9542c4 100644
--- a/terminalserver/tasks/main.yml
+++ b/terminalserver/tasks/main.yml
@@ -1,5 +1,4 @@
---
-# file: roles/portal/tasks/main.yml
- name: ensure additional software is installed
apt:
@@ -15,6 +14,9 @@
file:
path: /etc/systemd/system/cron.service.d
state: directory
+ owner: root
+ group: root
+ mode: "0755"
tags:
- config
- cron
@@ -23,6 +25,9 @@
copy:
dest: /etc/systemd/system/cron.service.d/after-network.conf
src: after-network.conf
+ owner: root
+ group: root
+ mode: "0644"
notify:
- Reload systemd
- Restart cron
@@ -30,5 +35,4 @@
- config
- cron
-- include: x2go.yml
-- meta: flush_handlers
+- import_tasks: x2go.yml
diff --git a/terminalserver/tasks/x2go.yml b/terminalserver/tasks/x2go.yml
index b5d8adb..dd10e64 100644
--- a/terminalserver/tasks/x2go.yml
+++ b/terminalserver/tasks/x2go.yml
@@ -18,25 +18,17 @@
apt_repository:
repo: 'deb http://packages.x2go.org/debian {{ debian_version }} main'
state: present
- notify:
- - update apt cache
tags:
- x2go
- repos
-- meta: flush_handlers
-
- name: ensure x2go keyring is installed
apt:
name: x2go-keyring
state: present
- notify:
- - update apt cache
tags:
- x2go
-- meta: flush_handlers
-
- name: ensure x2go server is installed
apt:
name:
--
GitLab