Adapt role to changes in postorius-ldap-membership-management
Closes https://git.cccv.de/infra/documentation/-/issues/157
This commit is contained in:
parent
18fe38fde4
commit
1a3a1de274
2 changed files with 3 additions and 7 deletions
|
|
@ -13,7 +13,6 @@
|
||||||
- name: install mailman addons via pip
|
- name: install mailman addons via pip
|
||||||
notify: restart mailman
|
notify: restart mailman
|
||||||
loop:
|
loop:
|
||||||
- git+https://git.cccv.de/uffd/django-auth-ldap-remoteuser.git
|
|
||||||
- git+https://git.cccv.de/uffd/postorius-ldap-membership-management.git
|
- git+https://git.cccv.de/uffd/postorius-ldap-membership-management.git
|
||||||
pip:
|
pip:
|
||||||
executable: pip3
|
executable: pip3
|
||||||
|
|
@ -67,5 +66,5 @@
|
||||||
cron:
|
cron:
|
||||||
name: "mailman ldap sync"
|
name: "mailman ldap sync"
|
||||||
user: www-data
|
user: www-data
|
||||||
job: /usr/bin/django-admin syncldap --pythonpath /usr/share/mailman3-web --settings settings; /usr/bin/django-admin syncldapmemberships --pythonpath /usr/share/mailman3-web --settings settings
|
job: /usr/bin/django-admin syncldapusers --pythonpath /usr/share/mailman3-web --settings settings; /usr/bin/django-admin syncldapmemberships --pythonpath /usr/share/mailman3-web --settings settings
|
||||||
minute: "*/15"
|
minute: "*/15"
|
||||||
|
|
|
||||||
|
|
@ -40,7 +40,7 @@ MIDDLEWARE = (
|
||||||
{% if mailman.web.remote_user %}
|
{% if mailman.web.remote_user %}
|
||||||
'django.contrib.auth.middleware.PersistentRemoteUserMiddleware',
|
'django.contrib.auth.middleware.PersistentRemoteUserMiddleware',
|
||||||
{% endif %}
|
{% endif %}
|
||||||
'django_auth_ldap_remoteuser.middleware.SessionTimeoutMiddleware',
|
'postorius_ldap_membership_management.middleware.SessionTimeoutMiddleware',
|
||||||
)
|
)
|
||||||
|
|
||||||
# Application definition
|
# Application definition
|
||||||
|
|
@ -66,9 +66,6 @@ INSTALLED_APPS = (
|
||||||
'allauth',
|
'allauth',
|
||||||
'allauth.account',
|
'allauth.account',
|
||||||
'allauth.socialaccount',
|
'allauth.socialaccount',
|
||||||
{% if mailman.web.remote_user and mailman.web.ldap %}
|
|
||||||
'django_auth_ldap_remoteuser',
|
|
||||||
{% endif %}
|
|
||||||
{% if mailman.web.ldap %}
|
{% if mailman.web.ldap %}
|
||||||
'postorius_ldap_membership_management',
|
'postorius_ldap_membership_management',
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
@ -76,7 +73,7 @@ INSTALLED_APPS = (
|
||||||
|
|
||||||
AUTHENTICATION_BACKENDS = (
|
AUTHENTICATION_BACKENDS = (
|
||||||
{% if mailman.web.remote_user and mailman.web.ldap %}
|
{% if mailman.web.remote_user and mailman.web.ldap %}
|
||||||
'django_auth_ldap_remoteuser.backends.LdapRemoteUserBackend',
|
'postorius_ldap_membership_management.backends.LdapRemoteUserBackend',
|
||||||
{% else %}
|
{% else %}
|
||||||
{% if mailman.web.remote_user %}
|
{% if mailman.web.remote_user %}
|
||||||
'django.contrib.auth.backends.RemoteUserBackend',
|
'django.contrib.auth.backends.RemoteUserBackend',
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue