Merge pull request voxpupuli#1 from MITx/master

stankevich · stankevich · commit 91b595de937e · 2012-11-02T12:03:27.000-07:00
Fixed no HTTP proxy case.
Added app_interface.
diff --git a/manifests/gunicorn.pp b/manifests/gunicorn.pp
@@ -41,12 +41,13 @@
 # Sergey Stankevich
 #
 define python::gunicorn (
-  $ensure      = present,
-  $virtualenv  = false,
-  $mode        = 'wsgi',
-  $dir         = false,
-  $bind        = false,
-  $environment = false
+  $ensure        = present,
+  $virtualenv    = false,
+  $mode          = 'wsgi',
+  $dir           = false,
+  $bind          = false,
+  $app_interface = 'wsgi',
+  $environment   = false,
 ) {
 
   # Parameter validation
diff --git a/manifests/requirements.pp b/manifests/requirements.pp
@@ -39,7 +39,7 @@
   }
 
   $req_dir = inline_template('<%= requirements.match(%r!(.+)/.+!)[1] %>')
-  $req_crc = "${req_dir}/requirements.sha1"
+  $req_crc = "${requirements}.sha1"
 
   file { $requirements:
     ensure  => present,
diff --git a/manifests/virtualenv.pp b/manifests/virtualenv.pp
@@ -50,9 +50,14 @@
       default  => "--proxy=${proxy}",
     }
 
+    $proxy_command = $proxy ? {
+      false   => '',
+      default => "&& export http_proxy=${proxy}",
+    }
+
     exec { "python_virtualenv_${venv_dir}":
       command => "mkdir -p ${venv_dir} \
-        && export http_proxy=${proxy} \
+        ${proxy_command} \
         && virtualenv -p `which ${python}` ${venv_dir} \
         && ${venv_dir}/bin/pip install ${proxy_flag} --upgrade distribute pip",
       creates => $venv_dir,

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`$req_dir = inline_template('<%= requirements.match(%r!(.+)/.+!)[1] %>')`
`42`		`- $req_crc = "${req_dir}/requirements.sha1"`
	`42`	`+ $req_crc = "${requirements}.sha1"`
`43`	`43`
`44`	`44`	`file { $requirements:`
`45`	`45`	`ensure => present,`