Merge pull request #4 from npwalker/merge_npwalker_control_repo

Merge npwalker/control-repo in puppetlabs/control-repo

1 files changed, 17 insertions, 9 deletions

diff --git a/Puppetfile b/Puppetfile
index 5691668..ac90e14 100644
--- a/Puppetfile
+++ b/Puppetfile
@@ -6,6 +6,11 @@ forge "http://forge.puppetlabs.com"
 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'
 
 #An example of using a specific forge module version instead of latest
 #Notice the addition of single quotes
@@ -14,15 +19,18 @@ mod "puppetlabs/concat", :latest
 # 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 'hiera',
-#  :git => 'https://github.com/hunner/puppet-hiera',
-#  :tag => '1.3.1'
+mod 'hiera',
+  :git => 'https://github.com/hunner/puppet-hiera',
+  :tag => '1.3.1'
 
-#mod 'notifyme',
-#  :git => 'git://github.com/glarizza/puppet-notifyme',
-#  :ref => '50c01703b2e3e352520a9a2271ea4947fe17a51f'
+mod 'gitlab',
+  :git => 'https://github.com/vshn/puppet-gitlab',
+  :ref => '00397b86dfb3487d9df768cbd3698d362132b5bf'
 
-#mod 'profiles',
-#  :git => 'git://github.com/glarizza/puppet-profiles',
-#  :ref => '3611ae4253ff01762f9bda1d93620edf8f9a3b22'
+mod 'r10k',
+  :git => 'https://github.com/acidprime/r10k',
+  :tag => 'v3.1.1'
 
+mod 'gms',
+  :git    => 'https://github.com/npwalker/abrader-gms',
+  :branch => 'gitlab_disable_ssl_verify_support'