From: Julien Cristau <jcristau@debian.org>
Date: Mon, 23 Sep 2019 18:57:56 +0000 (+0200)
Subject: stop procps messing with our protected_hardlinks setting on debian-cd hosts
X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fdsa-puppet.git;a=commitdiff_plain;h=868bd8d36379bc7cb266a15accd6caba56c4944b

stop procps messing with our protected_hardlinks setting on debian-cd hosts
---

diff --git a/data/nodes/casulana.debian.org.yaml b/data/nodes/casulana.debian.org.yaml
index d403e7467..5bf1e9d23 100644
--- a/data/nodes/casulana.debian.org.yaml
+++ b/data/nodes/casulana.debian.org.yaml
@@ -1,5 +1,6 @@
 classes:
   - roles::static_source
+  - roles::cdbuilder
   - roles::cdbuilder_local_mirror
 
 roles::cdbuilder_local_mirror::listen_address: 172.29.103.1
diff --git a/data/nodes/pettersson.debian.org.yaml b/data/nodes/pettersson.debian.org.yaml
new file mode 100644
index 000000000..b6fc83e03
--- /dev/null
+++ b/data/nodes/pettersson.debian.org.yaml
@@ -0,0 +1,2 @@
+classes:
+  - roles::cdbuilder
diff --git a/modules/roles/manifests/cdbuilder.pp b/modules/roles/manifests/cdbuilder.pp
new file mode 100644
index 000000000..64c692834
--- /dev/null
+++ b/modules/roles/manifests/cdbuilder.pp
@@ -0,0 +1,6 @@
+class roles::cdbuilder {
+  # debian-cd wants to make hardlinks to files it doesn't own; let it.
+  file { '/etc/sysctl.d/protect-links.conf':
+    ensure => absent,
+  }
+}