kevinveenbirkenbach/computer-playbook
1
0
Fork 0
mirror of https://github.com/kevinveenbirkenbach/computer-playbook.git synced 2025-12-02 15:39:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Prevented the setup of MSMTP when MODE_RESET

Browse Source
This commit is contained in:
Kevin Veen-Birkenbach
2025-11-30 17:34:56 +01:00
parent f19f64b1cd
commit 5a523cfe24
3 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
roles/sys-ctl-hlth-msmtp/tasks/01_core.yml
View File

@@ -9,5 +9,8 @@
system_service_tpl_on_failure: "{{ SYS_SERVICE_ON_FAILURE_COMPOSE }}" system_service_tpl_on_failure: "{{ SYS_SERVICE_ON_FAILURE_COMPOSE }}"
system_service_on_calendar: "{{ SYS_SCHEDULE_HEALTH_MSMTP }}" system_service_on_calendar: "{{ SYS_SCHEDULE_HEALTH_MSMTP }}"
system_service_timer_enabled: true system_service_timer_enabled: true
when:
- not MODE_RESET | bool
- users['no-reply'].mailu_token | default(false)
- include_tasks: utils/run_once.yml - include_tasks: utils/run_once.yml

3
roles/sys-svc-msmtp/tasks/main.yml
View File

@@ -3,4 +3,5 @@
when: when:
- run_once_sys_svc_msmtp is not defined or run_once_sys_svc_msmtp is false - run_once_sys_svc_msmtp is not defined or run_once_sys_svc_msmtp is false
# Just execute when mailu_token is defined # Just execute when mailu_token is defined
- users['no-reply'].mailu_token is defined - users['no-reply'].mailu_token is defined
- not MODE_RESET | bool

14
tests/integration/test_mode_reset.py
View File

@@ -33,14 +33,20 @@ class TestModeResetIntegration(unittest.TestCase):
if fname.lower().endswith(('.yml', '.yaml')): if fname.lower().endswith(('.yml', '.yaml')):
task_files.append(os.path.join(root, fname)) task_files.append(os.path.join(root, fname))
# Detect any 'MODE_RESET' usage # Detect any *positive* 'MODE_RESET | bool' usage.
# Purely negated conditions like `not MODE_RESET | bool`
# should NOT force a reset.yml, because the role only
# disables behaviour during reset but has no reset logic.
mode_reset_found = False mode_reset_found = False
mode_reset_pat = re.compile(r'(?<!not\s)MODE_RESET\s*\|\s*bool')
for fp in task_files: for fp in task_files:
try: try:
with open(fp, 'r', encoding='utf-8') as f: with open(fp, 'r', encoding='utf-8') as f:
if 'MODE_RESET' in f.read(): content = f.read()
mode_reset_found = True if mode_reset_pat.search(content):
break mode_reset_found = True
break
except (UnicodeDecodeError, OSError): except (UnicodeDecodeError, OSError):
continue continue