diff --git a/Puppetfile b/Puppetfile index 284b33e..6f66dd9 100644 --- a/Puppetfile +++ b/Puppetfile @@ -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" diff --git a/Puppetfile.lock b/Puppetfile.lock index 4e7115f..0493d0b 100644 --- a/Puppetfile.lock +++ b/Puppetfile.lock @@ -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) diff --git a/modules/projects/templates/shared/nginx.conf.erb b/modules/projects/templates/shared/nginx.conf.erb index 2fdb37c..9acd8f4 100644 --- a/modules/projects/templates/shared/nginx.conf.erb +++ b/modules/projects/templates/shared/nginx.conf.erb @@ -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; } } diff --git a/vendor/puppet/cache/boxen-puppet-boxen-1.0.2.tar.gz b/vendor/puppet/cache/boxen-puppet-boxen-1.0.2.tar.gz deleted file mode 100644 index 75d4613..0000000 Binary files a/vendor/puppet/cache/boxen-puppet-boxen-1.0.2.tar.gz and /dev/null differ diff --git a/vendor/puppet/cache/boxen-puppet-boxen-1.2.0.tar.gz b/vendor/puppet/cache/boxen-puppet-boxen-1.2.0.tar.gz new file mode 100644 index 0000000..556e693 Binary files /dev/null and b/vendor/puppet/cache/boxen-puppet-boxen-1.2.0.tar.gz differ diff --git a/vendor/puppet/cache/boxen-puppet-homebrew-1.0.0.tar.gz b/vendor/puppet/cache/boxen-puppet-homebrew-1.0.0.tar.gz deleted file mode 100644 index bcac8eb..0000000 Binary files a/vendor/puppet/cache/boxen-puppet-homebrew-1.0.0.tar.gz and /dev/null differ diff --git a/vendor/puppet/cache/boxen-puppet-homebrew-1.1.0.tar.gz b/vendor/puppet/cache/boxen-puppet-homebrew-1.1.0.tar.gz new file mode 100644 index 0000000..facafdc Binary files /dev/null and b/vendor/puppet/cache/boxen-puppet-homebrew-1.1.0.tar.gz differ diff --git a/vendor/puppet/cache/boxen-puppet-nginx-1.0.0.tar.gz b/vendor/puppet/cache/boxen-puppet-nginx-1.0.0.tar.gz deleted file mode 100644 index 51f74b4..0000000 Binary files a/vendor/puppet/cache/boxen-puppet-nginx-1.0.0.tar.gz and /dev/null differ diff --git a/vendor/puppet/cache/boxen-puppet-nginx-1.1.0.tar.gz b/vendor/puppet/cache/boxen-puppet-nginx-1.1.0.tar.gz new file mode 100644 index 0000000..2acbe28 Binary files /dev/null and b/vendor/puppet/cache/boxen-puppet-nginx-1.1.0.tar.gz differ diff --git a/vendor/puppet/cache/boxen-puppet-ruby-1.0.0.tar.gz b/vendor/puppet/cache/boxen-puppet-ruby-1.0.0.tar.gz deleted file mode 100644 index cdb8a85..0000000 Binary files a/vendor/puppet/cache/boxen-puppet-ruby-1.0.0.tar.gz and /dev/null differ diff --git a/vendor/puppet/cache/boxen-puppet-ruby-3.1.0.tar.gz b/vendor/puppet/cache/boxen-puppet-ruby-3.1.0.tar.gz new file mode 100644 index 0000000..cd9f50c Binary files /dev/null and b/vendor/puppet/cache/boxen-puppet-ruby-3.1.0.tar.gz differ