summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorSergey Stankevich <sergey.stankevich@gmail.com>2012-11-08 07:12:03 -0500
committerSergey Stankevich <sergey.stankevich@gmail.com>2012-11-08 07:12:03 -0500
commit8fb868d5aa7bbe4d19f83367ba86d4ac4deb6d25 (patch)
treeef8d16bf45678750c60496fb6e6109cb902a5316 /tests
parent63b4288450a3165cbd15e04fc9480fd16ff53885 (diff)
parent94d9ca52b531c76949bddfe45c5402ecb2586ab8 (diff)
Merge branch 'master' of github.com:stankevich/puppet-python
* 'master' of github.com:stankevich/puppet-python: updated authors. python::gunicorn - added template parameter python::virtualenv - '--system-site-packages' option python::gunicorn - removed unused/undocumented attributes.
Diffstat (limited to 'tests')
-rw-r--r--tests/gunicorn.pp1
-rw-r--r--tests/virtualenv.pp1
2 files changed, 2 insertions, 0 deletions
diff --git a/tests/gunicorn.pp b/tests/gunicorn.pp
index c081fd6..c32ea1a 100644
--- a/tests/gunicorn.pp
+++ b/tests/gunicorn.pp
@@ -11,4 +11,5 @@ python::gunicorn { 'vhost':
dir => '/var/www/project1/current',
bind => 'unix:/tmp/gunicorn.socket',
environment => 'prod',
+ template => 'python/gunicorn.erb',
}
diff --git a/tests/virtualenv.pp b/tests/virtualenv.pp
index 190492c..da5ab57 100644
--- a/tests/virtualenv.pp
+++ b/tests/virtualenv.pp
@@ -9,4 +9,5 @@ python::virtualenv { '/var/www/project1':
version => 'system',
requirements => '/var/www/project1/requirements.txt',
proxy => 'http://proxy.domain.com:3128',
+ systempkgs => true,
}