Merge pull request #366 from createdbypete/update-puppetfile

Updating to latest available Puppet module versions
This commit is contained in:
Will Farrington 2013-07-23 13:02:57 -07:00
commit 019538bf79
16 changed files with 18 additions and 18 deletions

View file

@ -1,6 +1,6 @@
source "https://rubygems.org"
gem "boxen", "~> 1.4"
gem "boxen", "~> 1.5"
gem "open4", "~> 1.3"
group :development do

View file

@ -7,7 +7,7 @@ GEM
json (~> 1.4)
nokogiri (>= 1.4.4)
uuidtools (~> 2.1)
boxen (1.4.2)
boxen (1.5.2)
ansi (~> 1.4)
hiera (~> 1.0)
highline (~> 1.6)
@ -43,10 +43,10 @@ GEM
multi_json (~> 1.3)
netrc (~> 0.7.7)
open4 (1.3.0)
puppet (3.2.2)
puppet (3.2.3)
facter (~> 1.6)
hiera (~> 1.0)
rgen (~> 0.6)
rgen (~> 0.6.5)
rbvmomi (1.6.0)
builder
nokogiri (>= 1.4.1)
@ -61,7 +61,7 @@ PLATFORMS
DEPENDENCIES
aws-sdk
boxen (~> 1.4)
boxen (~> 1.5)
net-ssh
open4 (~> 1.3)
rbvmomi

View file

@ -13,7 +13,7 @@ end
# Includes many of our custom types and providers, as well as global
# config. Required.
github "boxen", "2.3.6"
github "boxen", "3.0.1"
# Core modules for a basic development environment. You can replace
# some/most of these if you want, but it's not recommended.
@ -22,8 +22,8 @@ github "autoconf", "1.0.0"
github "dnsmasq", "1.0.0"
github "gcc", "2.0.1"
github "git", "1.2.5"
github "homebrew", "1.2.1"
github "hub", "1.0.0"
github "homebrew", "1.4.1"
github "hub", "1.0.3"
github "inifile", "1.0.0", :repo => "puppetlabs/puppetlabs-inifile"
github "nginx", "1.4.2"
github "nodejs", "3.2.8"

View file

@ -6,7 +6,7 @@ GITHUBTARBALL
GITHUBTARBALL
remote: boxen/puppet-boxen
specs:
boxen (2.3.6)
boxen (3.0.1)
GITHUBTARBALL
remote: boxen/puppet-dnsmasq
@ -26,12 +26,12 @@ GITHUBTARBALL
GITHUBTARBALL
remote: boxen/puppet-homebrew
specs:
homebrew (1.2.1)
homebrew (1.4.1)
GITHUBTARBALL
remote: boxen/puppet-hub
specs:
hub (1.0.0)
hub (1.0.3)
GITHUBTARBALL
remote: boxen/puppet-nginx
@ -80,12 +80,12 @@ GITHUBTARBALL
DEPENDENCIES
autoconf (= 1.0.0)
boxen (= 2.3.6)
boxen (= 3.0.1)
dnsmasq (= 1.0.0)
gcc (= 2.0.1)
git (= 1.2.5)
homebrew (= 1.2.1)
hub (= 1.0.0)
homebrew (= 1.4.1)
hub (= 1.0.3)
inifile (= 1.0.0)
nginx (= 1.4.2)
nodejs (= 3.2.8)

View file

@ -5,7 +5,7 @@ require gcc
Exec {
group => 'staff',
logoutput => on_failure,
user => $luser,
user => $boxen_user,
path => [
"${boxen::config::home}/rbenv/shims",
@ -20,13 +20,13 @@ Exec {
environment => [
"HOMEBREW_CACHE=${homebrew::config::cachedir}",
"HOME=/Users/${::luser}"
"HOME=/Users/${::boxen_user}"
]
}
File {
group => 'staff',
owner => $luser
owner => $boxen_user
}
Package {

View file

@ -8,7 +8,7 @@ class people::jbarnette {
include emacs # requires emacs module in Puppetfile
include sparrow # requires sparrow module in Puppetfile
$home = "/Users/${::luser}"
$home = "/Users/${::boxen_user}"
$my = "${home}/my"
$dotfiles = "${my}/dotfiles"

Binary file not shown.

BIN
vendor/cache/boxen-1.5.2.gem vendored Normal file

Binary file not shown.

Binary file not shown.

BIN
vendor/cache/puppet-3.2.3.gem vendored Normal file

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.