From 7e8f11498d13fac4d840017855b9679deb318c33 Mon Sep 17 00:00:00 2001
From: Andrea Dell'Amico <adellam@sevenseas.org>
Date: Tue, 8 Mar 2016 18:24:04 +0100
Subject: [PATCH] library/roles/redis: Basic playbook that does not touch any
 configuration parameters. library/roles/ssh-keys/tasks/root-ssh-keys.yml: Fix
 a mistake introduced while cleanup things for the Ansible 2 compatibility.

---
 redis/defaults/main.yml          |  7 +++++++
 redis/handlers/main.yml          |  0
 redis/tasks/main.yml             | 19 +++++++++++++++++++
 ssh-keys/tasks/root-ssh-keys.yml |  6 ++----
 4 files changed, 28 insertions(+), 4 deletions(-)
 create mode 100644 redis/defaults/main.yml
 create mode 100644 redis/handlers/main.yml
 create mode 100644 redis/tasks/main.yml

diff --git a/redis/defaults/main.yml b/redis/defaults/main.yml
new file mode 100644
index 00000000..e1f4a8f2
--- /dev/null
+++ b/redis/defaults/main.yml
@@ -0,0 +1,7 @@
+---
+redis_enabled: True
+# https://launchpad.net/~chris-lea/+archive/ubuntu/redis-server
+redis_ppa_repo: ppa:chris-lea/redis-server
+
+redis_server_pkg:
+  - redis-server
diff --git a/redis/handlers/main.yml b/redis/handlers/main.yml
new file mode 100644
index 00000000..e69de29b
diff --git a/redis/tasks/main.yml b/redis/tasks/main.yml
new file mode 100644
index 00000000..687fdcfd
--- /dev/null
+++ b/redis/tasks/main.yml
@@ -0,0 +1,19 @@
+---
+- name: Install the Redis PPA
+  apt_repository: repo='{{ redis_ppa_repo }}' update_cache=yes
+  tags: redis
+
+- name: Install the Redis package
+  apt: pkg={{ item }} state=present
+  with_items: '{{ redis_server_pkg }}'
+  tags: redis
+
+- name: Start and enable the Redis service
+  service: name=redis-server state=started enabled=yes
+  when: redis_enabled
+  tags: redis
+
+- name: Stop and disable the Redis service
+  service: name=redis-server state=stopped enabled=no
+  when: not redis_enabled
+  tags: redis
diff --git a/ssh-keys/tasks/root-ssh-keys.yml b/ssh-keys/tasks/root-ssh-keys.yml
index 39fed3dd..d59d7c74 100644
--- a/ssh-keys/tasks/root-ssh-keys.yml
+++ b/ssh-keys/tasks/root-ssh-keys.yml
@@ -1,13 +1,11 @@
 ---
 - name: Install the ssh keys for the authorized users
   authorized_key: user=root key="{{ item }}" state=present
-  with_items: '{{ root_ssh_keys | default([]) }}'
-  when: manage_root_ssh_keys
+  with_items: '{{ user_ssh_key | default([]) }}'
   tags: [ 'pubkeys', 'ssh_keys' ]
 
 - name: Remove obsolete ssh keys if there are any
   authorized_key: user=root key="{{ item }}" state=absent
-  with_items: '{{ obsolete_root_ssh_keys | default([]) }}'
-  when: obsolete_ssh_key is defined
+  with_items: '{{ obsolete_ssh_key | default([]) }}'
   tags: [ 'pubkeys', 'ssh_keys' ]