Rename ssh_keys to root_ssh

e138650a · Sven-Hendrik Haase · fb0f9fd0 · e138650a · e138650a · e138650a
Commit e138650a authored 8 years ago by Sven-Hendrik Haase
--- a/playbooks/apollo.yml
+++ b/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" }
--- a/playbooks/orion.yml
+++ b/playbooks/orion.yml
@@ -4,15 +4,15 @@
  hosts: orion
  remote_user: root
  roles:
-    - common
+    - { role: common, tags: ['common'] }
-    - tools
+    - { role: tools, tags: ['tools'] }
-    - sshd
+    - { role: sshd, tags: ['sshd'] }
-    - ssh_keys
+    - { role: root_ssh, tags: ['root_ssh'] }
-    - { role: borg-client, backup_host: "borg@vostok.archlinux.org", backup_dir: "/backup/orion", postgres_backup_dir: None }
+    - { role: borg-client, backup_host: "borg@vostok.archlinux.org", backup_dir: "/backup/orion", postgres_backup_dir: None, tags: ['borg'] }
-    - { role: opendkim, dkim_selector: orion }
+    - { role: opendkim, dkim_selector: orion, tags: ['mail'] }
-    - { role: postfix}
+    - { role: postfix, tags: ['mail'] }
-    - archusers
+    - { role: archusers, tags: ['archusers'] }
    - { role: nginx, tags: ["nginx"] }
-    - { role: dbscripts, repos_domain: "repos.archlinux.org" }
+    - { role: dbscripts, repos_domain: "repos.archlinux.org", tags: ['dbscripts', 'archusers'] }
-    - sudo
+    - { role: sudo, tags: ['sudo', 'archusers'] }
-    - { role: archweb, archweb_home: "/srv/http/archweb" }
+    - { role: archweb, archweb_home: "/srv/http/archweb", tags: ['archweb'] }
--- a/playbooks/vostok.yml
+++ b/playbooks/vostok.yml
@@ -7,5 +7,5 @@
    - common
    - tools
    - sshd
-    - ssh_keys
+    - root_ssh
    - { role: borg-server, backup_dir: "/backup", backup_clients: ["orion", "apollo"] }
--- a/roles/ssh_keys/tasks/main.yml
+++ b/roles/ssh_keys/tasks/main.yml