From ab3937eb2c25bdd02b1635a086ce15c79fb5fa25 Mon Sep 17 00:00:00 2001
From: Ubergeek <ubergeek@yourtilde.com>
Date: Sat, 15 Dec 2018 21:50:12 +0000
Subject: [PATCH] At least down to getting packages installed, and runs

---
 roles/common/tasks/main.yml     |  4 ++--
 roles/common/tasks/packages.yml |  5 ++++-
 roles/common/tasks/users.yml    | 16 +++-------------
 site.yml                        |  5 -----
 4 files changed, 9 insertions(+), 21 deletions(-)

diff --git a/roles/common/tasks/main.yml b/roles/common/tasks/main.yml
index 10193f2a..3daf2518 100644
--- a/roles/common/tasks/main.yml
+++ b/roles/common/tasks/main.yml
@@ -2,5 +2,5 @@
 # This playbook contains all of the common things every machine in the site gets.  Basic packages, users, etc etc.
 
 - include: packages.yml
-- include: users.yml
-- include: sudoers.yml
+  #- include: users.yml
+  #- include: sudoers.yml
diff --git a/roles/common/tasks/packages.yml b/roles/common/tasks/packages.yml
index 16119a6c..a4cf61d0 100644
--- a/roles/common/tasks/packages.yml
+++ b/roles/common/tasks/packages.yml
@@ -1,4 +1,4 @@
-i# Install our baseline packages for all machines, irrespective of what role they might have
+# Install our baseline packages for all machines, irrespective of what role they might have
 ---
 - name: Install baseline packages
   apt: name={{ item }} state=present
@@ -13,3 +13,6 @@ i# Install our baseline packages for all machines, irrespective of what role the
     - rtv
     - lynx
     - w3m-img
+    - python-apt
+    - python
+    - ansible
diff --git a/roles/common/tasks/users.yml b/roles/common/tasks/users.yml
index fa348e90..69628f7f 100644
--- a/roles/common/tasks/users.yml
+++ b/roles/common/tasks/users.yml
@@ -7,16 +7,6 @@
   ignore_errors: yes
 
 - group: name=tilde state=present
-- user: name=amcclure group=tilde state=present shell=/bin/bash system=no createhome=yes home=/home/amcclure
-- user: name=nagalfar group=tilde state=present shell=/bin/bash system=no createhome=yes home=/home/nagalfar
-- user: name=ubergeek group tilde state=present shell=/bin/bash system=no createhome=yes home=/home/ubergeek
-
-      - name: Create Jenkins user
-        user:
-            name: jenkins
-            comment: "Jenkins slave user"
-            system: yes
-            createhome: yes
-            skeleton: /etc/skel
-            home: /data/jenkins
-            shell: /bin/bash
+- 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
diff --git a/site.yml b/site.yml
index 1119d086..e4e795f8 100644
--- a/site.yml
+++ b/site.yml
@@ -1,13 +1,8 @@
 ---
 # This is the overall site playbook.
-
 - name: Baseline Configuration 
   hosts: all
-#  remote_user: ubergeek
   sudo: yes
 
   roles:
     - common
-    - webserver
-    - ssh
-    - db