Bump modules

Will Farrington
1 parent ccc38151af
Showing 11 changed files with 16 additions and 16 deletions Side-by-side 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
@@ -13,7 +13,7 @@
 # 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 "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"
  
 GITHUBTARBALL
   remote: boxen/puppet-boxen
   specs:
-    boxen (1.0.2)
+    boxen (1.2.0)
  
 GITHUBTARBALL
   remote: boxen/puppet-dnsmasq
@@ -21,7 +21,7 @@
 GITHUBTARBALL
   remote: boxen/puppet-homebrew
   specs:
-    homebrew (1.0.0)
+    homebrew (1.1.0)
  
 GITHUBTARBALL
   remote: boxen/puppet-hub
@@ -31,7 +31,7 @@
 GITHUBTARBALL
   remote: boxen/puppet-nginx
   specs:
-    nginx (1.0.0)
+    nginx (1.1.0)
  
 GITHUBTARBALL
   remote: boxen/puppet-nodejs
@@ -46,7 +46,7 @@
 GITHUBTARBALL
   remote: boxen/puppet-ruby
   specs:
-    ruby (1.0.0)
+    ruby (3.1.0)
  
 GITHUBTARBALL
   remote: boxen/puppet-sudo
  
  
  
@@ -64,17 +64,17 @@
     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)
-upstream <%= name %>.dev {
+upstream <%= server_name %> {
  server unix:<%= scope.lookupvar "boxen::config::socketdir" %>/<%= name %>;
 }
  
  
@@ -6,14 +6,14 @@
   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 @@
     }
  
     if (!-f $request_filename) {
-      proxy_pass http://<%= name %>.dev;
+      proxy_pass http://<%= server_name %>;
       break;
     }
   }
...	...	@@ -13,7 +13,7 @@
13	13	# Includes many of our custom types and providers, as well as global
14	14	# config. Required.
15	15
16		-github "boxen", "1.0.2"
	16	+github "boxen", "1.2.0"
17	17
18	18	# Core modules for a basic development environment. You can replace
19	19	# some/most of these if you want, but it's not recommended.
20	20
21	21
...	...	@@ -21,13 +21,13 @@
21	21	github "dnsmasq", "1.0.0"
22	22	github "gcc", "1.0.0"
23	23	github "git", "1.0.0"
24		-github "homebrew", "1.0.0"
	24	+github "homebrew", "1.1.0"
25	25	github "hub", "1.0.0"
26	26	github "inifile", "0.9.0", :repo => "cprice-puppet/puppetlabs-inifile"
27		-github "nginx", "1.0.0"
	27	+github "nginx", "1.1.0"
28	28	github "nodejs", "1.0.0"
29	29	github "nvm", "1.0.0"
30		-github "ruby", "1.0.0"
	30	+github "ruby", "3.1.0"
31	31	github "stdlib", "3.0.0", :repo => "puppetlabs/puppetlabs-stdlib"
32	32	github "sudo", "1.0.0"
33	33
1	1	GITHUBTARBALL
2	2	remote: boxen/puppet-boxen
3	3	specs:
4		- boxen (1.0.2)
	4	+ boxen (1.2.0)
5	5
6	6	GITHUBTARBALL
7	7	remote: boxen/puppet-dnsmasq
...	...	@@ -21,7 +21,7 @@
21	21	GITHUBTARBALL
22	22	remote: boxen/puppet-homebrew
23	23	specs:
24		- homebrew (1.0.0)
	24	+ homebrew (1.1.0)
25	25
26	26	GITHUBTARBALL
27	27	remote: boxen/puppet-hub
...	...	@@ -31,7 +31,7 @@
31	31	GITHUBTARBALL
32	32	remote: boxen/puppet-nginx
33	33	specs:
34		- nginx (1.0.0)
	34	+ nginx (1.1.0)
35	35
36	36	GITHUBTARBALL
37	37	remote: boxen/puppet-nodejs
...	...	@@ -46,7 +46,7 @@
46	46	GITHUBTARBALL
47	47	remote: boxen/puppet-ruby
48	48	specs:
49		- ruby (1.0.0)
	49	+ ruby (3.1.0)
50	50
51	51	GITHUBTARBALL
52	52	remote: boxen/puppet-sudo
53	53
54	54
55	55
...	...	@@ -64,17 +64,17 @@
64	64	stdlib (3.0.0)
65	65
66	66	DEPENDENCIES
67		- boxen (= 1.0.2)
	67	+ boxen (= 1.2.0)
68	68	dnsmasq (= 1.0.0)
69	69	gcc (= 1.0.0)
70	70	git (= 1.0.0)
71		- homebrew (= 1.0.0)
	71	+ homebrew (= 1.1.0)
72	72	hub (= 1.0.0)
73	73	inifile (= 0.9.0)
74		- nginx (= 1.0.0)
	74	+ nginx (= 1.1.0)
75	75	nodejs (= 1.0.0)
76	76	nvm (= 1.0.0)
77		- ruby (= 1.0.0)
	77	+ ruby (= 3.1.0)
78	78	stdlib (= 3.0.0)
79	79	sudo (= 1.0.0)
1		-upstream <%= name %>.dev {
	1	+upstream <%= server_name %> {
2	2	server unix:<%= scope.lookupvar "boxen::config::socketdir" %>/<%= name %>;
3	3	}
4	4
5	5
...	...	@@ -6,14 +6,14 @@
6	6	access_log <%= scope.lookupvar "nginx::config::logdir" %>/<%= name %>.access.log main;
7	7	listen 80;
8	8	root <%= scope.lookupvar "boxen::config::srcdir" %>/<%= name %>/public;
9		- server_name <%= name %>.dev;
	9	+ server_name <%= server_name %>;
10	10
11	11	client_max_body_size 50M;
12	12
13	13	error_page 500 502 503 504 /50x.html;
14	14
15	15	if ($host ~* "www") {
16		- rewrite ^(.*)$ http://<%= name %>.dev$1 permanent;
	16	+ rewrite ^(.*)$ http://<%= server_name %>$1 permanent;
17	17	break;
18	18	}
19	19
...	...	@@ -31,7 +31,7 @@
31	31	}
32	32
33	33	if (!-f $request_filename) {
34		- proxy_pass http://<%= name %>.dev;
	34	+ proxy_pass http://<%= server_name %>;
35	35	break;
36	36	}
37	37	}