From: Peter Palfrader <peter@palfrader.org>
Date: Thu, 21 Sep 2017 13:05:37 +0000 (+0200)
Subject: Set /etc/environment and /etc/default/locale with puppet instead of in new-machine... 
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=a300523e661ea2038b71803522617cc921445c57;p=mirror%2Fdsa-puppet.git

Set /etc/environment and /etc/default/locale with puppet instead of in new-machine howto
---

diff --git a/modules/debian_org/manifests/init.pp b/modules/debian_org/manifests/init.pp
index 25dd35e74..30f0be565 100644
--- a/modules/debian_org/manifests/init.pp
+++ b/modules/debian_org/manifests/init.pp
@@ -223,6 +223,14 @@ class debian_org {
 		mode   => '0444',
 		source => 'puppet:///modules/debian_org/etc.zsh/zprofile',
 	}
+	file { '/etc/environment':
+		content => "",
+		mode => '0440',
+	}
+	file { '/etc/default/locale':
+		content => "",
+		mode => '0440',
+	}
 
 	# set mmap_min_addr to 4096 to mitigate
 	# Linux NULL-pointer dereference exploits