Skip to content

[chores] Added support for user expiration reminders #608 #615

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nemesifier merged 4 commits into from
May 28, 2026
+14 −8
Merged

[chores] Added support for user expiration reminders #608 #615

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e392a5d
[chores] Added support for user expiration reminders #608
pandafy May 14, 2026
0c944be
[chores] Removed extra deps
pandafy May 27, 2026
8204f0c
[chores] Removed blank line changes
pandafy May 27, 2026
8a62054
[chores] Minor improvements
nemesifier May 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion defaults/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,8 @@ freeradius_eap_openwisp_site_template_src: freeradius/eap/openwisp_site.j2
freeradius_eap_inner_tunnel_template_src: freeradius/eap/inner_tunnel.j2
freeradius_eap_template_src: freeradius/eap/eap.j2
cron_delete_old_notifications: "'hour': 0, 'minute': 0"
cron_deactivate_expired_users: "'hour': 0, 'minute': 5"
cron_deactivate_expired_users: "'hour': 0, 'minute': 1"
cron_expiration_reminder_email: "'hour': 0, 'minute': 3"
cron_delete_old_radiusbatch_users: "'hour': 0, 'minute': 10"
cron_cleanup_stale_radacct: "'hour': 0, 'minute': 20"
cron_delete_old_postauth: "'hour': 0, 'minute': 30"
Expand Down
3 changes: 2 additions & 1 deletion docs/user/role-variables.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -447,7 +447,8 @@ take a look at `the default values of these variables
# Defaults to "templates/freeradius/eap/eap.j2" shipped in the role.
freeradius_eap_template_src: custom_eap.j2
cron_delete_old_notifications: "'hour': 0, 'minute': 0"
cron_deactivate_expired_users: "'hour': 0, 'minute': 5"
cron_expiration_reminder_email: "'hour': 0, 'minute': 3"
cron_deactivate_expired_users: "'hour': 0, 'minute': 1"
cron_delete_old_radiusbatch_users: "'hour': 0, 'minute': 10"
cron_cleanup_stale_radacct: "'hour': 0, 'minute': 20"
cron_delete_old_postauth: "'hour': 0, 'minute': 30"
Expand Down
16 changes: 10 additions & 6 deletions templates/openwisp2/settings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,6 +253,14 @@
"schedule": crontab(**{ {{ cron_password_expiration_email }} }),
},
{% endif %}
"deactivate_expired_users": {

@kilo-code-bot kilo-code-bot Bot May 14, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

CRITICAL: The deactivate_expired_users task has been moved from openwisp_radius (conditional on openwisp2_radius and openwisp2_radius_periodic_tasks) to openwisp_users (always enabled). This changes behavior for non-RADIUS installations. Ensure this is intentional and that openwisp_users.tasks.deactivate_expired_users exists in all supported openwisp-users versions.

"task": "openwisp_users.tasks.deactivate_expired_users",
"schedule": crontab(**{ {{ cron_deactivate_expired_users }} }),
},
"expiration_reminder_email": {

@kilo-code-bot kilo-code-bot Bot May 14, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

CRITICAL: The expiration_reminder_email task runs unconditionally. Ensure openwisp_users.tasks.expiration_reminder_email exists in all supported openwisp-users versions, or wrap this in a conditional check similar to password_expiration_email above.

"task": "openwisp_users.tasks.expiration_reminder_email",
"schedule": crontab(**{ {{ cron_expiration_reminder_email }} }),
},
{% if openwisp2_notifications_delete_old_notifications %}
"delete_old_notifications": {
"task": "openwisp_notifications.tasks.delete_old_notifications",
Expand All @@ -267,12 +275,6 @@
},
{% endif %}
{% if openwisp2_radius and openwisp2_radius_periodic_tasks %}
"deactivate_expired_users": {
"task": "openwisp_radius.tasks.deactivate_expired_users",
"schedule": crontab(**{ {{ cron_deactivate_expired_users }} }),
"args": None,
"relative": True,
},
"delete_old_radiusbatch_users": {
"task": "openwisp_radius.tasks.delete_old_radiusbatch_users",
"schedule": crontab(**{ {{ cron_delete_old_radiusbatch_users }} }),
Expand Down Expand Up @@ -415,6 +417,8 @@

LANGUAGE_CODE = "{{ openwisp2_language_code }}"
TIME_ZONE = "{{ openwisp2_time_zone }}"
CELERY_TIMEZONE = TIME_ZONE

{% if openwisp2_internationalization %}
USE_I18N = True
{% endif %}
Expand Down
Loading