From 935fee126f4d2cc676b585de5384a6cba5ecf5fa Mon Sep 17 00:00:00 2001
From: Daniel Berteaud <dbd@ehtrace.com>
Date: Thu, 17 Mar 2022 10:00:06 +0100
Subject: [PATCH] Update to 2022-03-17 10:00

---
 roles/ldap2pg/defaults/main.yml            | 2 +-
 roles/ldap2pg/tasks/install.yml            | 6 ++++++
 roles/ldap2pg/templates/ldap2pg.service.j2 | 2 +-
 roles/pgadmin4/defaults/main.yml           | 4 +---
 roles/pgadmin4/tasks/install.yml           | 2 +-
 5 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/roles/ldap2pg/defaults/main.yml b/roles/ldap2pg/defaults/main.yml
index 0347184..2a1065f 100644
--- a/roles/ldap2pg/defaults/main.yml
+++ b/roles/ldap2pg/defaults/main.yml
@@ -101,7 +101,7 @@ ldap2pg_base_conf:
 #  
 #    - description: "Query LDAP to populate support_rw role"
 #      ldapsearch:
-#        base: OU=People,DC=lapiole,DC=org
+#        base: OU=People,DC=example,DC=org
 #        filter: "(&(objectClass=user)(!(useraccountcontrol:1.2.840.113556.1.4.803:=2))(memberOf:1.2.840.113556.1.4.1941:=CN=Role_Support_RW,OU=Roles,DC=example,DC=org))"
 #      role:
 #        name: '{sAMAccountName}'
diff --git a/roles/ldap2pg/tasks/install.yml b/roles/ldap2pg/tasks/install.yml
index 0263cea..e1ff7dc 100644
--- a/roles/ldap2pg/tasks/install.yml
+++ b/roles/ldap2pg/tasks/install.yml
@@ -12,4 +12,10 @@
   notify:
     - restart ldap2pg.service
     - restart ldap2pg.timer
+  register: ldap2pg_units
+  tags: pg
+
+- name: Reload systemd
+  systemd: daemon_reload=True
+  when: ldap2Pg_units.results | selectattr('changed','equalto',True) | list | length > 0
   tags: pg
diff --git a/roles/ldap2pg/templates/ldap2pg.service.j2 b/roles/ldap2pg/templates/ldap2pg.service.j2
index a7fd669..f254fa9 100644
--- a/roles/ldap2pg/templates/ldap2pg.service.j2
+++ b/roles/ldap2pg/templates/ldap2pg.service.j2
@@ -6,5 +6,5 @@ Type=oneshot
 PrivateTmp=yes
 User={{ ldap2pg_user }}
 Group={{ ldap2pg_user }}
-ExecStart=/bin/ldap2pg -c {{ ldap2pg_user_info.home }}/ldap2pg.yml --real
+ExecStart=/bin/ldap2pg -c /etc/ldap2pg.yml --real
 TimeoutSec=30m
diff --git a/roles/pgadmin4/defaults/main.yml b/roles/pgadmin4/defaults/main.yml
index 084df8d..cf40a9a 100644
--- a/roles/pgadmin4/defaults/main.yml
+++ b/roles/pgadmin4/defaults/main.yml
@@ -10,9 +10,7 @@ pga_src_ip: []
 # Root dir where the app will be installed
 pga_root_dir: /opt/pgadmin4_{{ pga_id }}
 # Version to deploy
-pga_version: '6.4'
-# URL of the wheel
-pga_pip_url: https://ftp.postgresql.org/pub/pgadmin/pgadmin4/v{{ pga_version }}/pip/pgadmin4-{{ pga_version }}-py3-none-any.whl
+pga_version: '6.7'
 
 # When pg_auth is an empty list, pgAdmin will be in single user mode
 # You can set it to a list, eg
diff --git a/roles/pgadmin4/tasks/install.yml b/roles/pgadmin4/tasks/install.yml
index dbde349..0fc7ec7 100644
--- a/roles/pgadmin4/tasks/install.yml
+++ b/roles/pgadmin4/tasks/install.yml
@@ -56,7 +56,7 @@
 
 - name: Install pgadmin4
   pip:
-    name: "{{ pga_pip_url }}"
+    name: pgadmin4=={{ pga_version }}
     virtualenv: "{{ pga_root_dir }}/venv"
     virtualenv_command: /usr/bin/virtualenv-3
     virtualenv_python: /usr/bin/python3