From db1075a084f9e3c2c6a7cd3726bce6264a717acb Mon Sep 17 00:00:00 2001
From: Ciaby <ciaby@rhizomatica.org>
Date: Sat, 19 Jul 2014 11:31:12 -0400
Subject: [PATCH] Last minutes fix :)

---
 modules/rhizomatica_base_system/manifests/init.pp   | 13 ++++++++++++-
 .../cdr_pg_csv.conf.xml.erb}                        |  3 +--
 2 files changed, 13 insertions(+), 3 deletions(-)
 rename modules/rhizomatica_base_system/{files/etc/freeswitch/autoload_configs/cdr_pg_csv.conf.xml => templates/cdr_pg_csv.conf.xml.erb} (90%)

diff --git a/modules/rhizomatica_base_system/manifests/init.pp b/modules/rhizomatica_base_system/manifests/init.pp
index 67d5206..d9436c3 100644
--- a/modules/rhizomatica_base_system/manifests/init.pp
+++ b/modules/rhizomatica_base_system/manifests/init.pp
@@ -139,7 +139,7 @@ class rhizomatica_base_system {
       source   => 'https://github.com/Rhizomatica/rccn.git',
       revision => 'master',
       require  => [ File['/var/rhizomatica'], Package['git'] ],
-      notify   => Exec['install_rccn'],
+      notify   => [ Exec['install_rccn'], Exec['locale-gen'] ],
     }
 
   file { '/var/rhizomatica/rccn/config_values.py':
@@ -162,6 +162,12 @@ class rhizomatica_base_system {
       refreshonly => true,
     }
 
+  exec { 'locale-gen':
+      commnd => '/usr/sbin/locale-gen es_ES.utf8',
+      require     => File['/var/rhizomatica/rccn/config_values.py'],
+      refreshonly => true,
+      }
+
   file { '/var/www/html/rai':
       ensure  => link,
       target  => '/var/rhizomatica/rai',
@@ -317,6 +323,11 @@ class rhizomatica_base_system {
       File['/etc/freeswitch/sip_profiles/external'] ],
     }
 
+  file { '/etc/freeswitch/autoload_configs/cdr_pg_csv.conf.xml':
+      content => template('rhizomatica_base_system/cdr_pg_csv.conf.xml.erb'),
+      require => [ Package['freeswitch'],
+    }
+
 #OpenBSC
   package { ['osmocom-nitb', 'osmocom-nitb-dbg']:
       ensure  => installed,
diff --git a/modules/rhizomatica_base_system/files/etc/freeswitch/autoload_configs/cdr_pg_csv.conf.xml b/modules/rhizomatica_base_system/templates/cdr_pg_csv.conf.xml.erb
similarity index 90%
rename from modules/rhizomatica_base_system/files/etc/freeswitch/autoload_configs/cdr_pg_csv.conf.xml
rename to modules/rhizomatica_base_system/templates/cdr_pg_csv.conf.xml.erb
index ef87bd3..395df28 100644
--- a/modules/rhizomatica_base_system/files/etc/freeswitch/autoload_configs/cdr_pg_csv.conf.xml
+++ b/modules/rhizomatica_base_system/templates/cdr_pg_csv.conf.xml.erb
@@ -1,8 +1,7 @@
 <configuration name="cdr_pg_csv.conf" description="CDR PG CSV Format">
   <settings>
     <!-- See parameters for PQconnectdb() at http://www.postgresql.org/docs/8.4/static/libpq-connect.html -->
-    <!-- $rhiz0@xff -->
-    <param name="db-info" value="host=localhost dbname=rhizomatica user=rhizomatica password=xEP3Y4W8gG*4*zu connect_timeout=10" />
+    <param name="db-info" value="host=<%= pgsql_host %> dbname=<%= pgsql_db %> user=<%= pgsql_user %> password=<%= pgsql_pwd %> connect_timeout=10" />
     <!-- CDR table name -->
     <param name="db-table" value="cdr"/>