diff --git a/Puppetfile b/Puppetfile index 69c4976..21bbc96 100644 --- a/Puppetfile +++ b/Puppetfile @@ -53,6 +53,7 @@ github "xquartz", "1.2.0" # Optional/custom modules. There are tons available at # https://github.com/boxen. -github "osx", "2.7.0" -github "brewcask", "0.0.4.rc2", :repo => "hanjianwei/puppet-brewcask" -github "dotfiles", "0.0.9", :repo => "hanjianwei/puppet-dotfiles" +github "osx", "2.7.0" +github "brewcask", "0.0.4.rc2", :repo => "hanjianwei/puppet-brewcask" +github "dotfiles", "0.0.9", :repo => "hanjianwei/puppet-dotfiles" +github "python", "0.0.2", :repo => "hanjianwei/puppet-python" diff --git a/Puppetfile.lock b/Puppetfile.lock index ea1f009..db6ce6e 100644 --- a/Puppetfile.lock +++ b/Puppetfile.lock @@ -69,6 +69,11 @@ GITHUBTARBALL homebrew (1.9.5.rc2) GITHUBTARBALL + remote: hanjianwei/puppet-python + specs: + python (0.0.2) + +GITHUBTARBALL remote: puppetlabs/puppetlabs-inifile specs: inifile (1.1.3) @@ -96,6 +101,7 @@ DEPENDENCIES openssl (= 1.0.0) osx (= 2.7.0) pkgconfig (= 1.0.0) + python (= 0.0.2) repository (= 2.3.0) ruby (= 8.1.2) stdlib (= 4.3.2) diff --git a/hiera/users/hanjianwei.yaml b/hiera/users/hanjianwei.yaml index ce9a477..e1824b6 100644 --- a/hiera/users/hanjianwei.yaml +++ b/hiera/users/hanjianwei.yaml @@ -1,4 +1,5 @@ ruby::global::version: "2.1.2" nodejs::global::version: "v0.10" +python::global::version: "2.7.8" boxen::config::homebrewdir: "/usr/local" dotfiles::configdir: "/Users/%{::boxen_user}/Dropbox/dotfiles" diff --git a/manifests/site.pp b/manifests/site.pp index 63dac53..a938603 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -64,11 +64,17 @@ node default { include nodejs::v0_10 include nodejs::global - # default ruby versions + # ruby versions ruby::version { '1.9.3': } ruby::version { '2.1.2': } include ruby::global + # python versions + python::version { '2.7.8': } + python::version { '3.4.1': } + python::version { 'pypy-2.3.1': } + include python::global + file { "${boxen::config::srcdir}/our-boxen": ensure => link, target => $boxen::config::repodir