provizioning 0.4.3 → 0.4.4

data/lib/provizioning/version.rb

@@ -1,3 +1,3 @@
 module Provizioning
-  VERSION = "0.4.3"
+  VERSION = "0.4.4"
 end

data/puppet/modules/nginx/templates/site.erb

@@ -1,15 +1,15 @@
-upstream <%= name %> {
-  server unix:/tmp/<%= name %>.sock fail_timeout=0;
+upstream <%= domain_name.sub(".", "_") %> {
+  server unix:/tmp/<%= domain_name %>.sock fail_timeout=0;
 }
 
 server {
   listen 80;
   client_max_body_size 4G;
-  server_name <%= domain_name %>;
+  server_name <%= domain_name %> www.<%= domain_name %>;
 
   keepalive_timeout 5;
 
-  root <%= deploy_to %>;
+  root <%= deploy_to %>/current/public;
 
   location / {
     proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
@@ -17,13 +17,13 @@ server {
     proxy_redirect off;
 
     if (!-f $request_filename) {
-      proxy_pass http://<%= name %>;
+      proxy_pass http://<%= domain_name.sub(".", "_") %>;
       break;
     }
   }
 
   error_page 500 502 503 504 /500.html;
   location = /500.html {
-    root <%= deploy_to %>;
+    root <%= deploy_to %>/current/public;
   }
 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: provizioning
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
-  requirement: &2160476680 !ruby/object:Gem::Requirement
+  requirement: &2157234620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2160476680
+  version_requirements: *2157234620
 - !ruby/object:Gem::Dependency
   name: capistrano-ext
-  requirement: &2160475240 !ruby/object:Gem::Requirement
+  requirement: &2157233100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2160475240
+  version_requirements: *2157233100
 description: Server provisioning tools, recipes and templates based on Sprinkle
 email:
 - victor.castell@season.es