Commit graph

300 commits

Author SHA1 Message Date
Adam Ochonicki
f62b84f987 Merge pull request #353 from createdbypete/update-puppetfile-and-gems
Add missing Xquartz dependency
2013-07-13 15:49:20 -07:00
Peter Rhoades
b0931f1847 Adding Xquartz missing dependency for Ruby module 2013-07-13 23:13:49 +01:00
Peter Rhoades
264f007260 Quick update to std lib 2013-07-13 23:12:39 +01:00
Adam Ochonicki
1b0b14b072 Merge pull request #348 from createdbypete/update-puppetfile-and-gems
Update puppetfile and gems
2013-07-13 09:43:43 -07:00
Peter Rhoades
0579dad1ae Update Boxen Gem version to latest 2013-07-12 09:24:41 +01:00
Peter Rhoades
79672cb570 Updating Puppetfile module versions with latest 2013-07-12 09:14:28 +01:00
Peter Rhoades
bdfb8ca441 Removing redirect for www. subdomain, seems unnecessary 2013-07-10 17:40:05 +01:00
Peter Rhoades
c0b00070ea Listen on wildcard (*) subdomain 2013-07-10 17:39:55 +01:00
Adam Ochonicki
4886c59623 Cache cprice404/puppetlabs-inifile 2013-07-08 21:51:52 -04:00
Adam Ochonicki
5f03f244da Merge pull request #334 from indirect/master
use gem list -i
2013-07-06 10:15:36 -07:00
Andre Arko
3ea3fc01b3 use gem list -i 2013-07-06 10:06:26 -07:00
Adam Ochonicki
a260b6f6b0 Bundler ~> 1.3.0 check
Fixes #79
2013-07-06 11:28:07 -04:00
Rafael Mendonça França
dff3759b27 ✂️ 2013-07-06 00:23:21 -03:00
Rafael Mendonça França
6912865db8 Merge pull request #331 from createdbypete/nginx/config-try-files
Changing nginx template to use try_files
2013-07-05 07:53:52 -07:00
Peter Rhoades
38e7cc2194 Heavy handed removal of if block, this is not related to try_files addition 2013-07-05 15:46:53 +01:00
Peter Rhoades
ea7e1d5cdc Changing nginx template to use try_files 2013-07-05 15:17:19 +01:00
Adam Ochonicki
74e896803c Merge pull request #327 from pcasaretto/silence-warnings
Change nginx.conf.erb to silence warnings
2013-07-03 08:55:37 -07:00
Paulo L F Casaretto
6529283e81 Change nginx.conf.erb to silence warnings
server_name without '@' was causing deprecation warnings.
2013-07-03 12:46:29 -03:00
Adam Ochonicki
a7c15e40ab Merge pull request #303 from haelmy/master
Proposal to fix https://github.com/boxen/our-boxen/issues/266
2013-06-30 19:36:03 -07:00
Adam Ochonicki
28b38ab19d Update puppet-inifile location in readme 2013-06-29 11:02:44 -04:00
Adam Ochonicki
ffc2d544ac Update puppet-inifile repo location 2013-06-29 10:24:00 -04:00
Rafael Mendonça França
929ba27365 Merge pull request #251 from porvak/feature/fix-nuke-flags
nuke script not using receipts or gitconfig flags
2013-06-24 19:58:40 -07:00
Rafael Mendonça França
b05b5b0baf Revert "Merge pull request #311 from smcnabb/master"
This reverts commit 40de1e40f3, reversing
changes made to 206dee9965.

Reason: This make harder to override the global version if it is
required for someone.

See https://github.com/boxen/our-boxen/pull/311#issuecomment-19719152
2013-06-19 19:22:36 -03:00
Rafael Mendonça França
40de1e40f3 Merge pull request #311 from smcnabb/master
Set the global node version in the site manifest
2013-06-19 11:55:37 -07:00
Stephen McNabb
2ce9f444f4 Set the global node version in the site manifest 2013-06-19 11:34:31 -07:00
Rafael Mendonça França
206dee9965 Merge pull request #310 from benja-M-1/master
Replace dashes by underscores when generating personal manifest
2013-06-18 15:37:06 -07:00
Benjamin Grandfond
38306c8511 Add note about GitHub usernames with dashes in README 2013-06-14 04:12:06 +02:00
Benjamin Grandfond
e3b245f102 Replace dashes by underscores in GitHub usernames 2013-06-14 04:06:32 +02:00
Adam Ochonicki
5d81900bea Update line highlighting 2013-06-11 17:19:40 -03:00
Adam Ochonicki
feb7b284f6 Merge pull request #305 from rafaelfranca/rm-fix-repository-clone
Use the boxen-git-credential for all repositories clones.
2013-06-11 11:57:16 -07:00
Rafael Mendonça França
4cf5876a7c Use the boxen-git-credential for all repositories clones.
This is required since puppet run all the comands as root and the
credential config is only present on the user land.

The lack of this configuration is making clones using https to not
work since the credential is not present for the root.

Closes #286
2013-06-11 14:32:40 -03:00
haelmy
13d6f4d22f adds source folder for librarian-puppet git source cache 2013-06-09 14:22:37 +02:00
Adam Ochonicki
e736220c84 Merge pull request #283 from adamnbowen/patch-1
Fix typo: 1.0.5 -> 1.1.0
2013-05-20 08:01:37 -07:00
Adam Bowen
b39cff5735 Fix typo: 1.0.5 -> 1.1.0
Code says `github "java",     "1.1.0"`, but documentation says "1.0.5", so I fixed it.
2013-05-20 11:00:21 -04:00
Adam Ochonicki
3e3b928dc5 Merge pull request #281 from sclm/patch-1
Fix the line numbers for the variable highlighting in docs
2013-05-17 14:56:09 -07:00
Stephen McMillen
bd01a1e6b9 Fix the line numbers for the variable highlighting. 2013-05-17 17:54:33 -03:00
Adam Ochonicki
f57089f589 Merge pull request #274 from mdelagralfo/github-enterprise
Github enterprise config and docs
2013-05-15 12:24:15 -07:00
Adam Ochonicki
3fe86022b6 Put a space in this 2013-05-13 21:10:27 -03:00
Morgan Delagrange
90837b5849 adding docs for Github Enterprise users 2013-05-13 16:13:46 -05:00
Morgan Delagrange
acf13e6e2d adding GitHub Enterprise variables to Boxen config 2013-05-13 15:54:24 -05:00
Adam Ochonicki
e83ac30751 Alpha sort 2013-05-11 20:43:09 -03:00
Adam Ochonicki
419688a0bb Some readme consistency 2013-05-11 19:19:29 -03:00
Adam Ochonicki
bff779bc3d Update to chown staff to be consistent with script.sh. Fixes #152. 2013-05-11 11:19:03 -03:00
Adam Ochonicki
63386bb66a Merge pull request #241 from mattdbridges/add-fde-tip
Update readme with note about no-fde option
2013-05-09 05:46:05 -07:00
Adam Ochonicki
d1a806e421 Update nodejs version in readme 2013-05-08 23:23:42 -03:00
Adam Ochonicki
6527d53ec0 Merge pull request #260 from sankage/puppet-updates
update puppetfile to latest module versions
2013-05-08 19:22:40 -07:00
David Briggs
ee2d94256a update puppetfile and readme to latest versions 2013-05-08 22:17:47 -04:00
Adam Ochonicki
d11c57e9f3 Merge pull request #249 from evilensky/master
remove "get" from "to get bootstrap"
2013-05-08 19:03:22 -07:00
Adam Ochonicki
7cef7ae2ef Merge pull request #256 from wallace/master
.projects should be ignored by default
2013-05-08 10:42:10 -07:00
Will Farrington
5c339675c8 Merge pull request #259 from sankage/outdated-gemfile
update gemfile to use current boxen gem
2013-04-28 17:57:55 -07:00