Jianwei Han / my-boxen

Browse Code »

Commit 8088edd47fddd4975051b4c57cff1814a91f3620

Authored by Will Farrington 2013-03-06 09:35:51 +0800

1 parent ccc38151af

Bump modules

Showing 11 changed files with 16 additions and 16 deletions Inline Diff

Puppetfile
Puppetfile.lock
modules/projects/templates/shared/nginx.conf.erb
vendor/puppet/cache/boxen-puppet-boxen-1.0.2.tar.gz
vendor/puppet/cache/boxen-puppet-boxen-1.2.0.tar.gz
vendor/puppet/cache/boxen-puppet-homebrew-1.0.0.tar.gz
vendor/puppet/cache/boxen-puppet-homebrew-1.1.0.tar.gz
vendor/puppet/cache/boxen-puppet-nginx-1.0.0.tar.gz
vendor/puppet/cache/boxen-puppet-nginx-1.1.0.tar.gz
vendor/puppet/cache/boxen-puppet-ruby-1.0.0.tar.gz
vendor/puppet/cache/boxen-puppet-ruby-3.1.0.tar.gz

Puppetfile

Diff comments View file @ 8088edd

# This file manages Puppet module dependencies.	1	1	# This file manages Puppet module dependencies.
#	2	2	#
# It works a lot like Bundler. We provide some core modules by	3	3	# It works a lot like Bundler. We provide some core modules by
# default. This ensures at least the ability to construct a basic	4	4	# default. This ensures at least the ability to construct a basic
# environment.	5	5	# environment.
	6	6
def github(name, version, options = nil)	7	7	def github(name, version, options = nil)
options \|\|= {}	8	8	options \|\|= {}
options[:repo] \|\|= "boxen/puppet-#{name}"	9	9	options[:repo] \|\|= "boxen/puppet-#{name}"
mod name, version, :github_tarball => options[:repo]	10	10	mod name, version, :github_tarball => options[:repo]
end	11	11	end
	12	12
# Includes many of our custom types and providers, as well as global	13	13	# Includes many of our custom types and providers, as well as global
# config. Required.	14	14	# config. Required.
	15	15
github "boxen", "1.0.2"	16	16	github "boxen", "1.2.0"
	17	17
# Core modules for a basic development environment. You can replace	18	18	# Core modules for a basic development environment. You can replace
# some/most of these if you want, but it's not recommended.	19	19	# some/most of these if you want, but it's not recommended.
	20	20
github "dnsmasq", "1.0.0"	21	21	github "dnsmasq", "1.0.0"
github "gcc", "1.0.0"	22	22	github "gcc", "1.0.0"
github "git", "1.0.0"	23	23	github "git", "1.0.0"
github "homebrew", "1.0.0"	24	24	github "homebrew", "1.1.0"
github "hub", "1.0.0"	25	25	github "hub", "1.0.0"
github "inifile", "0.9.0", :repo => "cprice-puppet/puppetlabs-inifile"	26	26	github "inifile", "0.9.0", :repo => "cprice-puppet/puppetlabs-inifile"
github "nginx", "1.0.0"	27	27	github "nginx", "1.1.0"
github "nodejs", "1.0.0"	28	28	github "nodejs", "1.0.0"
github "nvm", "1.0.0"	29	29	github "nvm", "1.0.0"
github "ruby", "1.0.0"	30	30	github "ruby", "3.1.0"
github "stdlib", "3.0.0", :repo => "puppetlabs/puppetlabs-stdlib"	31	31	github "stdlib", "3.0.0", :repo => "puppetlabs/puppetlabs-stdlib"
github "sudo", "1.0.0"	32	32	github "sudo", "1.0.0"
	33	33

Puppetfile.lock

Diff comments View file @ 8088edd

GITHUBTARBALL	1	1	GITHUBTARBALL
remote: boxen/puppet-boxen	2	2	remote: boxen/puppet-boxen
specs:	3	3	specs:
boxen (1.0.2)	4	4	boxen (1.2.0)
	5	5
GITHUBTARBALL	6	6	GITHUBTARBALL
remote: boxen/puppet-dnsmasq	7	7	remote: boxen/puppet-dnsmasq
specs:	8	8	specs:
dnsmasq (1.0.0)	9	9	dnsmasq (1.0.0)
	10	10
GITHUBTARBALL	11	11	GITHUBTARBALL
remote: boxen/puppet-gcc	12	12	remote: boxen/puppet-gcc
specs:	13	13	specs:
gcc (1.0.0)	14	14	gcc (1.0.0)
	15	15
GITHUBTARBALL	16	16	GITHUBTARBALL
remote: boxen/puppet-git	17	17	remote: boxen/puppet-git
specs:	18	18	specs:
git (1.0.0)	19	19	git (1.0.0)
	20	20
GITHUBTARBALL	21	21	GITHUBTARBALL
remote: boxen/puppet-homebrew	22	22	remote: boxen/puppet-homebrew
specs:	23	23	specs:
homebrew (1.0.0)	24	24	homebrew (1.1.0)
	25	25
GITHUBTARBALL	26	26	GITHUBTARBALL
remote: boxen/puppet-hub	27	27	remote: boxen/puppet-hub
specs:	28	28	specs:
hub (1.0.0)	29	29	hub (1.0.0)
	30	30
GITHUBTARBALL	31	31	GITHUBTARBALL
remote: boxen/puppet-nginx	32	32	remote: boxen/puppet-nginx
specs:	33	33	specs:
nginx (1.0.0)	34	34	nginx (1.1.0)
	35	35
GITHUBTARBALL	36	36	GITHUBTARBALL
remote: boxen/puppet-nodejs	37	37	remote: boxen/puppet-nodejs
specs:	38	38	specs:
nodejs (1.0.0)	39	39	nodejs (1.0.0)
	40	40
GITHUBTARBALL	41	41	GITHUBTARBALL
remote: boxen/puppet-nvm	42	42	remote: boxen/puppet-nvm
specs:	43	43	specs:
nvm (1.0.0)	44	44	nvm (1.0.0)
	45	45
GITHUBTARBALL	46	46	GITHUBTARBALL
remote: boxen/puppet-ruby	47	47	remote: boxen/puppet-ruby
specs:	48	48	specs:
ruby (1.0.0)	49	49	ruby (3.1.0)
	50	50
GITHUBTARBALL	51	51	GITHUBTARBALL
remote: boxen/puppet-sudo	52	52	remote: boxen/puppet-sudo
specs:	53	53	specs:
sudo (1.0.0)	54	54	sudo (1.0.0)
	55	55
GITHUBTARBALL	56	56	GITHUBTARBALL
remote: cprice-puppet/puppetlabs-inifile	57	57	remote: cprice-puppet/puppetlabs-inifile
specs:	58	58	specs:
inifile (0.9.0)	59	59	inifile (0.9.0)
	60	60
GITHUBTARBALL	61	61	GITHUBTARBALL
remote: puppetlabs/puppetlabs-stdlib	62	62	remote: puppetlabs/puppetlabs-stdlib
specs:	63	63	specs:
stdlib (3.0.0)	64	64	stdlib (3.0.0)
	65	65
DEPENDENCIES	66	66	DEPENDENCIES
boxen (= 1.0.2)	67	67	boxen (= 1.2.0)
dnsmasq (= 1.0.0)	68	68	dnsmasq (= 1.0.0)
gcc (= 1.0.0)	69	69	gcc (= 1.0.0)
git (= 1.0.0)	70	70	git (= 1.0.0)
homebrew (= 1.0.0)	71	71	homebrew (= 1.1.0)
hub (= 1.0.0)	72	72	hub (= 1.0.0)
inifile (= 0.9.0)	73	73	inifile (= 0.9.0)
nginx (= 1.0.0)	74	74	nginx (= 1.1.0)

modules/projects/templates/shared/nginx.conf.erb

Diff comments View file @ 8088edd

upstream <%= name %>.dev {	1	1	upstream <%= server_name %> {
server unix:<%= scope.lookupvar "boxen::config::socketdir" %>/<%= name %>;	2	2	server unix:<%= scope.lookupvar "boxen::config::socketdir" %>/<%= name %>;
}	3	3	}
	4	4
server {	5	5	server {
access_log <%= scope.lookupvar "nginx::config::logdir" %>/<%= name %>.access.log main;	6	6	access_log <%= scope.lookupvar "nginx::config::logdir" %>/<%= name %>.access.log main;
listen 80;	7	7	listen 80;
root <%= scope.lookupvar "boxen::config::srcdir" %>/<%= name %>/public;	8	8	root <%= scope.lookupvar "boxen::config::srcdir" %>/<%= name %>/public;
server_name <%= name %>.dev;	9	9	server_name <%= server_name %>;
	10	10
client_max_body_size 50M;	11	11	client_max_body_size 50M;
	12	12
error_page 500 502 503 504 /50x.html;	13	13	error_page 500 502 503 504 /50x.html;
	14	14
if ($host ~* "www") {	15	15	if ($host ~* "www") {
rewrite ^(.*)$ http://<%= name %>.dev$1 permanent;	16	16	rewrite ^(.*)$ http://<%= server_name %>$1 permanent;
break;	17	17	break;
}	18	18	}
	19	19
location = /50x.html {	20	20	location = /50x.html {
root html;	21	21	root html;
}	22	22	}
	23	23
location / {	24	24	location / {
if (-f $request_filename/index.html) {	25	25	if (-f $request_filename/index.html) {
rewrite (.*) $1/index.html break;	26	26	rewrite (.*) $1/index.html break;
}	27	27	}
	28	28
if (-f $request_filename.html) {	29	29	if (-f $request_filename.html) {
rewrite (.*) $1.html break;	30	30	rewrite (.*) $1.html break;
}	31	31	}
	32	32
if (!-f $request_filename) {	33	33	if (!-f $request_filename) {
proxy_pass http://<%= name %>.dev;	34	34	proxy_pass http://<%= server_name %>;