diff --git a/.gitignore b/.gitignore index 9e2266d..4b61a7f 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ config.ini **/__pycache__/** **.list generated/* +aliases_local diff --git a/.gitmodules b/.gitmodules index 361b0a1..f418c65 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "re2oapi"] path = re2oapi - url = https://gitlab.federez.net/re2o/re2oapi.git + url = https://gitlab.adm.crans.org/nounous/re2o-re2oapi.git diff --git a/main.py b/main.py index 491acfa..de1a219 100644 --- a/main.py +++ b/main.py @@ -23,7 +23,7 @@ api_client = Re2oAPIClient(api_hostname, api_username, api_password) client_hostname = socket.gethostname().split('.', 1)[0] -all_users = api_client.list("mail/alias") +all_users = api_client.list("localemail/users") def generate(api_client): # Création de l'environnement Jinja diff --git a/templates/list b/templates/list index ff577f3..b88a55a 100644 --- a/templates/list +++ b/templates/list @@ -1,10 +1,10 @@ # Liste d'association alias:addresse des users {%- for user in data -%} -{%- for alias in user.get_mail_aliases -%} -{%- if user.redirection -%} -{{alias.valeur}}:{{ user.get_mail }} +{%- for alias in user.email_address -%} +{%- if user.local_email_redirect -%} +{{alias.complete_email_address}}:{{ user.email }} {%- else -%} -{{alias.valeur}}:{{ user.pseudo }} +{{alias.complete_email_address}}:{{ alias.user }} {% endif %} {% endfor %} {% endfor %}