Test No. 2....

This commit is contained in:
Keith Whyte 2018-02-23 12:44:33 +00:00
parent e4dbf6267c
commit f16c57586c
6 changed files with 19 additions and 9 deletions

@ -1 +1 @@
Subproject commit 93da3bd01a5ae4276eddec15ac615eb4bccc23cf
Subproject commit 1f519f719552aedc98b6995e42d23201a0286a58

View file

@ -75,7 +75,7 @@ class rhizo_base::apt::debian inherits rhizo_base::apt::common {
location => 'http://files.freeswitch.org/repo/deb/freeswitch-1.6/',
release => 'jessie',
repos => 'main',
notify => Exec['apt_update'],
notify_update => true,
key => {
'id' => '20B06EE621AB150D40F6079FD76EDC7725E010CF',
'source' => 'http://files.freeswitch.org/repo/deb/debian/freeswitch_archive_g0.pub'
@ -106,6 +106,7 @@ class rhizo_base::apt::debian inherits rhizo_base::apt::common {
location => 'http://repo.rhizomatica.org/debian/',
release => 'jessie',
repos => 'main',
allow_unsigned => true,
require => File['/etc/apt/apt.conf.d/90unsigned'],
}

View file

@ -187,7 +187,8 @@ class rhizo_base {
file { '/home/rhizomatica/bin':
ensure => directory,
source => 'puppet:///modules/rhizo_base/bin',
recurse => true,
source_permissions => use,
recurse => remote,
purge => false,
}
@ -243,7 +244,8 @@ class rhizo_base {
Exec['notify-freeswitch'],
Exec['restart-rapi'],
Exec['restart-smpp'],
Exec['restart-esme'] ],
Exec['restart-esme'],
Exec['restart-apache'] ],
}
file { '/var/rhizomatica/bin/get_account_balance.sh':
@ -320,6 +322,11 @@ class rhizo_base {
refreshonly => true,
}
exec { 'restart-apache':
command => '/usr/sbin/service apache2 restart',
refreshonly => true,
}
if $operatingsystem == 'Ubuntu' {
file { '/var/lib/locales/supported.d/local':
ensure => present,

View file

@ -59,7 +59,8 @@ class rhizo_base::packages::debian inherits rhizo_base::packages::common {
file { '/etc/php/7.0/apache2/php.ini':
ensure => present,
source => "puppet:///modules/rhizo_base/php.ini"
source => "puppet:///modules/rhizo_base/php.ini",
notify => Exec['restart-apache']
}
}

View file

@ -14,6 +14,7 @@ class rhizo_base::runit {
file { '/etc/sv':
ensure => directory,
source => 'puppet:///modules/rhizo_base/etc/sv',
source_permissions => use,
recurse => remote,
require => Class['rhizo_base::packages'],
}

View file

@ -38,7 +38,7 @@
<X-PRE-PROCESS cmd="set" data="local_ip_v4=<%= @vpn_ip_address %>"/>
<X-PRE-PROCESS cmd="set" data="external_ip=<%= @wan_ip_address %>"/>
<X-PRE-PROCESS cmd="set" data="sound_prefix=$${sounds_dir}/en/us/callie"/>
<X-PRE-PROCESS cmd="set" data="sound_prefix=$${sounds_dir}/rccn"/>
<!--
This setting is what sets the default domain FreeSWITCH will use if all else fails.