From d659f2617efe0d628439bd60606ac867ae12a2ff Mon Sep 17 00:00:00 2001 From: Ubergeek Date: Sat, 15 Dec 2018 22:59:40 +0000 Subject: [PATCH 1/2] Changed to .tilde name servers --- roles/common/tasks/main.yml | 2 +- roles/common/tasks/resolv.yml | 4 ++++ roles/common/tasks/sudoers.yml | 9 --------- roles/common/tasks/users.yml | 6 +----- 4 files changed, 6 insertions(+), 15 deletions(-) create mode 100644 roles/common/tasks/resolv.yml delete mode 100644 roles/common/tasks/sudoers.yml diff --git a/roles/common/tasks/main.yml b/roles/common/tasks/main.yml index 7d8e141b..b88c3865 100644 --- a/roles/common/tasks/main.yml +++ b/roles/common/tasks/main.yml @@ -3,4 +3,4 @@ - include: packages.yml - include: users.yml - #- include: sudoers.yml +- include: resolv.yml diff --git a/roles/common/tasks/resolv.yml b/roles/common/tasks/resolv.yml new file mode 100644 index 00000000..79e6afe7 --- /dev/null +++ b/roles/common/tasks/resolv.yml @@ -0,0 +1,4 @@ +# This will set our resolvers up, to the .tilde tld name servers. +--- +- name: Ensure localsudo in place + copy: src=../files/resolv.conf dest=/etc/resolv.conf diff --git a/roles/common/tasks/sudoers.yml b/roles/common/tasks/sudoers.yml deleted file mode 100644 index df758f58..00000000 --- a/roles/common/tasks/sudoers.yml +++ /dev/null @@ -1,9 +0,0 @@ -# This will create our admin group, and ensure the appropriate users are added to the group ---- -- group: name=sudo state=present - -- name: Ensure localsudo in place - copy: src=../files/localsudo dest=/etc/sudoers.d/localsudo mode=0440 - -- user: name=amcclure groups=admins append=yes -- user: name=ubergeek groups=admins append=yes diff --git a/roles/common/tasks/users.yml b/roles/common/tasks/users.yml index 23ee1cd7..d1a23e5a 100644 --- a/roles/common/tasks/users.yml +++ b/roles/common/tasks/users.yml @@ -1,4 +1,4 @@ -# This creates a user on the system +# This creates our users on the system --- - group: name: tilde @@ -46,7 +46,3 @@ system: no createhome: yes home: /home/ubergeek - - #- user: name=amcclure group=tilde state=present skeleton=/etc/skel shell=/bin/bash system=no createhome=yes home=/home/amcclure - #- user: name=nagalfar group=tilde state=present skeleton=/etc/skel shell=/bin/bash system=no createhome=yes home=/home/nagalfar - #- user: name=ubergeek group tilde state=present skeleton=/etc/skel shell=/bin/bash system=no createhome=yes home=/home/ubergeek From 97ee7933a1eccf007786213beb962f50dea36f8d Mon Sep 17 00:00:00 2001 From: Ubergeek Date: Sat, 15 Dec 2018 23:05:50 +0000 Subject: [PATCH 2/2] FIxed name --- roles/common/tasks/resolv.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/common/tasks/resolv.yml b/roles/common/tasks/resolv.yml index 79e6afe7..7b8550e3 100644 --- a/roles/common/tasks/resolv.yml +++ b/roles/common/tasks/resolv.yml @@ -1,4 +1,4 @@ # This will set our resolvers up, to the .tilde tld name servers. --- -- name: Ensure localsudo in place +- name: Set .tilde systems resolvers copy: src=../files/resolv.conf dest=/etc/resolv.conf