Commit graph

434 commits

Author SHA1 Message Date
Mark Tareshawty
975aac8914 added note about clang error and workaround 2014-03-23 12:58:26 -04:00
Mark Tareshawty
a551f3275b updated ruby deps 2014-03-23 12:49:03 -04:00
Rafael Mendonça França
0b977dd07d Merge pull request #535 from mattr-/patch-1
Remove unneeded code from the MySQL example
2014-03-19 15:59:07 -05:00
Matt Rogers
f5f7654f2d Remove unneeded code from the MySQL example
The `boxen?` method isn't used anywhere in the file. Remove it so that there's less code for people to copy and paste and to generate less confusion as to why there's a method there that doesn't need to be there.
2014-03-19 10:13:47 -05:00
Peter Rhoades
edb6425af4 Amend placeholder file extension
Fixes #534
2014-03-19 09:17:17 +00:00
David Goodlad
e9d806c7fe Merge pull request #523 from boxen/revert-to-puppet-go-1-1-0
Revert to puppet-go 1.1.0
2014-03-15 17:34:49 -07:00
Stepan Stipl
8711268017 Fix for GNU sed 2014-03-16 00:32:43 +00:00
Rafael Mendonça França
9bd5582289 Merge pull request #529 from Ledej/fix-sync
Fix the `script/sync` command
2014-03-13 21:20:33 -03:00
Pierre Dulac
4ccf33b85e Use the nodenv layout instead of the old nvm one 2014-03-14 01:11:13 +01:00
David Goodlad
071130c06c Revert to puppet-go 1.1.0
This upgrade to 2.0.1 was overlooked when I merged #519, and breaks
things for people who use zsh (see boxen/puppet-go#8).
2014-03-02 17:33:51 +13:00
David Goodlad
4e1adf3fa4 Merge pull request #519 from boxen/module-data
Update to Boxen 3.3.8
2014-02-28 11:38:38 +13:00
Peter Rhoades
a93e178f6d Bumps Boxen module back down to 3.3.8
… for now!
2014-02-22 10:55:56 +00:00
Peter Rhoades
9bd1af4a63 Use Ruby version aliases 2014-02-22 10:53:47 +00:00
Peter Rhoades
575cadf601 Updates Ruby version definitions 2014-02-20 15:21:47 +00:00
Peter Rhoades
0c2b827bd5 Placeholder hiera file 2014-02-20 15:12:18 +00:00
Peter Rhoades
37fcc2d61b Bumping all modules and including module-data 2014-02-20 15:05:22 +00:00
Rafael Mendonça França
7e0fadf42d Merge pull request #511 from AnneTheAgile/494-fix-doc
494 fix doc to be friendly for this lady to read
2014-02-03 11:59:34 -08:00
cantique
b9eb862fa2 Remove commit from other virtual branch. Revert "add core.excludesfiles to configs deleted."
This reverts commit 0637cb7608.
2014-02-02 18:34:47 -05:00
cantique
2135ee2ce1 Change acronym to the nicer What. 2014-02-02 18:29:55 -05:00
cantique
0637cb7608 add core.excludesfiles to configs deleted. 2014-02-02 11:46:34 -05:00
Rafael Mendonça França
a4304d4da6 Merge pull request #496 from viddo/bump-dnsmasq-to-v1.0.1
Bump dnsmasq to v1.0.1
2014-01-13 15:47:42 -08:00
Nicklas Gummesson
6e798e56f5 Update Puppetfile.lock
$  bundle exec librarian-puppet install
This also removed the older cache version, so replacing it with the new
tar.gz file
2014-01-14 00:40:48 +01:00
Nicklas Gummesson
f80a4b735e Bump dnsmasq to v1.0.1 2014-01-14 00:26:36 +01:00
Adam Ochonicki
04ac6a5b6f Merge pull request #490 from jjasghar/patch-1
Update README.md
2014-01-01 13:12:46 -08:00
JJ Asghar
4b14611313 Update README.md
I found a superfluous space, and also because you are _in_ the directories you need to `./script/boxen` each time.
2014-01-01 13:12:55 -06:00
Adam Ochonicki
ae7b1dffbe OSX -> OS X 2013-12-29 12:41:40 -05:00
Adam Ochonicki
e1f2d125f2 Merge pull request #485 from afeld/patch-1
Add XCode instructions for Mavericks
2013-12-29 09:40:48 -08:00
Aidan Feldman
e644595ef1 update XCode instructions re: boxen-web 2013-12-29 00:14:43 -06:00
Rafael Mendonça França
d492477da4 Merge pull request #489 from johnbellone/patch-2
Update script/bootstrap sudo to pass environment variables.
2013-12-27 08:17:30 -08:00
e226e2cf85 Revert "Add gemrc dotfile"
This reverts commit 233a8ea457.  boxen already
manages the .gemrc file
2013-12-26 15:46:38 -05:00
6aa88e7f57 Install heroku tools 2013-12-26 15:45:52 -05:00
233a8ea457 Add gemrc dotfile 2013-12-26 14:43:42 -05:00
1876520edf Add sublime text 2013-12-26 14:43:35 -05:00
John Bellone
79a74a6555 Update script/bootstrap sudo to pass environment variables.
When executing a boxen run from inside the corporate firewall we need to pass
proxies through to sudo so that bundler will be installed properly as root.
2013-12-26 12:49:03 -05:00
5968579b5f Add custom zsh folder 2013-12-23 11:07:37 -05:00
6d1c3aa64d Update whatpulse 2013-12-23 10:59:45 -05:00
Aidan Feldman
65e9a26852 add xcode instructions for mavericks 2013-12-22 00:58:55 -05:00
David Goodlad
20e241539a Merge pull request #481 from grosser/grosser/fetch
remove unused variable
2013-12-18 15:52:24 -08:00
grosser
982d687ce6 remove unused variable 2013-12-18 15:46:19 -08:00
David Goodlad
ffde15f0c9 Merge pull request #478 from mattr-/clarify-install
Clarify the installation steps after bootstrapping
2013-12-12 20:28:39 -08:00
Adam Ochonicki
717ea347ce Merge pull request #477 from mattr-/explain-repo-location
Clarify where to create the new git repo.
2013-12-12 06:29:17 -08:00
Matt Rogers
7e186198ef Clarify the installation steps after bootstrapping
Make it clearer on how to install a boxen from the command line after the
bootstrapping steps are done.
2013-12-11 21:58:52 -06:00
Matt Rogers
7b529c00d5 Clarify where to create the new git repo.
Be more explicit about where the new repo should be located. It's much
easier to set up a repo on the internet. This was implied before and now
it's explicit.

The first time I helped a colleague set this up, we used a local repo.
Since we didn't know what we were doing, we screwed it up pretty badly.
This bit of text might allow others not to make the same mistake we did.
2013-12-11 21:26:54 -06:00
fcdacd2fa3 Update modules 2013-12-10 00:38:02 -05:00
f845d74dd2 Hold on libreoffice 2013-12-10 00:24:38 -05:00
27f80cb28d Merge branch 'master' of https://github.com/boxen/our-boxen 2013-12-10 00:21:09 -05:00
Will Farrington
c799af5869 Merge pull request #475 from seanknox/master
Unbreak boxen-git-credential on 10.8 systems
2013-12-09 12:55:34 -08:00
Sean Knox
eec889719e Short term hack to unbreak boxen-git-credential on 10.8 systems 2013-12-09 11:57:40 -08:00
Will Farrington
c1d35b99e4 Merge pull request #471 from indirect/master
ensure bootstrap uses system ruby
2013-12-05 16:10:07 -08:00
Andre Arko
7c0f1c9086 set shebang in gem bins to system ruby 2013-12-05 16:04:14 -08:00