From 9359a37f3fe2dffdaab220c6fee51d71e67a78a1 Mon Sep 17 00:00:00 2001
From: Markus Hauschild <markus@moepman.eu>
Date: Sat, 26 Mar 2016 14:07:13 +0100
Subject: [PATCH] Rename ldap-client to ldap-pam.

---
 roles/{ldap-client => ldap-pam}/files/mkhomedir        |  0
 roles/{ldap-client => ldap-pam}/handlers/main.yml      |  0
 roles/{ldap-client => ldap-pam}/tasks/main.yml         |  0
 .../{ldap-client => ldap-pam}/templates/nslcd.conf.j2  |  0
 roles/ldap-server/meta/main.yml                        |  4 ----
 site.yml                                               | 10 ++++++++++
 6 files changed, 10 insertions(+), 4 deletions(-)
 rename roles/{ldap-client => ldap-pam}/files/mkhomedir (100%)
 rename roles/{ldap-client => ldap-pam}/handlers/main.yml (100%)
 rename roles/{ldap-client => ldap-pam}/tasks/main.yml (100%)
 rename roles/{ldap-client => ldap-pam}/templates/nslcd.conf.j2 (100%)
 delete mode 100644 roles/ldap-server/meta/main.yml

diff --git a/roles/ldap-client/files/mkhomedir b/roles/ldap-pam/files/mkhomedir
similarity index 100%
rename from roles/ldap-client/files/mkhomedir
rename to roles/ldap-pam/files/mkhomedir
diff --git a/roles/ldap-client/handlers/main.yml b/roles/ldap-pam/handlers/main.yml
similarity index 100%
rename from roles/ldap-client/handlers/main.yml
rename to roles/ldap-pam/handlers/main.yml
diff --git a/roles/ldap-client/tasks/main.yml b/roles/ldap-pam/tasks/main.yml
similarity index 100%
rename from roles/ldap-client/tasks/main.yml
rename to roles/ldap-pam/tasks/main.yml
diff --git a/roles/ldap-client/templates/nslcd.conf.j2 b/roles/ldap-pam/templates/nslcd.conf.j2
similarity index 100%
rename from roles/ldap-client/templates/nslcd.conf.j2
rename to roles/ldap-pam/templates/nslcd.conf.j2
diff --git a/roles/ldap-server/meta/main.yml b/roles/ldap-server/meta/main.yml
deleted file mode 100644
index d665d5c..0000000
--- a/roles/ldap-server/meta/main.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-
-dependencies:
-- { role: common }
diff --git a/site.yml b/site.yml
index 212d355..89f4a4d 100644
--- a/site.yml
+++ b/site.yml
@@ -15,3 +15,13 @@
   hosts: lithium.binary-kitchen.net
   roles:
   - mail
+
+- name: Setup jabber server
+  hosts: carbon.binary-kitchen.net
+  roles:
+  - prosody
+
+- name: Setup member server
+  hosts: oxygen.binary-kitchen.net
+  roles:
+  - ldap-pam