Commit 820fc92aa1863b791512dd94598b4be335a4d109

Authored by Jianwei Han
1 parent f252dc01a0
Exists in master

Install Homebrew in standard location

Showing 3 changed files with 7 additions and 18 deletions Side-by-side Diff

... ... @@ -41,7 +41,7 @@
41 41 github "dnsmasq", "1.0.1"
42 42 github "gcc", "2.0.101"
43 43 github "git", "2.4.0"
44   -github "homebrew", "1.9.4"
  44 +github "homebrew", "1.9.5.rc", :repo => "hanjianwei/puppet-homebrew"
45 45 github "hub", "1.3.0"
46 46 github "inifile", "1.0.3", :repo => "puppetlabs/puppetlabs-inifile"
47 47 github "nginx", "1.4.3"
... ... @@ -19,11 +19,6 @@
19 19 git (2.4.0)
20 20  
21 21 GITHUBTARBALL
22   - remote: boxen/puppet-homebrew
23   - specs:
24   - homebrew (1.9.4)
25   -
26   -GITHUBTARBALL
27 22 remote: boxen/puppet-hub
28 23 specs:
29 24 hub (1.3.0)
... ... @@ -89,6 +84,11 @@
89 84 dotfiles (0.0.6)
90 85  
91 86 GITHUBTARBALL
  87 + remote: hanjianwei/puppet-homebrew
  88 + specs:
  89 + homebrew (1.9.5.rc)
  90 +
  91 +GITHUBTARBALL
92 92 remote: puppetlabs/puppetlabs-inifile
93 93 specs:
94 94 inifile (1.0.3)
... ... @@ -110,7 +110,7 @@
110 110 dotfiles (= 0.0.6)
111 111 gcc (= 2.0.101)
112 112 git (= 2.4.0)
113   - homebrew (= 1.9.4)
  113 + homebrew (= 1.9.5.rc)
114 114 hub (= 1.3.0)
115 115 inifile (= 1.0.3)
116 116 module-data (= 0.0.3)
1 1 require boxen::environment
2 2 require homebrew
3   -require gcc
4 3  
5 4 Exec {
6 5 group => 'staff',
7 6  
... ... @@ -53,10 +52,8 @@
53 52  
54 53 node default {
55 54 # core modules, needed for most things
56   - include dnsmasq
57 55 include git
58 56 include hub
59   - include nginx
60 57  
61 58 # fail if FDE is not enabled
62 59 if $::root_encrypted == 'no' {
63 60  
... ... @@ -69,16 +66,8 @@
69 66  
70 67 # default ruby versions
71 68 ruby::version { '1.9.3': }
72   - ruby::version { '2.0.0': }
73 69 ruby::version { '2.1.2': }
74 70 include ruby::global
75   -
76   - # common, useful packages
77   - package {
78   - [
79   - 'ack'
80   - ]:
81   - }
82 71  
83 72 file { "${boxen::config::srcdir}/our-boxen":
84 73 ensure => link,