keith/puppet
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Last minutes fix :)

Browse source
This commit is contained in:
Ciaby 2014-07-19 11:31:12 -04:00
parent 980b322d5c
commit db1075a084
2 changed files with 13 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

13
modules/rhizomatica_base_system/manifests/init.pp
View file

@ -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,

3
modules/rhizomatica_base_system/files/etc/freeswitch/autoload_configs/cdr_pg_csv.conf.xml → modules/rhizomatica_base_system/templates/cdr_pg_csv.conf.xml.erb
View file

@ -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"/>