From 07ea9806da829fcdcf9f970900be5e2f37a690cf Mon Sep 17 00:00:00 2001
From: Salt <rehashedsalt@cock.li>
Date: Sat, 7 Aug 2021 16:55:28 -0500
Subject: [PATCH] Docker goes on everything

---
 inventory/host_vars/dsk-ryzen-0.desu.ltd.yml | 2 ++
 playbooks/desktop.yml                        | 6 ------
 playbooks/game.yml                           | 2 --
 playbooks/pis.yml                            | 2 --
 playbooks/web.yml                            | 6 ------
 site.yml                                     | 2 ++
 6 files changed, 4 insertions(+), 16 deletions(-)
 create mode 100644 inventory/host_vars/dsk-ryzen-0.desu.ltd.yml

diff --git a/inventory/host_vars/dsk-ryzen-0.desu.ltd.yml b/inventory/host_vars/dsk-ryzen-0.desu.ltd.yml
new file mode 100644
index 0000000..20da4b9
--- /dev/null
+++ b/inventory/host_vars/dsk-ryzen-0.desu.ltd.yml
@@ -0,0 +1,2 @@
+# vim:ft=ansible
+docker_apt_repository: "deb https://download.docker.com/linux/ubuntu focal stable"
diff --git a/playbooks/desktop.yml b/playbooks/desktop.yml
index 0264e94..4d15e7d 100755
--- a/playbooks/desktop.yml
+++ b/playbooks/desktop.yml
@@ -37,8 +37,6 @@
       tags: [ desktop, zerotier ]
 - hosts: lap-s76-lemp9-0.desu.ltd
   roles:
-    - role: docker
-      tags: [ desktop, docker, skip-pull ]
     - role: desktop
       vars:
         desktop_apt_keys_url_extra:
@@ -75,10 +73,6 @@
       tags: [ desktop, grub ]
 - hosts: dsk-ryzen-0.desu.ltd
   roles:
-    - role: docker
-      vars:
-        docker_apt_repository: "deb https://download.docker.com/linux/ubuntu focal stable"
-      tags: [ desktop, docker, skip-pull ]
     - role: desktop
       tags: [ desktop, desktop-role ]
 #    - role: grub
diff --git a/playbooks/game.yml b/playbooks/game.yml
index b9be08e..7b4843a 100755
--- a/playbooks/game.yml
+++ b/playbooks/game.yml
@@ -11,8 +11,6 @@
         backup_s3backup_exclude_list_extra:
           - /data/minecraft/valhelsia3/backups
       tags: [ backup ]
-    - role: docker
-      tags: [ docker, skip-pull ]
 - hosts: game1.desu.ltd
   tasks:
     - name: include tasks for gameservers
diff --git a/playbooks/pis.yml b/playbooks/pis.yml
index bd9b242..acb8fa5 100755
--- a/playbooks/pis.yml
+++ b/playbooks/pis.yml
@@ -6,8 +6,6 @@
   roles:
     - role: zerotier
       tags: [ pis, zerotier ]
-    - role: docker
-      tags: [ pis, docker, skip-pull ]
   tasks:
     - name: install basic packages
       apt:
diff --git a/playbooks/web.yml b/playbooks/web.yml
index 54bae26..11a4cb1 100755
--- a/playbooks/web.yml
+++ b/playbooks/web.yml
@@ -47,8 +47,6 @@
           - /var/lib/gitea/log
           - /data/gitea/data/gitea/log
       tags: [ backup ]
-    - role: docker
-      tags: [ web, docker, skip-pull ]
     - role: certbot
       tags: [ web, certbot ]
     - role: php
@@ -127,8 +125,6 @@
         backup_s3backup_list_extra:
           - /data
       tags: [ backup ]
-    - role: docker
-      tags: [ web, docker, skip-pull ]
 - hosts: web3.desu.ltd
   module_defaults:
     docker_container:
@@ -178,5 +174,3 @@
         backup_s3backup_list_extra:
           - /data
       tags: [ backup ]
-    - role: docker
-      tags: [ web, docker, skip-pull ]
diff --git a/site.yml b/site.yml
index a7a0f78..ae6417b 100755
--- a/site.yml
+++ b/site.yml
@@ -8,6 +8,8 @@
       tags: [ common ]
     - role: adminuser
       tags: [ adminuser, common ]
+    - role: docker
+      tags: [ docker, common, skip-pull ]
     - role: motd
       vars:
         motd_watch_services_extra: