From 60a54b7c43bf6bc0513bd7f61a5d82a204a46fe4 Mon Sep 17 00:00:00 2001
From: Thomas Constans <thomas@opendoor.fr>
Date: Sun, 19 Apr 2020 22:23:27 +0200
Subject: [PATCH] phpldapadmin: mise au point

---
 README.md                |  4 +++-
 defaults/main.yml        |  3 ++-
 handlers/main.yml        |  4 ++--
 tasks/main.yml           | 50 ++++++++++++++++++++++------------------
 templates/pla_config.php |  2 +-
 templates/pla_httpd.conf |  3 +++
 6 files changed, 39 insertions(+), 27 deletions(-)
 create mode 100644 templates/pla_httpd.conf

diff --git a/README.md b/README.md
index 25bf75f..c0ebb96 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,9 @@ Apache +php needed
 Role Variables
 --------------
 
-baseddn
+pla_baseddn
+pla_install_dir - default /var/www/html
+pla_version - default 1.2.5
 
 Dependencies
 ------------
diff --git a/defaults/main.yml b/defaults/main.yml
index cc51ae1..a933cc0 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -1,3 +1,4 @@
 ---
 # defaults file for phpldapadmin
-basedn: dc=lxd
\ No newline at end of file
+pla_version: 1.2.4
+pla_install_dir: /var/www/html/
\ No newline at end of file
diff --git a/handlers/main.yml b/handlers/main.yml
index e826ea8..95d20de 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -1,6 +1,6 @@
 ---
 # handlers file for phpldapadmin
-- name: reloadhttpd
+- name: reload_apache
   service:
     name: httpd
-    state: restarted
\ No newline at end of file
+    state: reloaded
\ No newline at end of file
diff --git a/tasks/main.yml b/tasks/main.yml
index 3734914..a9e2f99 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -1,24 +1,30 @@
-  - file:
-      name: /etc/httpd/conf.d/php-fpm-7.conf
-      state: absent
-    notify: reloadhttpd
-  - yum:
-      name: rh-php70-php-*
-      state: absent
-    notify: reloadhttpd
-  - yum:
-      name: [ php, php-ldap ]
-      state: installed
-    notify: reloadhttpd
-  - unarchive:
-      dest: /var/www/html
-      src: pla.tgz
-  - file:
-      src: /var/www/html/phpldapadmin-1.2.3
-      state: link
-      dest: /var/www/html/pla
+- name: get archive
+  get_url:
+    url: https://github.com/leenooks/phpLDAPadmin/archive/{{ pla_version }}.tar.gz
+    dest: /tmp/pla_{{pla_version }}.gz
+- yum:
+    name: [ php-ldap, php-xml ]
+    state: installed
 
-  - template:
-      src: pla_config.php
-      dest: /var/www/html/pla/config/config.php
+- unarchive:
+    dest: /{{ pla_install_dir }}
+    src:  /tmp/pla_{{pla_version }}.gz
+    remote_src: true
+- file:
+    src: /{{ pla_install_dir }}/phpLDAPadmin-{{ pla_version }}
+    state: link
+    dest: /{{ pla_install_dir }}/pla
+
+- template:
+    src: pla_config.php
+    dest: /{{ pla_install_dir }}/pla/config/config.php
+- name: clean up
+  file:
+    path:  /tmp/pla_{{pla_version }}.gz
+    state: absent
+- name: deploy apache config
+  template:
+    src: pla_httpd.conf
+    dest: /etc/httpd/conf.d/pla.conf
+  notify: reload_apache
 
diff --git a/templates/pla_config.php b/templates/pla_config.php
index 8df96a2..2423b07 100644
--- a/templates/pla_config.php
+++ b/templates/pla_config.php
@@ -297,7 +297,7 @@ $servers->setValue('server','host','127.0.0.1');
 
 /* Array of base DNs of your LDAP server. Leave this blank to have phpLDAPadmin
    auto-detect it for you. */
-$servers->setValue('server','base',array('cn=config','{{ basedn }}'));
+$servers->setValue('server','base',array('cn=config','{{ pla_basedn }}'));
 
 /* Five options for auth_type:
    1. 'cookie': you will login via a web form, and a client-side cookie will
diff --git a/templates/pla_httpd.conf b/templates/pla_httpd.conf
new file mode 100644
index 0000000..7f496eb
--- /dev/null
+++ b/templates/pla_httpd.conf
@@ -0,0 +1,3 @@
+<Directory {{ pla_install_dir }}/pla/>
+   require all granted
+</Directory>
\ No newline at end of file