Update to 2022-03-17 10:00

This commit is contained in:
Daniel Berteaud 2022-03-17 10:00:06 +01:00
parent 9022589d6f
commit 935fee126f
5 changed files with 10 additions and 6 deletions

View File

@ -101,7 +101,7 @@ ldap2pg_base_conf:
# #
# - description: "Query LDAP to populate support_rw role" # - description: "Query LDAP to populate support_rw role"
# ldapsearch: # 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))" # 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: # role:
# name: '{sAMAccountName}' # name: '{sAMAccountName}'

View File

@ -12,4 +12,10 @@
notify: notify:
- restart ldap2pg.service - restart ldap2pg.service
- restart ldap2pg.timer - 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 tags: pg

View File

@ -6,5 +6,5 @@ Type=oneshot
PrivateTmp=yes PrivateTmp=yes
User={{ ldap2pg_user }} User={{ ldap2pg_user }}
Group={{ 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 TimeoutSec=30m

View File

@ -10,9 +10,7 @@ pga_src_ip: []
# Root dir where the app will be installed # Root dir where the app will be installed
pga_root_dir: /opt/pgadmin4_{{ pga_id }} pga_root_dir: /opt/pgadmin4_{{ pga_id }}
# Version to deploy # Version to deploy
pga_version: '6.4' pga_version: '6.7'
# 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
# When pg_auth is an empty list, pgAdmin will be in single user mode # When pg_auth is an empty list, pgAdmin will be in single user mode
# You can set it to a list, eg # You can set it to a list, eg

View File

@ -56,7 +56,7 @@
- name: Install pgadmin4 - name: Install pgadmin4
pip: pip:
name: "{{ pga_pip_url }}" name: pgadmin4=={{ pga_version }}
virtualenv: "{{ pga_root_dir }}/venv" virtualenv: "{{ pga_root_dir }}/venv"
virtualenv_command: /usr/bin/virtualenv-3 virtualenv_command: /usr/bin/virtualenv-3
virtualenv_python: /usr/bin/python3 virtualenv_python: /usr/bin/python3