From e138650a0f524a9c25cb77db78353585ff9434c2 Mon Sep 17 00:00:00 2001
From: Sven-Hendrik Haase <svenstaro@gmail.com>
Date: Sat, 18 Jun 2016 00:22:32 +0200
Subject: [PATCH] Rename ssh_keys to root_ssh
---
playbooks/apollo.yml | 2 +-
playbooks/orion.yml | 22 ++++++++++-----------
playbooks/vostok.yml | 2 +-
roles/{ssh_keys => root_ssh}/tasks/main.yml | 0
4 files changed, 13 insertions(+), 13 deletions(-)
rename roles/{ssh_keys => root_ssh}/tasks/main.yml (100%)
diff --git a/playbooks/apollo.yml b/playbooks/apollo.yml
index b42303fc1..6ec64faee 100644
--- 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" }
diff --git a/playbooks/orion.yml b/playbooks/orion.yml
index e1cac193f..952160a13 100644
--- a/playbooks/orion.yml
+++ b/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'] }
diff --git a/playbooks/vostok.yml b/playbooks/vostok.yml
index 80c48393a..bac0362fe 100644
--- 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"] }
diff --git a/roles/ssh_keys/tasks/main.yml b/roles/root_ssh/tasks/main.yml
similarity index 100%
rename from roles/ssh_keys/tasks/main.yml
rename to roles/root_ssh/tasks/main.yml
--
GitLab