From 62ea91fc7f82f560dc39f2302d79dc494da21bb7 Mon Sep 17 00:00:00 2001
From: Salt <rehashedsalt@cock.li>
Date: Wed, 17 Jun 2020 09:26:13 -0500
Subject: [PATCH] Remove all references to ansiblehost

---
 ansiblehost-config.cfg                   |  8 --------
 ansiblehosts.yml                         |  7 -------
 roles/ansiblehost/defaults/main.yml      |  2 --
 roles/ansiblehost/files/ansiblevaultpass |  6 ------
 roles/ansiblehost/meta/main.yml          |  4 ----
 roles/ansiblehost/tasks/main.yml         | 23 -----------------------
 site.yml                                 | 11 +++++------
 7 files changed, 5 insertions(+), 56 deletions(-)
 delete mode 100644 ansiblehost-config.cfg
 delete mode 100644 ansiblehosts.yml
 delete mode 100644 roles/ansiblehost/defaults/main.yml
 delete mode 100644 roles/ansiblehost/files/ansiblevaultpass
 delete mode 100644 roles/ansiblehost/meta/main.yml
 delete mode 100644 roles/ansiblehost/tasks/main.yml

diff --git a/ansiblehost-config.cfg b/ansiblehost-config.cfg
deleted file mode 100644
index 4a86d60..0000000
--- a/ansiblehost-config.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-[defaults]
-inventory = inventory
-private_key_file = ~/.ssh/ansible
-ssh_extra_args =-o ForwardAgent=yes -o StrictHostKeyChecking=no
-host_key_checking = false
-deprecation_warnings = false
-pipelining = true
-interpreter_python = python3
diff --git a/ansiblehosts.yml b/ansiblehosts.yml
deleted file mode 100644
index e5aa220..0000000
--- a/ansiblehosts.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env ansible-playbook
-# vim:ft=ansible:
----
-- hosts: ansiblehosts
-  roles:
-    - role: ansiblehost
-      tags: [ ansiblehost ]
diff --git a/roles/ansiblehost/defaults/main.yml b/roles/ansiblehost/defaults/main.yml
deleted file mode 100644
index 901eccf..0000000
--- a/roles/ansiblehost/defaults/main.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-# vim:ft=ansible:
-pullplaybook: "site.yml"
diff --git a/roles/ansiblehost/files/ansiblevaultpass b/roles/ansiblehost/files/ansiblevaultpass
deleted file mode 100644
index 0131d94..0000000
--- a/roles/ansiblehost/files/ansiblevaultpass
+++ /dev/null
@@ -1,6 +0,0 @@
-$ANSIBLE_VAULT;1.1;AES256
-31383561303637303735386663306631333063623336643030643634333262336664363461613239
-6230623439393465656161663432393732633662383833640a373433343236353835363130653937
-31346233663237383666306536633962613534623735366531666561656335393964316230633161
-3930636537313364380a376432363431346636363565383734613638316161643036623636656532
-66333038393738663464343534633766643734393165626538633962376161376262
diff --git a/roles/ansiblehost/meta/main.yml b/roles/ansiblehost/meta/main.yml
deleted file mode 100644
index 1d4df6d..0000000
--- a/roles/ansiblehost/meta/main.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-allow_duplicates: no
-dependencies:
-  - role: localansible
diff --git a/roles/ansiblehost/tasks/main.yml b/roles/ansiblehost/tasks/main.yml
deleted file mode 100644
index a30df63..0000000
--- a/roles/ansiblehost/tasks/main.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/usr/bin/ansible-playbook
-# vim:ft=ansible:
----
-- name: Set up system for Ansible
-  block:
-  - name: Copy Ansible password file
-    copy:
-      src: ansiblevaultpass
-      dest: /root/ansiblevaultpass
-      mode: "0600"
-  - name: Create system copy of Ansible repo
-    git:
-      repo: "https://git.9iron.club/salt/ansible"
-      dest: /opt/ansible-repo
-      update: yes
-  - name: Set up pull and run cronjob
-    cron:
-      minute: "0"
-      hour: "*/12"
-      name: ansible-pull
-      job: "cd /opt/ansible-repo && ANSIBLE_CONFIG=/opt/ansible-repo/ansiblehost-config.cfg HOME=/root /usr/local/bin/ansible-playbook \"{{ pullplaybook }}\" --vault-password-file /root/ansiblevaultpass > /var/log/ansible-pull.log 2>&1"
-      disabled: yes
-  become: true
diff --git a/site.yml b/site.yml
index 1e1822b..9099ad1 100755
--- a/site.yml
+++ b/site.yml
@@ -4,13 +4,13 @@
 - hosts: all
   roles:
     - role: ansible-pull
-      tags: [ common ]
+      tags: [ common, pull ]
     - role: common
-      tags: [ common ]
+      tags: [ common, pull ]
     - role: zerotier
-      tags: [ common, zerotier ]
+      tags: [ common, zerotier, pull ]
     - role: influxdb
-      tags: [ common, influxdb ]
+      tags: [ common, influxdb, pull ]
     - role: user
       vars:
         user_username: salt
@@ -25,8 +25,7 @@
                 62383065653836366431316461663862393130653761643937376565366435646665313961663534
                 64303363653631653433343361616635373966326433663466636164613062343561333036613937
                 35616666633737356331653632323639373330396433366639326466373639313630
-      tags: [ common, user ]
+      tags: [ common, user, pull ]
 - import_playbook: home.yml
 - import_playbook: webservers.yml
 - import_playbook: gameservers.yml
-- import_playbook: ansiblehosts.yml