Merge branch 'gardouille-sysctl-protect-links-bookworm'

debops · Jun 28, 2023 · 9c38b20 · 9c38b20
2 parents 86e2daa + 2096299
commit 9c38b20
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -802,6 +802,12 @@ debops.boxbackup role
 - Fixed an issue in the configuration template that caused a templating type
   error where Jinja expected a string but found an int value instead.
 
+- The :file:`protect-links.conf` configuration file has been renamed to
+  :file:`99-protect-links.conf` file in Debian Bookworm; this is handled
+  conditionally in the role configuration. Users might need to remove the
+  :file:`/etc/sysctl.d/protect-links.conf` file generated by the role manually
+  on existing installations to fix this issue.
+
 Removed
 ~~~~~~~
 

diff --git a/ansible/roles/sysctl/defaults/main.yml b/ansible/roles/sysctl/defaults/main.yml
@@ -267,7 +267,9 @@ sysctl__default_parameters:
   # original file and regenerate it; the read-only parameters will be
   # automatically commented out in unprivileged LXC containers.
   - name: 'protect-links'
-    filename: 'protect-links.conf'
+    filename: '{{ "protect-links.conf"
+                  if (ansible_distribution_release in ["stretch", "buster", "bullseye"])
+                  else "99-protect-links.conf" }}'
     divert: True
     comment: |
       Protected links