From 1848e98cb9e5de36f21a51fa38ed657d71dfb5e7 Mon Sep 17 00:00:00 2001
From: Marcio Mazza <marciomazza@gmail.com>
Date: Tue, 16 Sep 2014 10:16:33 -0300
Subject: [PATCH] Adicionado psycopg2 as dependencias

---
 puppet/manifests/site.pp  | 23 +++++++++++++++--------
 requirements/producao.txt |  1 +
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/puppet/manifests/site.pp b/puppet/manifests/site.pp
index bdedecf..e63e55f 100644
--- a/puppet/manifests/site.pp
+++ b/puppet/manifests/site.pp
@@ -13,8 +13,17 @@ user { 'sigi':
   require => Group['sigi']
 }
 
-package { [ 'git', 'python-psycopg2', 'supervisor', 'memcached',
-            ]: }
+$package_deps = [
+  # gerais
+  'git', 'supervisor', 'memcached',
+
+  # para psycopg ('python-dev' ja eh instalado pelo modulo python)
+  'libpq-dev',
+
+  # para ldap
+  'libldap2-dev', 'libsasl2-dev', 'libssl-dev']
+
+package { $package_deps: }
 
 $sigi_dir = '/srv/sigi'
 
@@ -57,10 +66,6 @@ if !defined(Class['python']) {
   }
 }
 
-$python_ldap_deps = ['libldap2-dev', 'libsasl2-dev', 'libssl-dev']
-
-package { $python_ldap_deps: }
-
 $sigi_venv_dir = '/srv/.virtualenvs/sigi'
 
 file { ['/srv/.virtualenvs',]:
@@ -77,7 +82,7 @@ python::requirements { "${sigi_dir}/requirements/producao.txt":
   require     => [
     Python::Virtualenv[$sigi_venv_dir],
     Vcsrepo[$sigi_dir],
-    Package[$python_ldap_deps] ]
+    Package[$package_deps] ]
 }
 
 ###########################################################################
@@ -95,7 +100,9 @@ exec { 'collectstatic':
   cwd     => $sigi_dir,
   require => [
     Python::Virtualenv[$sigi_venv_dir],
-    Vcsrepo[$sigi_dir], ]
+    Vcsrepo[$sigi_dir],
+    Python::Requirements["${sigi_dir}/requirements/producao.txt"],
+    ]
 }
 
 # TODO local_settings.py ...
diff --git a/requirements/producao.txt b/requirements/producao.txt
index 3c4d1bc..a0a0f84 100644
--- a/requirements/producao.txt
+++ b/requirements/producao.txt
@@ -9,6 +9,7 @@ django-treemenus==0.9.1
 eav-django==1.4.6
 html5lib==0.999
 pisa==3.0.33
+psycopg2==2.5.4
 reportlab==2.7
 six==1.7.3