From e26489906326ab384bbc9bac6a89c816cf77669d Mon Sep 17 00:00:00 2001
From: "R. Tyler Croy" <tyler@monkeypox.org>
Date: Sun, 30 Jun 2013 20:10:17 -0700
Subject: [PATCH] Change the dependency on the puppet module to hit Puppet
 Forge

---
 Puppetfile      |  7 ++-----
 Puppetfile.lock | 14 ++++----------
 2 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/Puppetfile b/Puppetfile
index 6097133..17e4f66 100644
--- a/Puppetfile
+++ b/Puppetfile
@@ -9,15 +9,12 @@ mod 'puppetlabs/stdlib'
 mod 'ripienaar/concat'
 
 
+mod 'rtyler/puppet'
+
 
 mod 'sshd', :git => 'git://github.com/jenkinsci/puppet-sshd.git'
 mod 'postgres', :git => 'git://github.com/jenkinsci/puppet-postgres.git'
 
-
-# XXX: Not yet published to the forge
-mod 'puppet', :git => 'git://github.com/rtyler/puppet-puppet.git'
-
-
 # Pull in all our local modules automatically
 Dir["./local-modules/*"].each do |path|
   mod File.basename(path), :path => path
diff --git a/Puppetfile.lock b/Puppetfile.lock
index 1e26ab1..dcd963c 100644
--- a/Puppetfile.lock
+++ b/Puppetfile.lock
@@ -10,6 +10,9 @@ FORGE
       puppetlabs/stdlib (>= 0.1.6)
     puppetlabs/stdlib (4.1.0)
     ripienaar/concat (0.2.0)
+    rtyler/puppet (0.0.1)
+      puppetlabs/apt (>= 0.0.4)
+      puppetlabs/stdlib (>= 3.0.0)
 
 GIT
   remote: git://github.com/jenkinsci/puppet-postgres.git
@@ -25,15 +28,6 @@ GIT
   specs:
     sshd (1.0.0)
 
-GIT
-  remote: git://github.com/rtyler/puppet-puppet.git
-  ref: master
-  sha: 3400421db79e3906520d63c5dca055ccdfef7c59
-  specs:
-    puppet (0.0.1)
-      puppetlabs/apt (>= 0.0.4)
-      puppetlabs/stdlib (>= 3.0.0)
-
 PATH
   remote: ./local-modules/apache2
   specs:
@@ -211,13 +205,13 @@ DEPENDENCIES
   nginx (>= 0)
   packages (>= 0)
   postgres (>= 0)
-  puppet (>= 0)
   puppetlabs/apt (>= 0)
   puppetlabs/firewall (>= 0)
   puppetlabs/mysql (>= 0)
   puppetlabs/ntp (>= 0)
   puppetlabs/stdlib (>= 0)
   ripienaar/concat (>= 0)
+  rtyler/puppet (>= 0)
   sshd (>= 0)
   sudo (>= 0)
   updates_jenkins-ci_org (>= 0)