From bb59382d4cb0b6b46521a1132c354e2ec3ff97f3 Mon Sep 17 00:00:00 2001 From: Salt Date: Wed, 17 Jun 2020 09:34:13 -0500 Subject: [PATCH] Remove pull tag Fuck it, we're doing it all --- roles/ansible-pull/templates/ansible-pull.service | 2 +- roles/https/tasks/main.yml | 1 - site.yml | 10 +++++----- webservers.yml | 2 +- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/roles/ansible-pull/templates/ansible-pull.service b/roles/ansible-pull/templates/ansible-pull.service index 44cc873..83a91a5 100644 --- a/roles/ansible-pull/templates/ansible-pull.service +++ b/roles/ansible-pull/templates/ansible-pull.service @@ -7,7 +7,7 @@ User=ansible Group=ansible Type=oneshot Environment=ANSIBLE_CONFIG=~/ansible-pull-repo/ansible-pull.cfg -ExecStart=/usr/local/bin/ansible-pull --tags pull --accept-host-key -U "https://git.9iron.club/salt/ansible" -d "~/ansible-pull-repo" --vault-password-file "~/ansiblevaultpass" site.yml +ExecStart=/usr/local/bin/ansible-pull --accept-host-key -U "https://git.9iron.club/salt/ansible" -d "~/ansible-pull-repo" --vault-password-file "~/ansiblevaultpass" site.yml [Install] WantedBy=multi-user.target diff --git a/roles/https/tasks/main.yml b/roles/https/tasks/main.yml index 114414c..40fbb00 100644 --- a/roles/https/tasks/main.yml +++ b/roles/https/tasks/main.yml @@ -111,4 +111,3 @@ state: reloaded when: com_challenge is changed become: yes - tags: [ pull ] diff --git a/site.yml b/site.yml index 9099ad1..3939594 100755 --- a/site.yml +++ b/site.yml @@ -4,13 +4,13 @@ - hosts: all roles: - role: ansible-pull - tags: [ common, pull ] + tags: [ common ] - role: common - tags: [ common, pull ] + tags: [ common ] - role: zerotier - tags: [ common, zerotier, pull ] + tags: [ common, zerotier ] - role: influxdb - tags: [ common, influxdb, pull ] + tags: [ common, influxdb ] - role: user vars: user_username: salt @@ -25,7 +25,7 @@ 62383065653836366431316461663862393130653761643937376565366435646665313961663534 64303363653631653433343361616635373966326433663466636164613062343561333036613937 35616666633737356331653632323639373330396433366639326466373639313630 - tags: [ common, user, pull ] + tags: [ common, user ] - import_playbook: home.yml - import_playbook: webservers.yml - import_playbook: gameservers.yml diff --git a/webservers.yml b/webservers.yml index ce4d23a..0f9cae9 100644 --- a/webservers.yml +++ b/webservers.yml @@ -9,7 +9,7 @@ - role: backups vars: backups_outdir: "/cold/backups" - tags: [ backups, pull ] + tags: [ backups ] - role: dokuwiki tags: [ web, dokuwiki ] - role: gitea