From 2c98a9264c2070281dc7628d5bcb176eb0fdb200 Mon Sep 17 00:00:00 2001
From: Nick Walker <nick.walker@puppetlabs.com>
Date: Wed, 23 Mar 2016 10:31:33 -0700
Subject: Reduce the scope of the control-repo to mostly an example

Prior to this commit, the control-repo was an example of the
structure of a control repo but it also included puppet code to
help setup code manager and instructions to get that all setup
in a very specific way.

This was great for users that wanted to follow those instructions
exactly but wasn't great for people just looking for an example to
start from.

After this commit, the control-repo will be just an example once
again and a new repo somehwere else will pop up to provide the
explicit instructions on how to use the example with code manager.

There are links added to puppetlabs/control-repo to a new repo
that will have a version of the code that once lived in
puppetlabs/control-repo
---
 Puppetfile | 65 ++++++++++++++------------------------------------------------
 1 file changed, 14 insertions(+), 51 deletions(-)

(limited to 'Puppetfile')

diff --git a/Puppetfile b/Puppetfile
index 02e2c31..b282b85 100644
--- a/Puppetfile
+++ b/Puppetfile
@@ -1,54 +1,17 @@
 forge "http://forge.puppetlabs.com"
 
 # Modules from the Puppet Forge
-# Note the versions are all set to :latest but after you've 
-# installed you should change them to the exact version you want
-mod "hunner/hiera",           '2.0.1'
-mod "puppetlabs/inifile",     :latest
-mod "puppetlabs/stdlib",      :latest
-mod "puppetlabs/concat",      :latest
-mod "puppetlabs/ntp",         :latest
-mod "saz/ssh",                :latest
-mod "puppetlabs/postgresql",  '4.5.0'
-mod "puppet/stash",           '1.3.0'
-mod "puppetlabs/java",        '1.4.1'
-mod "npwalker/pe_code_manager_webhook", '1.0.3'
-
-#An example of using a specific forge module version instead of latest
-#Notice the addition of single quotes
-#mod "puppetlabs/inifile", '1.3.0'
-
-# Modules from Github using various references
-# Further examples: https://github.com/puppetlabs/r10k/blob/master/doc/puppetfile.mkd#examples
-# update the tag to the most current release when implementing
-mod 'gitlab',
-  :git => 'https://github.com/vshn/puppet-gitlab',
-  :ref => '00397b86dfb3487d9df768cbd3698d362132b5bf'
-
-mod 'r10k',
-  :git => 'https://github.com/acidprime/r10k',
-  :tag => 'v3.1.1'
-
-#mod 'pe_code_manager_webhook',
-#  :git => 'https://github.com/npwalker/pe_code_manager_webhook',
-#  :ref => '6957aa67e376ca7dcc9a60a58c247ed3e7b66c16'
-
-mod 'gms',
-  :git    => 'https://github.com/npwalker/abrader-gms',
-  :branch => 'gitlab_disable_ssl_verify_support'
-
-mod 'pltraining-rbac',
-  :git    => 'https://github.com/puppetlabs/pltraining-rbac',
-  :ref    => '2f60e1789a721ce83f8df061e13f8bf81cd4e4ce'
-
-mod 'rampup_profile_puppetmaster',
-  :git    => 'https://github.com/PuppetLabs-RampUpProgram/RampUp_profile_puppetmaster',
-  :branch => 'master'
-
-mod 'rampup_profile_gitlab',
-  :git    => 'https://github.com/PuppetLabs-RampUpProgram/RampUp_profile_gitlab',
-  :branch => 'master'
-
-mod 'rampup_profile_stash',
-  :git    => 'https://github.com/PuppetLabs-RampUpProgram/RampUp_profile_stash',
-  :branch => 'master'
+# Versions should be updated to be the latest at the time you start
+#mod "puppetlabs/inifile",     '1.5.0'
+#mod "puppetlabs/stdlib",      '4.11.0'
+#mod "puppetlabs/concat",      '2.1.0'
+
+# Modules from Git
+# Examples: https://github.com/puppetlabs/r10k/blob/master/doc/puppetfile.mkd#examples
+#mod 'apache',
+#  :git    => 'https://github.com/puppetlabs/puppetlabs-apache',
+#  :commit => '83401079053dca11d61945bd9beef9ecf7576cbf'
+
+#mod 'apache',
+#  :git    => 'https://github.com/puppetlabs/puppetlabs-apache',
+#  :branch => 'docs_experiment'
-- 
cgit v1.2.3