From 2e2cc75029b70e3e8042dbc656a773b610c3b345 Mon Sep 17 00:00:00 2001
From: John Van de Meulebrouck Brendgard <john@nordu.net>
Date: Sat, 27 Aug 2016 23:51:58 +0200
Subject: [PATCH] Do not fetch puppet deb over http, instead do as seen in
 eduID

---
 global/pre-tasks.d/030puppet | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/global/pre-tasks.d/030puppet b/global/pre-tasks.d/030puppet
index cdc9989..ef08016 100755
--- a/global/pre-tasks.d/030puppet
+++ b/global/pre-tasks.d/030puppet
@@ -9,9 +9,13 @@ stamp="$COSMOS_BASE/stamps/puppet-tools-v01.stamp"
 
 if ! test -f $stamp -a -f /usr/bin/puppet; then
     codename=`lsb_release -c| awk '{print $2}'`
-    wget -c http://apt.puppetlabs.com/puppetlabs-release-${codename}.deb
-    dpkg -i puppetlabs-release-${codename}.deb
-    rm -f puppetlabs-release-${codename}.deb*
+    puppetdeb="$COSMOS_REPO/apt/puppetlabs-release-${codename}.deb"
+    if [ ! -f $puppetdeb ]; then
+	echo "$0: Puppet deb for release $codename not found in $COSMOS_REPO/apt/"
+	echo "    Get it from https://apt.puppetlabs.com/ and put it in the Cosmos repo."
+	exit 1
+    fi
+    dpkg -i $puppetdeb
     apt-get update
     apt-get -y install puppet-common