Rename ssh_keys to root_ssh

playbooks/apollo.yml

@@ -7,5 +7,5 @@
     - common
     - tools
     - sshd
-    - ssh_keys
+    - root_ssh
     - { role: borg-client, backup_host: "borg@vostok.archlinux.org", backup_dir: "/backup/apollo", postgres_backup_dir: "/var/lib/postgres/backup" }

playbooks/orion.yml

@@ -4,15 +4,15 @@
   hosts: orion
   remote_user: root
   roles:
-    - common
-    - tools
-    - sshd
-    - ssh_keys
-    - { role: borg-client, backup_host: "borg@vostok.archlinux.org", backup_dir: "/backup/orion", postgres_backup_dir: None }
-    - { role: opendkim, dkim_selector: orion }
-    - { role: postfix}
-    - archusers
+    - { role: common, tags: ['common'] }
+    - { role: tools, tags: ['tools'] }
+    - { role: sshd, tags: ['sshd'] }
+    - { role: root_ssh, tags: ['root_ssh'] }
+    - { role: borg-client, backup_host: "borg@vostok.archlinux.org", backup_dir: "/backup/orion", postgres_backup_dir: None, tags: ['borg'] }
+    - { role: opendkim, dkim_selector: orion, tags: ['mail'] }
+    - { role: postfix, tags: ['mail'] }
+    - { role: archusers, tags: ['archusers'] }
     - { role: nginx, tags: ["nginx"] }
-    - { role: dbscripts, repos_domain: "repos.archlinux.org" }
-    - sudo
-    - { role: archweb, archweb_home: "/srv/http/archweb" }
+    - { role: dbscripts, repos_domain: "repos.archlinux.org", tags: ['dbscripts', 'archusers'] }
+    - { role: sudo, tags: ['sudo', 'archusers'] }
+    - { role: archweb, archweb_home: "/srv/http/archweb", tags: ['archweb'] }

playbooks/vostok.yml

@@ -7,5 +7,5 @@
     - common
     - tools
     - sshd
-    - ssh_keys
+    - root_ssh
     - { role: borg-server, backup_dir: "/backup", backup_clients: ["orion", "apollo"] }