From: Peter Palfrader <peter@palfrader.org>
Date: Mon, 29 Apr 2019 07:05:12 +0000 (+0200)
Subject: Order sometimes matters because ifupdown is ... ifupdown
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=c75c473c34b4c183571acdc4018edda86ca1bad6;p=mirror%2Fdsa-puppet.git

Order sometimes matters because ifupdown is ... ifupdown
---

diff --git a/modules/salsa/manifests/init.pp b/modules/salsa/manifests/init.pp
index 73821cc68..02b89a07b 100644
--- a/modules/salsa/manifests/init.pp
+++ b/modules/salsa/manifests/init.pp
@@ -114,12 +114,13 @@ class salsa inherits salsa::params {
 	}
 	# pages
 	file { "/etc/network/interfaces.d/pages.debian.net.conf":
-		content  => @("EOF"),
-				iface eth0 inet static
-				    address 209.87.16.45/24
+		content  => @(EOF),
 				iface eth0 inet6 static
 				    address 2607:f8f0:614:1::1274:45/64
 				    preferred-lifetime 0
+				    pre-up echo 0 > /proc/sys/net/ipv6/conf/$IFACE/accept_dad
+				iface eth0 inet static
+				    address 209.87.16.45/24
 				| EOF
 		notify => Exec['service networking reload'],
 	}