Bump modules

This commit is contained in:
Will Farrington 2013-03-05 17:35:51 -08:00
parent ccc38151af
commit 8088edd47f
11 changed files with 16 additions and 16 deletions

View file

@ -13,7 +13,7 @@ end
# Includes many of our custom types and providers, as well as global
# config. Required.
github "boxen", "1.0.2"
github "boxen", "1.2.0"
# Core modules for a basic development environment. You can replace
# some/most of these if you want, but it's not recommended.
@ -21,13 +21,13 @@ github "boxen", "1.0.2"
github "dnsmasq", "1.0.0"
github "gcc", "1.0.0"
github "git", "1.0.0"
github "homebrew", "1.0.0"
github "homebrew", "1.1.0"
github "hub", "1.0.0"
github "inifile", "0.9.0", :repo => "cprice-puppet/puppetlabs-inifile"
github "nginx", "1.0.0"
github "nginx", "1.1.0"
github "nodejs", "1.0.0"
github "nvm", "1.0.0"
github "ruby", "1.0.0"
github "ruby", "3.1.0"
github "stdlib", "3.0.0", :repo => "puppetlabs/puppetlabs-stdlib"
github "sudo", "1.0.0"

View file

@ -1,7 +1,7 @@
GITHUBTARBALL
remote: boxen/puppet-boxen
specs:
boxen (1.0.2)
boxen (1.2.0)
GITHUBTARBALL
remote: boxen/puppet-dnsmasq
@ -21,7 +21,7 @@ GITHUBTARBALL
GITHUBTARBALL
remote: boxen/puppet-homebrew
specs:
homebrew (1.0.0)
homebrew (1.1.0)
GITHUBTARBALL
remote: boxen/puppet-hub
@ -31,7 +31,7 @@ GITHUBTARBALL
GITHUBTARBALL
remote: boxen/puppet-nginx
specs:
nginx (1.0.0)
nginx (1.1.0)
GITHUBTARBALL
remote: boxen/puppet-nodejs
@ -46,7 +46,7 @@ GITHUBTARBALL
GITHUBTARBALL
remote: boxen/puppet-ruby
specs:
ruby (1.0.0)
ruby (3.1.0)
GITHUBTARBALL
remote: boxen/puppet-sudo
@ -64,17 +64,17 @@ GITHUBTARBALL
stdlib (3.0.0)
DEPENDENCIES
boxen (= 1.0.2)
boxen (= 1.2.0)
dnsmasq (= 1.0.0)
gcc (= 1.0.0)
git (= 1.0.0)
homebrew (= 1.0.0)
homebrew (= 1.1.0)
hub (= 1.0.0)
inifile (= 0.9.0)
nginx (= 1.0.0)
nginx (= 1.1.0)
nodejs (= 1.0.0)
nvm (= 1.0.0)
ruby (= 1.0.0)
ruby (= 3.1.0)
stdlib (= 3.0.0)
sudo (= 1.0.0)

View file

@ -1,4 +1,4 @@
upstream <%= name %>.dev {
upstream <%= server_name %> {
server unix:<%= scope.lookupvar "boxen::config::socketdir" %>/<%= name %>;
}
@ -6,14 +6,14 @@ server {
access_log <%= scope.lookupvar "nginx::config::logdir" %>/<%= name %>.access.log main;
listen 80;
root <%= scope.lookupvar "boxen::config::srcdir" %>/<%= name %>/public;
server_name <%= name %>.dev;
server_name <%= server_name %>;
client_max_body_size 50M;
error_page 500 502 503 504 /50x.html;
if ($host ~* "www") {
rewrite ^(.*)$ http://<%= name %>.dev$1 permanent;
rewrite ^(.*)$ http://<%= server_name %>$1 permanent;
break;
}
@ -31,7 +31,7 @@ server {
}
if (!-f $request_filename) {
proxy_pass http://<%= name %>.dev;
proxy_pass http://<%= server_name %>;
break;
}
}

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.