Explorar el Código

application v0.99.4, virtualenv resource should be named after the app id for consistency with other resource naming.

Seth Chisamore hace 13 años
padre
commit
836215f3fa
Se han modificado 4 ficheros con 4 adiciones y 4 borrados
  1. 1 1
      metadata.json
  2. 1 1
      metadata.rb
  3. 1 1
      recipes/django.rb
  4. 1 1
      recipes/gunicorn.rb

+ 1 - 1
metadata.json

@@ -54,5 +54,5 @@
     "application::tomcat": "Sets up the deployed Java application with Tomcat as the servlet container",
     "application::unicorn": "Sets up the deployed Rails application with Unicorn as the web server"
   },
-  "version": "0.99.3"
+  "version": "0.99.4"
 }

+ 1 - 1
metadata.rb

@@ -3,7 +3,7 @@ maintainer_email "cookbooks@opscode.com"
 license          "Apache 2.0"
 description      "Deploys and configures a variety of applications defined from databag 'apps'"
 long_description  IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version          "0.99.3"
+version          "0.99.4"
 recipe           "application", "Loads application databags and selects recipes to use"
 recipe           "application::django", "Deploys a Django application specified in a data bag with the deploy_revision resource"
 recipe           "application::gunicorn", "Sets up the deployed Django application with Gunicorn as the web server"

+ 1 - 1
recipes/django.rb

@@ -48,7 +48,7 @@ directory "#{app['deploy_to']}/shared" do
 end
 
 ## Create a virtualenv for the app
-ve = python_virtualenv "#{app['id']}_env"  do
+ve = python_virtualenv app['id'] do
   path "#{app['deploy_to']}/shared/env"
   action :create
 end

+ 1 - 1
recipes/gunicorn.rb

@@ -19,7 +19,7 @@
 
 app = node.run_state[:current_app] 
 
-ve = resources(:python_virtualenv => "#{app['id']}_env")
+ve = resources(:python_virtualenv => app['id'])
 node.default[:gunicorn][:virtualenv] = ve.path
 
 include_recipe "gunicorn"