From 1bcd24a4c19c626975e7a6555630216b8e69b3df Mon Sep 17 00:00:00 2001 From: Jeremy Lecour Date: Wed, 9 Aug 2017 00:24:12 -0400 Subject: [PATCH] admin-users: remove openbsd mentions --- admin-users/tasks/{debian/main.yml => admin_user.yml} | 0 admin-users/tasks/main.yml | 8 ++------ admin-users/tasks/{debian => }/profile.yml | 0 admin-users/tasks/{debian => }/ssh.yml | 0 admin-users/tasks/{debian => }/sudo.yml | 0 admin-users/tasks/{debian => }/user.yml | 0 6 files changed, 2 insertions(+), 6 deletions(-) rename admin-users/tasks/{debian/main.yml => admin_user.yml} (100%) rename admin-users/tasks/{debian => }/profile.yml (100%) rename admin-users/tasks/{debian => }/ssh.yml (100%) rename admin-users/tasks/{debian => }/sudo.yml (100%) rename admin-users/tasks/{debian => }/user.yml (100%) diff --git a/admin-users/tasks/debian/main.yml b/admin-users/tasks/admin_user.yml similarity index 100% rename from admin-users/tasks/debian/main.yml rename to admin-users/tasks/admin_user.yml diff --git a/admin-users/tasks/main.yml b/admin-users/tasks/main.yml index 54e2fc53..c7eeaf39 100644 --- a/admin-users/tasks/main.yml +++ b/admin-users/tasks/main.yml @@ -4,12 +4,8 @@ msg: "Warning: empty 'admin_users' variable, tasks will be skipped!" when: admin_users == {} -- include: debian/main.yml +- include: admin_user.yml vars: user: "{{ item.value }}" with_dict: "{{ admin_users }}" - when: ansible_distribution == "Debian" and admin_users != {} - -# - include: openbsd/main.yml user={{ item.value }} -# with_dict: "{{ admin_users }}" -# when: ansible_distribution == "OpenBSD" and admin_users != {} + when: admin_users != {} diff --git a/admin-users/tasks/debian/profile.yml b/admin-users/tasks/profile.yml similarity index 100% rename from admin-users/tasks/debian/profile.yml rename to admin-users/tasks/profile.yml diff --git a/admin-users/tasks/debian/ssh.yml b/admin-users/tasks/ssh.yml similarity index 100% rename from admin-users/tasks/debian/ssh.yml rename to admin-users/tasks/ssh.yml diff --git a/admin-users/tasks/debian/sudo.yml b/admin-users/tasks/sudo.yml similarity index 100% rename from admin-users/tasks/debian/sudo.yml rename to admin-users/tasks/sudo.yml diff --git a/admin-users/tasks/debian/user.yml b/admin-users/tasks/user.yml similarity index 100% rename from admin-users/tasks/debian/user.yml rename to admin-users/tasks/user.yml