From 41602db298a3cfb8feebfbcc8e02a237bf585fb2 Mon Sep 17 00:00:00 2001
From: Lars Beckers <lars.beckers@rwth-aachen.de>
Date: Wed, 11 Sep 2019 16:27:43 +0200
Subject: [PATCH] update to latest ansible guidelines
---
apcupsd/tasks/main.yml | 8 ++++++--
branding/tasks/main.yml | 8 +++++---
cups-client/tasks/main.yml | 2 +-
custom-sudoers/handlers/main.yml | 4 ++++
custom-sudoers/tasks/main.yml | 8 ++------
debian-updates/tasks/main.yml | 13 +++----------
6 files changed, 21 insertions(+), 22 deletions(-)
create mode 100644 custom-sudoers/handlers/main.yml
diff --git a/apcupsd/tasks/main.yml b/apcupsd/tasks/main.yml
index f2691e9..fa60a7d 100644
--- a/apcupsd/tasks/main.yml
+++ b/apcupsd/tasks/main.yml
@@ -23,7 +23,9 @@
- usv
- name: gather apcupsd killpower files
- local_action: stat path=apcupsd/killpower/{{ ansible_hostname }}
+ stat:
+ path: "apcupsd/killpower/{{ ansible_hostname }}"
+ delegate_to: localhost
register: killpower
tags:
- usv
@@ -40,7 +42,9 @@
- usv
- name: gather apcupsd onbattery files
- local_action: stat path=apcupsd/onbattery/{{ ansible_hostname }}
+ stat:
+ path: "apcupsd/onbattery/{{ ansible_hostname }}"
+ delegate_to: localhost
register: onbattery
tags:
- usv
diff --git a/branding/tasks/main.yml b/branding/tasks/main.yml
index e0e9aa4..d3e4f98 100644
--- a/branding/tasks/main.yml
+++ b/branding/tasks/main.yml
@@ -10,7 +10,7 @@
mode: '0644'
when:
- branding_motd is defined
- - branding_motd != ""
+ - branding_motd|bool
tags:
- branding
- shell
@@ -24,7 +24,7 @@
mode: '0644'
when:
- branding_issuenet is defined
- - branding_issuenet != ""
+ - branding_issuenet|bool
tags:
- branding
- shell
@@ -67,7 +67,9 @@
- tls
- name: install gpg to install the apt_key
- apt: name=gnupg state=present
+ apt:
+ name: gnupg
+ state: present
tags:
- branding
- repos
diff --git a/cups-client/tasks/main.yml b/cups-client/tasks/main.yml
index a9d1379..4dfe033 100644
--- a/cups-client/tasks/main.yml
+++ b/cups-client/tasks/main.yml
@@ -6,7 +6,7 @@
name:
- cups-client
- cups-bsd
- state: latest
+ state: present
tags:
- cups-client
diff --git a/custom-sudoers/handlers/main.yml b/custom-sudoers/handlers/main.yml
new file mode 100644
index 0000000..651c2a3
--- /dev/null
+++ b/custom-sudoers/handlers/main.yml
@@ -0,0 +1,4 @@
+---
+
+- name: check sudoers
+ command: visudo -q -c -f /etc/sudoers
diff --git a/custom-sudoers/tasks/main.yml b/custom-sudoers/tasks/main.yml
index 7b6fa3e..cbeebe6 100644
--- a/custom-sudoers/tasks/main.yml
+++ b/custom-sudoers/tasks/main.yml
@@ -1,5 +1,4 @@
---
-# file: roles/custom-sudoers/tasks/main.yml
- name: ensure deployment of customized sudoers
template:
@@ -8,10 +7,7 @@
owner: root
group: root
mode: '0440'
- tags:
- - sudo
-
-- name: check whole sudo config
- command: visudo -q -c -f /etc/sudoers
+ notify:
+ - check sudoers
tags:
- sudo
diff --git a/debian-updates/tasks/main.yml b/debian-updates/tasks/main.yml
index 053f02b..481d0c7 100644
--- a/debian-updates/tasks/main.yml
+++ b/debian-updates/tasks/main.yml
@@ -31,22 +31,15 @@
- debian-updates
# https://github.com/ansible/ansible/issues/27699
-- name: ensure git module is able to clone
- command: mount -o remount,exec /tmp
- tags:
- - debian-updates
-
+# https://github.com/ansible/ansible/issues/30064#issuecomment-487149251
- name: ensure git is at the current revision
git:
repo: git@git.fsmpi.rwth-aachen.de:larsb/debian-updates.git
dest: /opt/debian-updates
key_file: /root/.ssh/debian_updates
version: HEAD
- tags:
- - debian-updates
-
-- name: ensure git module is not able to clone anymore
- command: mount -o remount,noexec /tmp
+ environment:
+ TMPDIR: /root/.ansible/tmp
tags:
- debian-updates
--
GitLab