mig5/enroll
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Activity Actions

Fixes for ensuring /etc/enroll exists if /etc/enroll/firewall is to be created

Browse source
This commit is contained in:
Miguel Jacq 2026-06-19 20:18:19 +10:00
parent 5644062040
commit d6371ccccd
Signed by: mig5
GPG key ID: 03906B4110AAD3B8
4 changed files with 100 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

17
enroll/puppet.py
View file

@ -832,15 +832,14 @@ def _collect_puppet_roles(
str(p).strip() for p in (fw.get("packages") or []) if str(p).strip()
]
if has_fw or packages or fw.get("notes"):
if has_fw:
runtime_role = ensure_role("enroll_runtime")
runtime_role.add_managed_dir(
"/etc/enroll",
owner="root",
group="root",
mode="0750",
reason="enroll_runtime",
)
runtime_role = ensure_role("enroll_runtime")
runtime_role.add_managed_dir(
"/etc/enroll",
owner="root",
group="root",
mode="0750",
reason="enroll_runtime",
)
role_name = str(fw.get("role_name") or "firewall_runtime")
prole = ensure_role(role_name)
prole.add_firewall_runtime_snapshot(

17
enroll/salt.py
View file

@ -888,15 +888,14 @@ def _collect_salt_roles(
str(p).strip() for p in (fw.get("packages") or []) if str(p).strip()
]
if has_fw or packages or fw.get("notes"):
if has_fw:
runtime_role = ensure_role("enroll_runtime")
runtime_role.add_managed_dir(
"/etc/enroll",
user="root",
group="root",
mode="0750",
reason="enroll_runtime",
)
runtime_role = ensure_role("enroll_runtime")
runtime_role.add_managed_dir(
"/etc/enroll",
user="root",
group="root",
mode="0750",
reason="enroll_runtime",
)
role_name = str(fw.get("role_name") or "firewall_runtime")
srole = ensure_role(role_name)
srole.add_firewall_runtime_snapshot(