From 668fe20fac2c68a3b34ba7b5e500b900557c0b5c Mon Sep 17 00:00:00 2001
From: Salt <rehashedsalt@cock.li>
Date: Sat, 17 Oct 2020 01:11:35 -0500
Subject: [PATCH] Work on more basic shit, should really squash these commits
 later

---
 roles/ansible-pull/tasks/main.yml                 | 2 ++
 roles/ansible-pull/templates/ansible-pull.service | 2 +-
 roles/common/tasks/packages.yml                   | 5 +++++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/roles/ansible-pull/tasks/main.yml b/roles/ansible-pull/tasks/main.yml
index d7ce701..e2c1ea5 100644
--- a/roles/ansible-pull/tasks/main.yml
+++ b/roles/ansible-pull/tasks/main.yml
@@ -6,6 +6,8 @@
       copy: src=vaultpass dest="~/ansiblevaultpass" mode="0600"
       become: yes
       become_user: ansible
+    - name: install ansible
+      pip: name=ansible,ansible-base,ansible-lint state=latest
     - name: configure systemd service
       template: src=ansible-pull.service dest=/etc/systemd/system/ansible-pull.service
       notify: restart ansiblepull timer
diff --git a/roles/ansible-pull/templates/ansible-pull.service b/roles/ansible-pull/templates/ansible-pull.service
index 92e9928..7b5bc19 100644
--- a/roles/ansible-pull/templates/ansible-pull.service
+++ b/roles/ansible-pull/templates/ansible-pull.service
@@ -8,7 +8,7 @@ StartLimitBurst=5
 User=ansible
 Group=ansible
 Environment=ANSIBLE_CONFIG=~/ansible-pull-repo/ansible-pull.cfg
-ExecStart=/usr/local/bin/ansible-pull --accept-host-key -U "{{ ansible_pull_repo }}" -d "~/ansible-pull-repo" --vault-password-file "~/ansiblevaultpass" "{{ ansible_pull_playbook }}"
+ExecStart=/usr/local/bin/ansible-pull --accept-host-key -U "{{ ansible_pull_repo }}" -C "{{ ansible_pull_commit }}" -d "~/ansible-pull-repo" --vault-password-file "~/ansiblevaultpass" "{{ ansible_pull_playbook }}"
 Restart=on-failure
 RestartSec=90
 
diff --git a/roles/common/tasks/packages.yml b/roles/common/tasks/packages.yml
index 00a3097..5da20c6 100644
--- a/roles/common/tasks/packages.yml
+++ b/roles/common/tasks/packages.yml
@@ -17,6 +17,11 @@
           - openssh-server
           - pwgen
           - python3-apt
+          - python3-boto
+          - python3-boto3
+          - python3-botocore
+          - python3-pip
+          - python3-setuptools
           - screen
           - vim
           - whois