From bf7bb4387ce843b201baf6e79c9a375757cf30d4 Mon Sep 17 00:00:00 2001
From: Adar Nimrod <nimrod@shore.co.il>
Date: Thu, 6 Jul 2017 18:43:59 +0300
Subject: [PATCH] - Cleaner OpenBSD package installation.
---
tasks/main.yml | 5 -----
tasks/sudo.yml | 2 +-
vars/main.yml | 5 -----
3 files changed, 1 insertion(+), 11 deletions(-)
diff --git a/tasks/main.yml b/tasks/main.yml
index a534b62..1211723 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -10,11 +10,6 @@
- users_use_sudo in [ True, False ]
- users_prune in [ True, False ]
# OpenBSD 5.7 was the last version that came with sudo installed.
- - >
- ansible_os_family != 'OpenBSD' or
- ansible_distribution_version|version_compare('5.7', '<=') or
- ansible_distribution_version in users_sudo_pkg or
- not users_use_sudo
- include: sudo.yml
when: users_use_sudo
diff --git a/tasks/sudo.yml b/tasks/sudo.yml
index 89e4c9f..623da82 100644
--- a/tasks/sudo.yml
+++ b/tasks/sudo.yml
@@ -11,7 +11,7 @@
- name: pkg install sudo
when: ansible_pkg_mgr == 'openbsd_pkg' and ansible_distribution_version|version_compare('5.7', '>')
openbsd_pkg:
- name: '{{ users_sudo_pkg[ansible_distribution_version] }}'
+ name: sudo%1.8
state: present
- name: Create sudoers.d directory
diff --git a/vars/main.yml b/vars/main.yml
index c51737e..2bfeb22 100644
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -8,11 +8,6 @@ aliases_file:
OpenBSD: /etc/mail/aliases
Debian: /etc/aliases
-users_sudo_pkg:
- '5.8': sudo-1.8.14.3
- '5.9': sudo-1.8.15
- '6.0': sudo-1.8.17.1
-
users_unique_groups: '{{ users|selectattr("groups", "defined")|sum(attribute="groups", start=[])|list|unique }}'
users_sudo_group: "{{ 'wheel' if ansible_os_family == 'OpenBSD' else 'sudo' }}"
--
GitLab