Commit graph

275 commits

Author SHA1 Message Date
Yossef Mendelssohn
97c386a836 undo accidental changes to master
This reverts commits 5b4b7223c2,
fe2933519c, and
9f2cfbaed0.

This gets us back to 11ea991577.
2013-08-25 13:03:44 -04:00
Yossef Mendelssohn
5b4b7223c2 also turn off pulling for service manipulation 2013-08-25 13:00:17 -04:00
Yossef Mendelssohn
fe2933519c switch around the no-pull arg check 2013-08-25 12:59:03 -04:00
Yossef Mendelssohn
9f2cfbaed0 add more args to turn off pulling 2013-08-25 12:55:43 -04:00
Peter Rhoades
11ea991577 Version bump to Puppetfile modules 2013-08-22 10:05:39 +01:00
Peter Rhoades
a74f923d12 Bump Boxen Gem dependencies 2013-08-22 09:59:45 +01:00
Peter Rhoades
c0c50e98e4 Fixes #379, adding directory type reference 2013-08-13 21:19:36 +01:00
Peter Rhoades
e3515ba398 Updating nodejs and ruby modules 2013-08-01 18:13:39 +01:00
Will Farrington
019538bf79 Merge pull request #366 from createdbypete/update-puppetfile
Updating to latest available Puppet module versions
2013-07-23 13:02:57 -07:00
Peter Rhoades
cc38226211 Missed Homebrew module update to 1.4.1 2013-07-23 20:34:20 +01:00
Peter Rhoades
1c273958b8 Boxen gem now v1.5 2013-07-23 10:35:02 +01:00
Peter Rhoades
1b3b34eb71 Updating to ::boxen_user variable in anticipation of ::luser deprecation 2013-07-22 23:01:42 +01:00
Peter Rhoades
fa6b9c7200 Update Puppet modules with the latest available 2013-07-22 22:41:53 +01:00
Will Farrington
f7e1bcaab3 Don't put our xcrun shim on path for 10.9 2013-07-19 12:36:27 -07:00
Will Farrington
9fc4476a7d Clean up inifile stuff from #362 2013-07-19 12:35:25 -07:00
Will Farrington
6c0f274bb2 Merge pull request #362 from apenney/inifile-change
We've moved the inifile module!
2013-07-19 12:33:12 -07:00
Will Farrington
ba16321be2 Merge pull request #363 from createdbypete/update-puppetfile
Updating Puppet modules
2013-07-19 11:52:33 -07:00
Peter Rhoades
191308ed17 Updating Puppet modules 2013-07-18 21:29:17 +01:00
Ashley Penney
5f6517db3b We've moved the inifile module! 2013-07-18 13:02:14 -04:00
Will Farrington
4af8fb303d Merge pull request #358 from createdbypete/update-ruby-module
Update Ruby module
2013-07-15 09:18:29 -07:00
Peter Rhoades
63b78e805b ✂️ 2013-07-15 10:18:18 +01:00
Peter Rhoades
e39cf2f1ca Updating Ruby module and including the required dependencies 2013-07-15 10:16:09 +01:00
Will Farrington
8d7cdd2854 Merge pull request #343 from createdbypete/projects/nginx-wildcard
Add Nginx wildcard subdomain to projects template
2013-07-14 23:26:12 -07:00
Will Farrington
314e63b4e7 Fix typo in Repository default require path 2013-07-14 10:49:12 -07:00
Will Farrington
0bd58027f7 Fix up cycle due to git class and updated home-brew module, fixes #354 2013-07-14 00:09:00 -07:00
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