From: Peter Palfrader <peter@palfrader.org>
Date: Tue, 26 Jul 2016 11:31:31 +0000 (+0200)
Subject: Add zprofile
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=c0d531d094014f4542cc4d0215bd74f98db16a37;hp=c3a363ab3c417b4d4a3ddbb6196b080fc1239a4e;p=mirror%2Fdsa-puppet.git

Add zprofile
---

diff --git a/modules/debian-org/files/etc.zsh/zprofile b/modules/debian-org/files/etc.zsh/zprofile
new file mode 100644
index 000000000..8ea4df35a
--- /dev/null
+++ b/modules/debian-org/files/etc.zsh/zprofile
@@ -0,0 +1,16 @@
+#
+# THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
+# USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
+#
+
+# /etc/zsh/zprofile: system-wide .zprofile file for zsh(1).
+#
+# This file is sourced only for login shells (i.e. shells
+# invoked with "-" as the first character of argv[0], and
+# shells invoked with the -l flag.)
+#
+# Global Order: zshenv, zprofile, zshrc, zlogin
+
+if [ -e /etc/profile.d/timeout.sh ]; then
+  .  /etc/profile.d/timeout.sh
+fi
diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp
index 49841e130..90291be79 100644
--- a/modules/debian-org/manifests/init.pp
+++ b/modules/debian-org/manifests/init.pp
@@ -315,6 +315,13 @@ class debian-org {
 		mode   => '0555',
 		source => 'puppet:///modules/debian-org/etc.profile.d/timeout.sh',
 	}
+	file { '/etc/zsh':
+		ensure => directory,
+	}
+	file { '/etc/zsh/zprofile':
+		mode   => '0444',
+		source => 'puppet:///modules/debian-org/etc.zsh/zprofile',
+	}
 
 	# set mmap_min_addr to 4096 to mitigate
 	# Linux NULL-pointer dereference exploits