From 681c0d83b40bc3cb37029389d64c0bb303b2e067 Mon Sep 17 00:00:00 2001
From: Anton Stoychev <antitoxic@gmail.com>
Date: Fri, 2 Oct 2015 14:57:17 +0300
Subject: [PATCH 1/3] Replace puppet reference to removed commit with the
 correct one

---
 puppet/Puppetfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/puppet/Puppetfile b/puppet/Puppetfile
index 5779e7a..7c90560 100644
--- a/puppet/Puppetfile
+++ b/puppet/Puppetfile
@@ -16,10 +16,10 @@ mod "example42/monitor", '2.0.1'
 mod "datagovuk/solr", '2.0.7',
    :git => "https://github.com/example42/puppet-solr"
 
-# commit e92de3dee9c55d5 is actually v1.9.5
+# commit 9ef5e39 is actually v1.9.5
 mod "datagovuk/python",
    :git => "https://github.com/stankevich/puppet-python",
-   :ref => 'e92de3dee9c55d5'
+   :ref => '9ef5e39'
 
 mod "datagovuk/dgu_ckan",
    :path => "/vagrant/puppet/modules/dgu_ckan"

From 981be6b626a9794f64ecb5448dea27c4bebd4093 Mon Sep 17 00:00:00 2001
From: Anton Stoychev <antitoxic@gmail.com>
Date: Fri, 2 Oct 2015 14:58:08 +0300
Subject: [PATCH 2/3] Prevent npm of creating symlinks on shared folder
 (network drive)

---
 puppet/modules/dgu_ckan/manifests/init.pp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/puppet/modules/dgu_ckan/manifests/init.pp b/puppet/modules/dgu_ckan/manifests/init.pp
index 80c2760..75afb7a 100644
--- a/puppet/modules/dgu_ckan/manifests/init.pp
+++ b/puppet/modules/dgu_ckan/manifests/init.pp
@@ -584,7 +584,7 @@
   # I can replicate this on the command-line when logged in as vagrant and using sudo,
   # but it works if you do 'sudo su' or 'sudo su co' and then do 'sudo npm install'.
   exec { 'npm_deps_dgu':
-    command   => 'sudo npm install',
+    command   => 'sudo npm install --no-bin-links',
     cwd       => '/src/ckanext-dgu',
     user      => 'co',
     require   => [
@@ -605,7 +605,7 @@
     path      => "/usr/bin:/bin:/usr/sbin",
   }
   exec { 'npm_deps_shared':
-    command   => 'sudo npm install',
+    command   => 'sudo npm install --no-bin-links',
     cwd       => '/src/shared_dguk_assets',
     user      => 'co',
     require   => Package['grunt-cli'],

From 37d87292e1c0acf52008c296047ea263ec637bee Mon Sep 17 00:00:00 2001
From: Anton Stoychev <antitoxic@gmail.com>
Date: Fri, 2 Oct 2015 15:38:02 +0300
Subject: [PATCH 3/3] Pick python puppet exact reference, not parent

---
 puppet/Puppetfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/puppet/Puppetfile b/puppet/Puppetfile
index 7c90560..14a11cb 100644
--- a/puppet/Puppetfile
+++ b/puppet/Puppetfile
@@ -16,10 +16,10 @@ mod "example42/monitor", '2.0.1'
 mod "datagovuk/solr", '2.0.7',
    :git => "https://github.com/example42/puppet-solr"
 
-# commit 9ef5e39 is actually v1.9.5
+# commit eb52429 is actually v1.9.5
 mod "datagovuk/python",
    :git => "https://github.com/stankevich/puppet-python",
-   :ref => '9ef5e39'
+   :ref => 'eb52429'
 
 mod "datagovuk/dgu_ckan",
    :path => "/vagrant/puppet/modules/dgu_ckan"