Freeswitch version and lib fixes

This commit is contained in:
Keith Whyte 2022-07-10 01:43:18 +02:00
parent c7a3819bcd
commit da538ff1de
6 changed files with 23 additions and 3 deletions

View file

@ -118,7 +118,17 @@ class rhizo_base::freeswitch::common {
$reg_provider = $rhizo_base::reg_provider $reg_provider = $rhizo_base::reg_provider
$mncc_ip_address = $rhizo_base::mncc_ip_address $mncc_ip_address = $rhizo_base::mncc_ip_address
$fs_ensure = hiera('rhizo::fs_ensure', 'present') $fs_ensure = hiera('rhizo::fs_version', 'present')
$fs_deb_version = "${lsbdistcodename}_${fs_ensure}" ? {
'buster_1.8.6' => '1.8.6',
'stretch_1.6.20:' => '1.6.20',
default => '1.10.3~release~15~129de34d84~$lsbdistcodename-1~$lsbdistcodename+1'
}
$fs_lib_version = "${lsbdistcodename}_${fs_ensure}" ? {
'buster_1.8.6' => '1.8.6',
'stretch_1.6.20:' => '1.6.20',
default => '1.10.3'
}
package { package {
[ [
@ -158,13 +168,13 @@ class rhizo_base::freeswitch::common {
package { package {
['freeswitch', 'freeswitch-lang-en']: ['freeswitch', 'freeswitch-lang-en']:
ensure => $fs_version, ensure => $fs_ensure,
require => Class['rhizo_base::apt'], require => Class['rhizo_base::apt'],
} }
unless ($rhizo_base::osmo_stack == "split") { unless ($rhizo_base::osmo_stack == "split") {
file { '/usr/lib/libfreeswitch.so.1.0.0': file { '/usr/lib/libfreeswitch.so.1.0.0':
source => "puppet:///modules/rhizo_base/usr/lib/libfreeswitch.so.1.0.0.${lsbdistcodename}", source => "puppet:///modules/rhizo_base/usr/lib/libfreeswitch_dyn-98-${fs_lib_version}-${lsbdistcodename}.so",
require => Package['freeswitch'], require => Package['freeswitch'],
} }
} }
@ -235,6 +245,11 @@ class rhizo_base::freeswitch::common {
require => Package['freeswitch'], require => Package['freeswitch'],
} }
file { '/home/rhizomatica/bin/fs_ensure':
content => template('rhizo_base/fs_ensure.erb'),
mode => '0755'
}
# SSH Deploy key and config for gitlab # SSH Deploy key and config for gitlab
file { '/root/.ssh/bsc_dev': file { '/root/.ssh/bsc_dev':
ensure => present, ensure => present,

View file

@ -0,0 +1,5 @@
#!/bin/bash
dpkg -l | egrep freeswitch-mod\|libfreeswitch | cut -f3 -d\ |\
sed 's/\(.*\)/\1=<%= @fs_deb_version %>/' | sort -r |\
sudo xargs -p apt install --assume-yes --allow-downgrades