diff --git a/Puppetfile b/Puppetfile index 1fdc2c3..2182650 100644 --- a/Puppetfile +++ b/Puppetfile @@ -13,23 +13,23 @@ end # Includes many of our custom types and providers, as well as global # config. Required. -github "boxen", "1.2.0" +github "boxen", "2.1.0" # Core modules for a basic development environment. You can replace # some/most of these if you want, but it's not recommended. -github "dnsmasq", "1.0.0" -github "gcc", "1.0.0" -github "git", "1.0.0" -github "homebrew", "1.1.2" -github "hub", "1.0.0" -github "inifile", "0.9.0", :repo => "cprice-puppet/puppetlabs-inifile" -github "nginx", "1.1.0" -github "nodejs", "1.0.0" -github "nvm", "1.0.0" -github "ruby", "3.1.0" -github "stdlib", "3.0.0", :repo => "puppetlabs/puppetlabs-stdlib" -github "sudo", "1.0.0" +github "repository", "2.0.2" +github "dnsmasq", "1.0.0" +github "gcc", "1.0.0" +github "git", "1.2.2" +github "homebrew", "1.1.2" +github "hub", "1.0.0" +github "inifile", "0.9.0", :repo => "cprice-puppet/puppetlabs-inifile" +github "nginx", "1.4.0" +github "nodejs", "2.2.0" +github "ruby", "4.1.0" +github "stdlib", "4.0.2", :repo => "puppetlabs/puppetlabs-stdlib" +github "sudo", "1.0.0" # Optional/custom modules. There are tons available at # https://github.com/boxen. diff --git a/Puppetfile.lock b/Puppetfile.lock index b8c3409..267634c 100644 --- a/Puppetfile.lock +++ b/Puppetfile.lock @@ -1,7 +1,7 @@ GITHUBTARBALL remote: boxen/puppet-boxen specs: - boxen (1.2.0) + boxen (2.1.0) GITHUBTARBALL remote: boxen/puppet-dnsmasq @@ -16,7 +16,7 @@ GITHUBTARBALL GITHUBTARBALL remote: boxen/puppet-git specs: - git (1.0.0) + git (1.2.2) GITHUBTARBALL remote: boxen/puppet-homebrew @@ -31,22 +31,22 @@ GITHUBTARBALL GITHUBTARBALL remote: boxen/puppet-nginx specs: - nginx (1.1.0) + nginx (1.4.0) GITHUBTARBALL remote: boxen/puppet-nodejs specs: - nodejs (1.0.0) + nodejs (2.2.0) GITHUBTARBALL - remote: boxen/puppet-nvm + remote: boxen/puppet-repository specs: - nvm (1.0.0) + repository (2.0.2) GITHUBTARBALL remote: boxen/puppet-ruby specs: - ruby (3.1.0) + ruby (4.1.0) GITHUBTARBALL remote: boxen/puppet-sudo @@ -61,20 +61,20 @@ GITHUBTARBALL GITHUBTARBALL remote: puppetlabs/puppetlabs-stdlib specs: - stdlib (3.0.0) + stdlib (4.0.2) DEPENDENCIES - boxen (= 1.2.0) + boxen (= 2.1.0) dnsmasq (= 1.0.0) gcc (= 1.0.0) - git (= 1.0.0) + git (= 1.2.2) homebrew (= 1.1.2) hub (= 1.0.0) inifile (= 0.9.0) - nginx (= 1.1.0) - nodejs (= 1.0.0) - nvm (= 1.0.0) - ruby (= 3.1.0) - stdlib (= 3.0.0) + nginx (= 1.4.0) + nodejs (= 2.2.0) + repository (= 2.0.2) + ruby (= 4.1.0) + stdlib (= 4.0.2) sudo (= 1.0.0) diff --git a/README.md b/README.md index b2b6ffd..3c7bff8 100644 --- a/README.md +++ b/README.md @@ -135,23 +135,23 @@ boxen repo (ex. /path/to/your-boxen/Puppetfile): # Core modules for a basic development environment. You can replace # some/most of these if you want, but it's not recommended. - github "dnsmasq", "1.0.0" - github "gcc", "1.0.0" - github "git", "1.0.0" - github "homebrew", "1.0.0" - github "hub", "1.0.0" - github "inifile", "0.9.0", :repo => "cprice-puppet/puppetlabs-inifile" - github "nginx", "1.0.0" - github "nodejs", "1.0.0" - github "nvm", "1.0.0" - github "ruby", "1.0.0" - github "stdlib", "3.0.0", :repo => "puppetlabs/puppetlabs-stdlib" - github "sudo", "1.0.0" + github "repository", "2.0.2" + github "dnsmasq", "1.0.0" + github "gcc", "1.0.0" + github "git", "1.2.2" + github "homebrew", "1.1.2" + github "hub", "1.0.0" + github "inifile", "0.9.0", :repo => "cprice-puppet/puppetlabs-inifile" + github "nginx", "1.4.0" + github "nodejs", "2.1.0" + github "ruby", "4.1.0" + github "stdlib", "4.0.2", :repo => "puppetlabs/puppetlabs-stdlib" + github "sudo", "1.0.0" # Optional/custom modules. There are tons available at # https://github.com/boxen. - github "java", "1.0.5" + github "java", "1.1.0" In the above snippet of a customized Puppetfile, the bottom line includes the Java module from Github using the tag "1.0.5" from the github repository @@ -167,7 +167,7 @@ and takes the name of the module, the version, and optional repo location: Now Puppet knows where to download the module from when you include it in your site.pp or mypersonal.pp file: # include the java module referenced in my Puppetfile with the line - # github "java", "1.0.5" + # github "java", "1.1.0" include java ### Node definitions diff --git a/manifests/site.pp b/manifests/site.pp index 32475b6..869dca2 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -54,7 +54,6 @@ node default { include git include hub include nginx - include nvm # fail if FDE is not enabled if $::root_encrypted == 'no' { @@ -62,9 +61,10 @@ node default { } # node versions - include nodejs::0-4 - include nodejs::0-6 - include nodejs::0-8 + include nodejs::v0_4 + include nodejs::v0_6 + include nodejs::v0_8 + include nodejs::v0_10 # default ruby versions include ruby::1_8_7 diff --git a/vendor/puppet/cache/boxen-puppet-boxen-1.2.0.tar.gz b/vendor/puppet/cache/boxen-puppet-boxen-1.2.0.tar.gz deleted file mode 100644 index 556e693..0000000 Binary files a/vendor/puppet/cache/boxen-puppet-boxen-1.2.0.tar.gz and /dev/null differ diff --git a/vendor/puppet/cache/boxen-puppet-boxen-2.1.0.tar.gz b/vendor/puppet/cache/boxen-puppet-boxen-2.1.0.tar.gz new file mode 100644 index 0000000..966d7a6 Binary files /dev/null and b/vendor/puppet/cache/boxen-puppet-boxen-2.1.0.tar.gz differ diff --git a/vendor/puppet/cache/boxen-puppet-git-1.0.0.tar.gz b/vendor/puppet/cache/boxen-puppet-git-1.0.0.tar.gz deleted file mode 100644 index 97bc98c..0000000 Binary files a/vendor/puppet/cache/boxen-puppet-git-1.0.0.tar.gz and /dev/null differ diff --git a/vendor/puppet/cache/boxen-puppet-git-1.2.2.tar.gz b/vendor/puppet/cache/boxen-puppet-git-1.2.2.tar.gz new file mode 100644 index 0000000..ab25304 Binary files /dev/null and b/vendor/puppet/cache/boxen-puppet-git-1.2.2.tar.gz differ diff --git a/vendor/puppet/cache/boxen-puppet-nginx-1.1.0.tar.gz b/vendor/puppet/cache/boxen-puppet-nginx-1.1.0.tar.gz deleted file mode 100644 index 2acbe28..0000000 Binary files a/vendor/puppet/cache/boxen-puppet-nginx-1.1.0.tar.gz and /dev/null differ diff --git a/vendor/puppet/cache/boxen-puppet-nginx-1.4.0.tar.gz b/vendor/puppet/cache/boxen-puppet-nginx-1.4.0.tar.gz new file mode 100644 index 0000000..d6d43ad Binary files /dev/null and b/vendor/puppet/cache/boxen-puppet-nginx-1.4.0.tar.gz differ diff --git a/vendor/puppet/cache/boxen-puppet-nodejs-1.0.0.tar.gz b/vendor/puppet/cache/boxen-puppet-nodejs-1.0.0.tar.gz deleted file mode 100644 index 093cc8e..0000000 Binary files a/vendor/puppet/cache/boxen-puppet-nodejs-1.0.0.tar.gz and /dev/null differ diff --git a/vendor/puppet/cache/boxen-puppet-nodejs-2.2.0.tar.gz b/vendor/puppet/cache/boxen-puppet-nodejs-2.2.0.tar.gz new file mode 100644 index 0000000..a81a64f Binary files /dev/null and b/vendor/puppet/cache/boxen-puppet-nodejs-2.2.0.tar.gz differ diff --git a/vendor/puppet/cache/boxen-puppet-repository-2.0.2.tar.gz b/vendor/puppet/cache/boxen-puppet-repository-2.0.2.tar.gz new file mode 100644 index 0000000..6ab4dc9 Binary files /dev/null and b/vendor/puppet/cache/boxen-puppet-repository-2.0.2.tar.gz differ diff --git a/vendor/puppet/cache/boxen-puppet-ruby-3.1.0.tar.gz b/vendor/puppet/cache/boxen-puppet-ruby-3.1.0.tar.gz deleted file mode 100644 index cd9f50c..0000000 Binary files a/vendor/puppet/cache/boxen-puppet-ruby-3.1.0.tar.gz and /dev/null differ diff --git a/vendor/puppet/cache/boxen-puppet-ruby-4.1.0.tar.gz b/vendor/puppet/cache/boxen-puppet-ruby-4.1.0.tar.gz new file mode 100644 index 0000000..b62a37e Binary files /dev/null and b/vendor/puppet/cache/boxen-puppet-ruby-4.1.0.tar.gz differ diff --git a/vendor/puppet/cache/puppetlabs-puppetlabs-stdlib-3.0.0.tar.gz b/vendor/puppet/cache/puppetlabs-puppetlabs-stdlib-3.0.0.tar.gz deleted file mode 100644 index 29f051e..0000000 Binary files a/vendor/puppet/cache/puppetlabs-puppetlabs-stdlib-3.0.0.tar.gz and /dev/null differ diff --git a/vendor/puppet/cache/puppetlabs-puppetlabs-stdlib-4.0.2.tar.gz b/vendor/puppet/cache/puppetlabs-puppetlabs-stdlib-4.0.2.tar.gz new file mode 100644 index 0000000..e2599ef Binary files /dev/null and b/vendor/puppet/cache/puppetlabs-puppetlabs-stdlib-4.0.2.tar.gz differ