From 080bece1339d4264a558966c55b093101ec1dd70 Mon Sep 17 00:00:00 2001
From: Sven-Hendrik Haase <svenstaro@gmail.com>
Date: Thu, 10 Oct 2019 23:32:05 +0200
Subject: [PATCH] Get rid of ldap.archlinux.org in favor keycloak.archlinux.org

---
 archlinux.tf                                  | 15 -----
 roles/keycloak/tasks/main.yml                 | 18 ++++++
 .../templates/archlinux.inf.j2                |  0
 roles/ldap/tasks/main.yml                     | 59 -------------------
 4 files changed, 18 insertions(+), 74 deletions(-)
 create mode 100644 roles/keycloak/tasks/main.yml
 rename roles/{ldap => keycloak}/templates/archlinux.inf.j2 (100%)
 delete mode 100644 roles/ldap/tasks/main.yml

diff --git a/archlinux.tf b/archlinux.tf
index 04acfdff..9e1dd047 100644
--- a/archlinux.tf
+++ b/archlinux.tf
@@ -76,21 +76,6 @@ resource "hcloud_server" "gitlab" {
   }
 }
 
-resource "hcloud_rdns" "ldap" {
-  server_id  = "${hcloud_server.ldap.id}"
-  ip_address = "${hcloud_server.ldap.ipv4_address}"
-  dns_ptr    = "ldap.archlinux.org"
-}
-
-resource "hcloud_server" "ldap" {
-  name        = "ldap.archlinux.org"
-  image       = "${data.hcloud_image.archlinux.id}"
-  server_type = "cx11"
-  lifecycle {
-    ignore_changes = [image]
-  }
-}
-
 resource "hcloud_rdns" "matrix" {
   server_id  = "${hcloud_server.matrix.id}"
   ip_address = "${hcloud_server.matrix.ipv4_address}"
diff --git a/roles/keycloak/tasks/main.yml b/roles/keycloak/tasks/main.yml
new file mode 100644
index 00000000..4423a20c
--- /dev/null
+++ b/roles/keycloak/tasks/main.yml
@@ -0,0 +1,18 @@
+---
+
+- name: install keycloak
+  pacman: name=keycloak state=present
+
+# - name: start dirsrv service
+#   service: name=dirsrv 
+#   Levente TODO
+
+# - name: open firewall hole
+#   firewalld: port={{ item }} permanent=true state=enabled immediate=yes
+#   when: configure_firewall
+#   with_items:
+#   Levente TODO
+#     - 389
+#     - 636
+#   tags:
+#     - firewall
diff --git a/roles/ldap/templates/archlinux.inf.j2 b/roles/keycloak/templates/archlinux.inf.j2
similarity index 100%
rename from roles/ldap/templates/archlinux.inf.j2
rename to roles/keycloak/templates/archlinux.inf.j2
diff --git a/roles/ldap/tasks/main.yml b/roles/ldap/tasks/main.yml
deleted file mode 100644
index 470ca73f..00000000
--- a/roles/ldap/tasks/main.yml
+++ /dev/null
@@ -1,59 +0,0 @@
----
-
-- name: install ldap
-  pacman: name=389-ds-base,python-lib389 state=present
-
-# - name: start dirsrv service
-#   service: name=dirsrv 
-
-- name: create parent entry categories
-  ldap_entry:
-    dn: ou={{item}},dc=archlinux,dc=org
-    objectClass:
-      - top
-      - organizationalUnit
-    attributes:
-      ou: {{item}}
-  with_items:
-    - users
-    - groups
-
-- name: create user entries
-  ldap_entry:
-    dn: uid={{item.key}},ou=users,dc=archlinux,dc=org
-    objectClass:
-      - top
-      - person
-      - inetOrgPerson
-      - organizationalPerson
-      - posixAccount
-    attributes:
-      uid: {{item.key}}
-      givenName: {{item.value.name}}
-  with_dict: "{{ arch_users }}"
-
-- name: create group entries
-  ldap_entry:
-    dn: cn={{item}},ou=groups,dc=archlinux,dc=org
-    objectClass:
-      - top
-      - posixGroup
-  with_items: "{{ arch_groups }}"
-
-#TODO
-#- name: associate groups with users
-#  ldap_attr:
-#    dn: cn={{ TODO GROUP HERE }},ou=groups,dc=archlinux,dc=org
-#    name: memberuid
-#    values: {{ TODO USER HERE }}
-#    state: present
-#  with_
-
-- name: open firewall hole
-  firewalld: port={{ item }} permanent=true state=enabled immediate=yes
-  when: configure_firewall
-  with_items:
-    - 389
-    - 636
-  tags:
-    - firewall