From f9c579d68330c67d4872ce4acfa93341bf7232d9 Mon Sep 17 00:00:00 2001
From: Lars Beckers <lars.beckers@rwth-aachen.de>
Date: Thu, 8 Aug 2019 00:30:08 +0200
Subject: [PATCH] fix linter errors
---
client/tasks/configuration.yml | 2 --
client/tasks/kde.yml | 1 -
client/tasks/network.yml | 4 ++--
guest-overlay/tasks/main.yml | 5 ++---
pyxtrlock/handlers/main.yml | 11 +++++++++++
pyxtrlock/tasks/main.yml | 18 +++++-------------
terminalserver/handlers/main.yml | 3 ++-
terminalserver/tasks/x2go.yml | 5 +++--
8 files changed, 25 insertions(+), 24 deletions(-)
create mode 100644 pyxtrlock/handlers/main.yml
diff --git a/client/tasks/configuration.yml b/client/tasks/configuration.yml
index c00ff97..eef6b96 100644
--- a/client/tasks/configuration.yml
+++ b/client/tasks/configuration.yml
@@ -1,8 +1,6 @@
---
-# file: roles/client/tasks/desktop.yml
- name: ensure i3 is able to lock the screen
- # copy: src=i3lock dest=/usr/local/bin/i3lock owner=root group=root mode=0755
file:
src: /usr/lib/x86_64-linux-gnu/libexec/kscreenlocker_greet
dest: /usr/local/bin/i3lock
diff --git a/client/tasks/kde.yml b/client/tasks/kde.yml
index 6a67e10..371bfc2 100644
--- a/client/tasks/kde.yml
+++ b/client/tasks/kde.yml
@@ -1,5 +1,4 @@
---
-# file: roles/client/tasks/kde.yml
- name: ensure reasonable subset of kde-baseapps is installed
apt:
diff --git a/client/tasks/network.yml b/client/tasks/network.yml
index a6e1c45..5836e3e 100644
--- a/client/tasks/network.yml
+++ b/client/tasks/network.yml
@@ -6,7 +6,7 @@
state: directory
owner: root
group: root
- mode: '0644'
+ mode: '0755'
- name: ensure ansible's copy module does not bullshit us (pt2)
file:
@@ -14,7 +14,7 @@
state: directory
owner: root
group: root
- mode: '0644'
+ mode: '0755'
- name: ensure sddm waits for network to be online
copy:
diff --git a/guest-overlay/tasks/main.yml b/guest-overlay/tasks/main.yml
index 69bdc96..d493dc2 100644
--- a/guest-overlay/tasks/main.yml
+++ b/guest-overlay/tasks/main.yml
@@ -1,5 +1,4 @@
---
-# file: main.yml
- name: ensure we have our guest group
group:
@@ -46,11 +45,11 @@
- guest-overlay
- mount
-- name: ensure the squasfs is created
+- name: ensure the squasfs is created # noqa 301
# yamllint disable-line rule:line-length
command: mksquashfs "{{ role_path }}/files/provision" "{{ role_path }}/files/provision.squashfs" -force-uid 1000 -force-gid 1000
+ delegate_to: localhost
run_once: true
- delegate_to: 'localhost'
tags:
- guest-overlay
- squashfs
diff --git a/pyxtrlock/handlers/main.yml b/pyxtrlock/handlers/main.yml
new file mode 100644
index 0000000..dbb3664
--- /dev/null
+++ b/pyxtrlock/handlers/main.yml
@@ -0,0 +1,11 @@
+---
+
+- name: remove pyxtrlock mouse symbol
+ command: ../bin/python make_empty_lock.py
+ args:
+ chdir: /opt/pyxtrlock/pyxtrlock
+
+- name: setup pyxtrlock
+ command: ../bin/python setup.py install
+ args:
+ chdir: /opt/pyxtrlock/pyxtrlock
diff --git a/pyxtrlock/tasks/main.yml b/pyxtrlock/tasks/main.yml
index c959382..34ae6c5 100644
--- a/pyxtrlock/tasks/main.yml
+++ b/pyxtrlock/tasks/main.yml
@@ -1,5 +1,4 @@
---
-# file: roles/client/tasks/pyxtrlock.yml
- name: ensure we got some virtualenv
pip:
@@ -9,6 +8,8 @@
with_items:
- simplepam
- pyxdg
+ notify:
+ - setup pyxtrlock
tags: pyxtrlock
- name: ensure we got a copy of pyxtrlock
@@ -16,16 +17,7 @@
repo: git://github.com/leonnnn/pyxtrlock.git
dest: /opt/pyxtrlock/pyxtrlock
accept_hostkey: true
- tags: pyxtrlock
-
-- name: ensure there is no mouse symbol
- command: ../bin/python make_empty_lock.py
- args:
- chdir: /opt/pyxtrlock/pyxtrlock
- tags: pyxtrlock
-
-- name: ensure setup of pyxtrlock
- command: ../bin/python setup.py install
- args:
- chdir: /opt/pyxtrlock/pyxtrlock
+ notify:
+ - remove pyxtrlock mouse symbol
+ - setup pyxtrlock
tags: pyxtrlock
diff --git a/terminalserver/handlers/main.yml b/terminalserver/handlers/main.yml
index 327005c..e5466ea 100644
--- a/terminalserver/handlers/main.yml
+++ b/terminalserver/handlers/main.yml
@@ -1,7 +1,8 @@
---
- name: Reload systemd
- systemd: daemon-reload=yes
+ systemd:
+ daemon_reload: true
- name: Restart cron
systemd: name=cron state=restarted
diff --git a/terminalserver/tasks/x2go.yml b/terminalserver/tasks/x2go.yml
index 526ac99..eb98469 100644
--- a/terminalserver/tasks/x2go.yml
+++ b/terminalserver/tasks/x2go.yml
@@ -1,18 +1,19 @@
---
-# file: roles/portal/tasks/x2go.yml
- name: ensure apt key for x2go is present
apt_key:
keyserver: keys.gnupg.net
id: E1F958385BFE2B6E
state: present
+ notify:
+ - update apt cache
tags:
- x2go
- repos
- name: ensure repository for x2go is in apt sources
apt_repository:
- repo: 'deb http://packages.x2go.org/debian {{debian_version}} main'
+ repo: 'deb http://packages.x2go.org/debian {{ debian_version }} main'
state: present
notify:
- update apt cache
--
GitLab